操作日志

src/main/java/com/izouma/imt/web/CaseAndNewsController.java

@@ -4,8 +4,10 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.izouma.imt.domain.CaseAndNews;
+import com.izouma.imt.domain.vendor.Operating;
 import com.izouma.imt.domain.vendor.VendorInfo;
 import com.izouma.imt.enums.CaseAndNewsType;
+import com.izouma.imt.repo.vendor.OperatingRepo;
 import com.izouma.imt.repo.vendor.VendorInfoRepo;
 import com.izouma.imt.service.CaseAndNewsService;
 import com.izouma.imt.dto.PageQuery;
@@ -14,14 +16,17 @@ import com.izouma.imt.repo.CaseAndNewsRepo;
 import com.izouma.imt.service.points.PointsRecordService;
 import com.izouma.imt.utils.FileUtils;
 import com.izouma.imt.utils.ObjUtils;
+import com.izouma.imt.utils.SecurityUtils;
 import com.izouma.imt.utils.excel.ExcelUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -34,17 +39,31 @@ public class CaseAndNewsController extends BaseController {
     private CaseAndNewsRepo     caseAndNewsRepo;
     private PointsRecordService pointsRecordService;
     private VendorInfoRepo      vendorInfoRepo;
+    private OperatingRepo       operatingRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
-    public CaseAndNews save(@RequestBody CaseAndNews record) {
+    public CaseAndNews save(@RequestBody CaseAndNews record, HttpServletRequest request) {
+        Operating operating = Operating.builder()
+                .userId(SecurityUtils.getAuthenticatedUser().getId())
+                .ip(SecurityUtils.getIp2(request))
+                .operate("添加案例")
+                .time(LocalDateTime.now())
+                .content(record.getTitle())
+                .vendorInfoId(record.getVendorInfoId())
+                .build();
+
         if (record.getSort() == null) {
             record.setSort(caseAndNewsRepo.nextSort(record.getVendorInfoId(), record.getType()));
         }
+
         if (record.getId() != null) {
             CaseAndNews orig = caseAndNewsRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
-            return caseAndNewsRepo.save(orig);
+            operating.setOperate("修改案例");
+            CaseAndNews save = caseAndNewsRepo.save(orig);
+            operatingRepo.save(operating);
+            return save;
         }
         String enName = "casePressRelease";
         if (CaseAndNewsType.NEWS.equals(record.getType())) {
@@ -56,7 +75,9 @@ public class CaseAndNewsController extends BaseController {
                 .getUserId();
         pointsRecordService.findPoints(userId, enName);
 //        record.setUserId(userId);
-        return caseAndNewsRepo.save(record);
+        CaseAndNews save = caseAndNewsRepo.save(record);
+        operatingRepo.save(operating);
+        return save;
     }
 
 

src/main/java/com/izouma/imt/web/vendor/CustomCategoryController.java

@@ -1,25 +1,27 @@
 package com.izouma.imt.web.vendor;
 
+import com.izouma.imt.domain.vendor.CustomCategory;
+import com.izouma.imt.domain.vendor.Operating;
 import com.izouma.imt.domain.vendor.VendorInfo;
 import com.izouma.imt.dto.CustomCategoryDTO;
-import com.izouma.imt.repo.vendor.VendorInfoRepo;
-import com.izouma.imt.utils.SecurityUtils;
-import com.izouma.imt.web.BaseController;
-import com.izouma.imt.domain.vendor.CustomCategory;
-import com.izouma.imt.service.vendor.CustomCategoryService;
 import com.izouma.imt.dto.PageQuery;
 import com.izouma.imt.exception.BusinessException;
 import com.izouma.imt.repo.vendor.CustomCategoryRepo;
+import com.izouma.imt.repo.vendor.OperatingRepo;
+import com.izouma.imt.repo.vendor.VendorInfoRepo;
+import com.izouma.imt.service.vendor.CustomCategoryService;
 import com.izouma.imt.utils.ObjUtils;
+import com.izouma.imt.utils.SecurityUtils;
 import com.izouma.imt.utils.excel.ExcelUtils;
-
+import com.izouma.imt.web.BaseController;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @RestController
@@ -29,15 +31,30 @@ public class CustomCategoryController extends BaseController {
     private CustomCategoryService customCategoryService;
     private CustomCategoryRepo    customCategoryRepo;
     private VendorInfoRepo        vendorInfoRepo;
+    private OperatingRepo         operatingRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
-    public CustomCategory save(@RequestBody CustomCategory record) {
+    public CustomCategory save(@RequestBody CustomCategory record, HttpServletRequest request) {
+        Operating operating = Operating.builder()
+                .userId(SecurityUtils.getAuthenticatedUser().getId())
+                .ip(SecurityUtils.getIp2(request))
+                .operate("添加产品分类")
+                .time(LocalDateTime.now())
+                .content(record.getChName())
+                .vendorInfoId(record.getVendorInfoId())
+                .build();
+
         if (record.getId() != null) {
             CustomCategory orig = customCategoryRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
-            return customCategoryRepo.save(orig);
+            operating.setOperate("修改产品分类");
+            CustomCategory save = customCategoryRepo.save(orig);
+
+            operatingRepo.save(operating);
+            return save;
         }
+
         // 展商id
         if (record.getVendorInfoId() == null) {
             VendorInfo vendorInfo = vendorInfoRepo.findByUserId(SecurityUtils.getAuthenticatedUser().getId())
@@ -48,7 +65,9 @@ public class CustomCategoryController extends BaseController {
         if (record.getSort() == null) {
             record.setSort(customCategoryRepo.nextSort(record.getVendorInfoId()));
         }
-        return customCategoryRepo.save(record);
+        CustomCategory save = customCategoryRepo.save(record);
+        operatingRepo.save(operating);
+        return save;
     }
 
 

src/main/java/com/izouma/imt/web/vendor/ProductController.java

@@ -69,7 +69,7 @@ public class ProductController extends BaseController {
             operatingRepo.save(Operating.builder()
                     .userId(SecurityUtils.getAuthenticatedUser().getId())
                     .ip(SecurityUtils.getIp2(request))
-                    .operate("修改")
+                    .operate("修改产品")
                     .time(LocalDateTime.now())
                     .content(orig.getChName())
                     .vendorInfoId(orig.getVendorInfoId())
@@ -108,7 +108,7 @@ public class ProductController extends BaseController {
         operatingRepo.save(Operating.builder()
                 .userId(SecurityUtils.getAuthenticatedUser().getId())
                 .ip(SecurityUtils.getIp2(request))
-                .operate("添加")
+                .operate("添加产品")
                 .time(LocalDateTime.now())
                 .content(record.getChName())
                 .vendorInfoId(record.getVendorInfoId())
@@ -154,7 +154,7 @@ public class ProductController extends BaseController {
         operatingRepo.save(Operating.builder()
                 .userId(SecurityUtils.getAuthenticatedUser().getId())
                 .ip(SecurityUtils.getIp2(request))
-                .operate("删除")
+                .operate("删除产品")
                 .time(LocalDateTime.now())
                 .content(product.getChName())
                 .vendorInfoId(product.getVendorInfoId())
@@ -234,7 +234,7 @@ public class ProductController extends BaseController {
         operatingRepo.save(Operating.builder()
                 .userId(SecurityUtils.getAuthenticatedUser().getId())
                 .ip(SecurityUtils.getIp2(request))
-                .operate(pass ? "下架" : "上架")
+                .operate(pass ? "下架产品" : "上架产品")
                 .time(LocalDateTime.now())
                 .content(product.getChName())
                 .vendorInfoId(product.getVendorInfoId())

src/main/vue/src/views/OperatingList.vue

@@ -50,11 +50,11 @@
             <!-- <el-table-column prop="id" label="ID" width="100"> </el-table-column> -->
             <el-table-column prop="vendorName" label="公司名" min-width="110"> </el-table-column>
             <el-table-column prop="username" label="账号" width="90"> </el-table-column>
-            <el-table-column prop="operate" label="操作类型" width="80"> </el-table-column>
+            <el-table-column prop="operate" label="操作类型" width="100"> </el-table-column>
             <el-table-column prop="content" label="操作内容" min-width="110" show-overflow-tooltip> </el-table-column>
             <el-table-column prop="time" label="操作时间"> </el-table-column>
             <el-table-column prop="ip" label="ip地址"></el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="100">
+            <el-table-column label="操作" align="center" fixed="right" min-width="80">
                 <template slot-scope="{ row }">
                     <!-- <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button> -->
                     <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>

src/test/java/com/izouma/imt/web/CaseAndNewsControllerTest.java

@@ -27,6 +27,6 @@ public class CaseAndNewsControllerTest {
                 .type(CaseAndNewsType.CASE)
                 .vendorInfoId(538L)
                 .build();
-        caseAndNewsController.save(case1);
+//        caseAndNewsController.save(case1);
     }
 }