From 10b47e7355ca507f8592c4c97acfd7deccc0f538 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 26 十月 2022 17:31:37 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/data/DictController.java |   86 ++++++++++++++++++++++++++++++-------------
 1 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/data/DictController.java b/src/main/java/com/lf/server/controller/data/DictController.java
index 4512cbb..3a4937f 100644
--- a/src/main/java/com/lf/server/controller/data/DictController.java
+++ b/src/main/java/com/lf/server/controller/data/DictController.java
@@ -1,10 +1,12 @@
 package com.lf.server.controller.data;
 
-
-import com.lf.server.controller.BaseController;
+import com.lf.server.aspect.SysLog;
+import com.lf.server.controller.all.BaseController;
 import com.lf.server.entity.all.ResponseMsg;
 import com.lf.server.entity.data.DictEntity;
+import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.service.data.DictService;
+import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -12,6 +14,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -19,16 +22,20 @@
  * @author SWS + WWW
  * @date 2022-09.26
  */
-@Api(tags = "瀛楀吀绠$悊")
+@Api(tags = "鏁版嵁绠$悊\\瀛楀吀绠$悊")
 @RestController
 @RequestMapping("/dict")
 public class DictController extends BaseController {
     @Autowired
     DictService dictService;
 
+    @Autowired
+    TokenService tokenService;
+
+    @SysLog()
     @ApiOperation(value = "鏌ヨ璁板綍鏁�")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", required = false, example = "sys_dict")
+            @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", required = false, example = "")
     })
     @GetMapping({"/selectCount"})
     public ResponseMsg<Integer> selectCount(String tab) {
@@ -41,9 +48,10 @@
         }
     }
 
+    @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "sys_dict"),
+            @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = ""),
             @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
@@ -62,9 +70,10 @@
         }
     }
 
+    @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "sys_dict"),
+            @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = ""),
             @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
@@ -88,14 +97,20 @@
         }
     }
 
-    @ApiOperation(value = "鎻掑叆瀛楀吀")
+    @SysLog()
+    @ApiOperation(value = "鎻掑叆涓�鏉�")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "dictEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.DictEntity", paramType = "body", example = "")
+            @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.data.DictEntity", paramType = "body", example = "")
     })
     @PostMapping(value = "/insertDict", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<Integer> insertDict(DictEntity dictEntity) {
+    public ResponseMsg<Integer> insertDict(@RequestBody DictEntity entity, HttpServletRequest req) {
         try {
-            int count = dictService.insertDict(dictEntity);
+            UserEntity ue = tokenService.getCurrentUser(req);
+            if (ue != null) {
+                entity.setCreateUser(ue.getId());
+            }
+
+            int count = dictService.insertDict(entity);
 
             return success(count);
         } catch (Exception ex) {
@@ -103,14 +118,22 @@
         }
     }
 
-    @ApiOperation(value = "鎻掑叆澶氭潯瀛楀吀")
+    @SysLog()
+    @ApiOperation(value = "鎻掑叆澶氭潯")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "dictEntity", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<DictEntity>", paramType = "body", example = "")
+            @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "List<DictEntity>", paramType = "body", example = "")
     })
     @PostMapping(value = "/insertDicts", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<Integer> insertDicts(@RequestBody List<DictEntity> dictEntity) {
+    public ResponseMsg<Integer> insertDicts(@RequestBody List<DictEntity> list, HttpServletRequest req) {
         try {
-            int count = dictService.insertDicts(dictEntity);
+            UserEntity ue = tokenService.getCurrentUser(req);
+            if (ue != null) {
+                for (DictEntity entity : list) {
+                    entity.setCreateUser(ue.getId());
+                }
+            }
+
+            int count = dictService.insertDicts(list);
 
             return success(count);
         } catch (Exception ex) {
@@ -118,9 +141,10 @@
         }
     }
 
-    @ApiOperation(value = "鍒犻櫎涓�鏉″瓧鍏�")
+    @SysLog()
+    @ApiOperation(value = "鍒犻櫎涓�鏉�")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "瀛楀吀ID", dataType = "Integer", paramType = "query", example = "1")
+            @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
     })
     @GetMapping(value = "/deleteDict")
     public ResponseMsg<Integer> deleteDict(int id) {
@@ -133,12 +157,13 @@
         }
     }
 
-    @ApiOperation(value = "鍒犻櫎澶氭潯瀛楀吀")
+    @SysLog()
+    @ApiOperation(value = "鍒犻櫎澶氭潯")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "瀛楀吀ID闆嗗悎", dataType = "List<Integer>", paramType = "query", example = "1,2")
+            @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2")
     })
     @GetMapping(value = "/deleteDicts")
-    public ResponseMsg<Integer> deleteDicts(List<Integer> ids) {
+    public ResponseMsg<Integer> deleteDicts(@RequestParam List<Integer> ids) {
         try {
             if (ids == null || ids.isEmpty()) {
                 return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
@@ -152,15 +177,21 @@
         }
     }
 
-    @ApiOperation(value = "鏇存柊涓�鏉″瓧鍏�")
+    @SysLog()
+    @ApiOperation(value = "鏇存柊涓�鏉�")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "dictEntity", value = "瀛楀吀ID闆嗗悎", dataType = "DictEntity", paramType = "body", example = "")
+            @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "DictEntity", paramType = "body", example = "")
     })
     @ResponseBody
     @PostMapping(value = "/updateDict", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<Integer> updateDict(DictEntity dictEntity) {
+    public ResponseMsg<Integer> updateDict(@RequestBody DictEntity entity, HttpServletRequest req) {
         try {
-            int count = dictService.updateDict(dictEntity);
+            UserEntity ue = tokenService.getCurrentUser(req);
+            {
+                entity.setUpdateUser(ue.getId());
+            }
+
+            int count = dictService.updateDict(entity);
 
             return success(count);
         } catch (Exception ex) {
@@ -168,9 +199,10 @@
         }
     }
 
-    @ApiOperation(value = "鏍规嵁ID鏌ヨ瀛楀吀")
+    @SysLog()
+    @ApiOperation(value = "鏍规嵁ID鏌ヨ")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "瀛楀吀ID", dataType = "Integer", paramType = "query", example = "1")
+            @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
     })
     @GetMapping(value = "/selectDict")
     public ResponseMsg<DictEntity> selectDict(int id) {
@@ -183,7 +215,8 @@
         }
     }
 
-    @ApiOperation(value = "鏌ヨ鎵�鏈夊瓧鍏�")
+    @SysLog()
+    @ApiOperation(value = "鏌ヨ鎵�鏈�")
     @GetMapping(value = "/selectDictAll")
     public ResponseMsg<List<DictEntity>> selectDictAll() {
         try {
@@ -195,6 +228,7 @@
         }
     }
 
+    @SysLog()
     @ApiOperation(value = "鏌ヨ瀛楀吀涓殑鎵�鏈夎〃鍚�")
     @GetMapping(value = "/selectDictTab")
     public ResponseMsg<List<DictEntity>> selectDictTab() {

--
Gitblit v1.9.3