From 1efe2e6c8f21ca6ea8bb1283a07670cdd1ae8cf6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 17 十一月 2022 20:07:47 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/data/DictController.java |  207 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 134 insertions(+), 73 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..df471b6 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,13 @@
 package com.lf.server.controller.data;
 
-
-import com.lf.server.controller.BaseController;
+import com.lf.server.annotation.SysLog;
+import com.lf.server.controller.all.BaseController;
 import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.ctrl.KeyValueEntity;
 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,28 +15,33 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
  * 瀛楀吀绠$悊
- * @author SWS + WWW
- * @date 2022-09.26
+ * @author WWW
  */
-@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 = "ns", value = "琛ㄧ┖闂�", dataType = "String", paramType = "query", required = false, example = "bd"),
+            @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg_25w_hyda")
     })
     @GetMapping({"/selectCount"})
-    public ResponseMsg<Integer> selectCount(String tab) {
+    public ResponseMsg<Integer> selectCount(String ns, String tab) {
         try {
-            int count = dictService.selectCount(tab);
+            int count = dictService.selectCount(ns, tab);
 
             return success(count);
         } catch (Exception ex) {
@@ -41,20 +49,22 @@
         }
     }
 
+    @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "sys_dict"),
+            @ApiImplicitParam(name = "ns", value = "琛ㄧ┖闂�", dataType = "String", paramType = "query", example = "bd"),
+            @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg_25w_hyda"),
             @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
     @GetMapping(value = "/selectByPage")
-    public ResponseMsg<List<DictEntity>> selectByPage(String tab, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<DictEntity>> selectByPage(String ns, String tab, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
             }
 
-            List<DictEntity> rs = dictService.selectByPage(tab, pageSize, pageSize * (pageIndex - 1));
+            List<DictEntity> rs = dictService.selectByPage(ns, tab, pageSize, pageSize * (pageIndex - 1));
 
             return success(rs);
         } catch (Exception ex) {
@@ -62,25 +72,27 @@
         }
     }
 
+    @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "sys_dict"),
+            @ApiImplicitParam(name = "ns", value = "琛ㄧ┖闂�", dataType = "String", paramType = "query", example = "bd"),
+            @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg_25w_hyda"),
             @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
     @GetMapping(value = "/selectByPageAndCount")
-    public ResponseMsg<List<DictEntity>> selectByPageAndCount(String tab, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<DictEntity>> selectByPageAndCount(String ns, String tab, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
             }
 
-            int count = dictService.selectCount(tab);
+            int count = dictService.selectCount(ns, tab);
             if (count == 0) {
                 return success(0, null);
             }
 
-            List<DictEntity> rs = dictService.selectByPage(tab, pageSize, pageSize * (pageIndex - 1));
+            List<DictEntity> rs = dictService.selectByPage(ns, tab, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
         } catch (Exception ex) {
@@ -88,14 +100,62 @@
         }
     }
 
-    @ApiOperation(value = "鎻掑叆瀛楀吀")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "dictEntity", 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) {
+    @SysLog()
+    @ApiOperation(value = "鏌ヨ鎵�鏈�")
+    @GetMapping(value = "/selectAll")
+    public ResponseMsg<List<DictEntity>> selectAll() {
         try {
-            int count = dictService.insertDict(dictEntity);
+            List<DictEntity> list = dictService.selectAll();
+
+            return success(list);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏍规嵁ID鏌ヨ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
+    })
+    @GetMapping(value = "/selectById")
+    public ResponseMsg<DictEntity> selectById(int id) {
+        try {
+            DictEntity entity = dictService.selectById(id);
+
+            return success(entity);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏌ヨ瀛楀吀琛ㄧ粨鏋�")
+    @GetMapping(value = "/selectDictTab")
+    public ResponseMsg<List<KeyValueEntity>> selectDictTab() {
+        try {
+            List<KeyValueEntity> list = dictService.selectDictTab();
+
+            return success(list);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鎻掑叆涓�鏉�")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "DictEntity", paramType = "body")
+    })
+    @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8")
+    public ResponseMsg<Integer> insert(@RequestBody DictEntity entity, HttpServletRequest req) {
+        try {
+            UserEntity ue = tokenService.getCurrentUser(req);
+            if (ue != null) {
+                entity.setCreateUser(ue.getId());
+            }
+
+            int count = dictService.insert(entity);
 
             return success(count);
         } catch (Exception ex) {
@@ -103,14 +163,22 @@
         }
     }
 
-    @ApiOperation(value = "鎻掑叆澶氭潯瀛楀吀")
+    @SysLog()
+    @ApiOperation(value = "鎻掑叆澶氭潯")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "dictEntity", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<DictEntity>", paramType = "body", example = "")
+            @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "DictEntity", paramType = "body")
     })
-    @PostMapping(value = "/insertDicts", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<Integer> insertDicts(@RequestBody List<DictEntity> dictEntity) {
+    @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8")
+    public ResponseMsg<Integer> inserts(@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.inserts(list);
 
             return success(count);
         } catch (Exception ex) {
@@ -118,14 +186,15 @@
         }
     }
 
-    @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) {
+    @GetMapping(value = "/delete")
+    public ResponseMsg<Integer> delete(int id) {
         try {
-            int count = dictService.deleteDict(id);
+            int count = dictService.delete(id);
 
             return success(count);
         } catch (Exception ex) {
@@ -133,18 +202,19 @@
         }
     }
 
-    @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 = "Integer", paramType = "query", example = "1,2")
     })
-    @GetMapping(value = "/deleteDicts")
-    public ResponseMsg<Integer> deleteDicts(List<Integer> ids) {
+    @GetMapping(value = "/deletes")
+    public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids) {
         try {
             if (ids == null || ids.isEmpty()) {
                 return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
             }
 
-            int count = dictService.deleteDicts(ids);
+            int count = dictService.deletes(ids);
 
             return success(count);
         } catch (Exception ex) {
@@ -152,15 +222,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")
     })
     @ResponseBody
-    @PostMapping(value = "/updateDict", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<Integer> updateDict(DictEntity dictEntity) {
+    @PostMapping(value = "/update", produces = "application/json; charset=UTF-8")
+    public ResponseMsg<Integer> update(@RequestBody DictEntity entity, HttpServletRequest req) {
         try {
-            int count = dictService.updateDict(dictEntity);
+            UserEntity ue = tokenService.getCurrentUser(req);
+            if (ue != null) {
+                entity.setUpdateUser(ue.getId());
+            }
+
+            int count = dictService.update(entity);
 
             return success(count);
         } catch (Exception ex) {
@@ -168,42 +244,27 @@
         }
     }
 
-    @ApiOperation(value = "鏍规嵁ID鏌ヨ瀛楀吀")
+    @SysLog()
+    @ApiOperation(value = "鏇存柊澶氭潯")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "瀛楀吀ID", dataType = "Integer", paramType = "query", example = "1")
+            @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "DictEntity", paramType = "body")
     })
-    @GetMapping(value = "/selectDict")
-    public ResponseMsg<DictEntity> selectDict(int id) {
+    @ResponseBody
+    @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8")
+    public ResponseMsg<Integer> updates(@RequestBody List<DictEntity> list, HttpServletRequest req) {
         try {
-            DictEntity de = dictService.selectDict(id);
+            UserEntity ue = tokenService.getCurrentUser(req);
+            if (ue != null) {
+                for (DictEntity entity : list) {
+                    entity.setUpdateUser(ue.getId());
+                }
+            }
 
-            return success(de);
+            int count = dictService.updates(list);
+
+            return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
-        }
-    }
-
-    @ApiOperation(value = "鏌ヨ鎵�鏈夊瓧鍏�")
-    @GetMapping(value = "/selectDictAll")
-    public ResponseMsg<List<DictEntity>> selectDictAll() {
-        try {
-            List<DictEntity> list = dictService.selectDictAll();
-
-            return success(list);
-        } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
-        }
-    }
-
-    @ApiOperation(value = "鏌ヨ瀛楀吀涓殑鎵�鏈夎〃鍚�")
-    @GetMapping(value = "/selectDictTab")
-    public ResponseMsg<List<DictEntity>> selectDictTab() {
-        try {
-            List<DictEntity> list = dictService.selectDictTab();
-
-            return success(list);
-        } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex.getMessage(), -1);
         }
     }
 }

--
Gitblit v1.9.3