From fee67ca8a0760315047a52fc4101a8f4f80b7a7f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 11 十一月 2024 15:02:54 +0800
Subject: [PATCH] 1

---
 src/main/java/com/moon/server/controller/sys/ResController.java |   92 +++++++++++++++++++++-------------------------
 1 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/src/main/java/com/moon/server/controller/sys/ResController.java b/src/main/java/com/moon/server/controller/sys/ResController.java
index a99890f..c056adb 100644
--- a/src/main/java/com/moon/server/controller/sys/ResController.java
+++ b/src/main/java/com/moon/server/controller/sys/ResController.java
@@ -5,6 +5,8 @@
 import com.moon.server.entity.all.ResponseMsg;
 import com.moon.server.entity.sys.ResEntity;
 import com.moon.server.entity.sys.UserEntity;
+import com.moon.server.helper.StringHelper;
+import com.moon.server.service.all.PermsService;
 import com.moon.server.service.all.UploadAttachService;
 import com.moon.server.service.sys.ResService;
 import com.moon.server.service.sys.TokenService;
@@ -12,91 +14,57 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
-/**
- * 璧勬簮绠$悊
- * @author WWW
- */
+@SuppressWarnings("ALL")
 @Api(tags = "杩愮淮绠$悊\\璧勬簮绠$悊")
 @RestController
 @RequestMapping("/res")
 public class ResController extends BaseController {
-    @Autowired
+    @Resource
     ResService resService;
 
-    @Autowired
+    @Resource
     TokenService tokenService;
 
-    @Autowired
+    @Resource
+    PermsService permsService;
+
+    @Resource
     UploadAttachService uploadAttachService;
 
     private final static String TAB_NAME = "lf.sys_res";
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ璁板綍鏁�")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", required = false, example = "")
-    })
-    @GetMapping({"/selectCount"})
-    public ResponseMsg<Integer> selectCount(String name) {
-        try {
-            int count = resService.selectCount(name);
-
-            return success(count);
-        } catch (Exception ex) {
-            return fail(ex, -1);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "鍒嗛〉鏌ヨ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name", 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")
-    })
-    @GetMapping(value = "/selectByPage")
-    public ResponseMsg<List<ResEntity>> selectByPage(String name, Integer pageSize, Integer pageIndex) {
-        try {
-            if (pageSize < 1 || pageIndex < 1) {
-                return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
-            }
-
-            List<ResEntity> rs = resService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
-
-            return success(rs);
-        } catch (Exception ex) {
-            return fail(ex, null);
-        }
-    }
-
-    @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
+            @ApiImplicitParam(name = "status", value = "鐘舵��", dataType = "Integer", paramType = "query", example = ""),
+            @ApiImplicitParam(name = "category", value = "鏈嶅姟绫诲埆", dataType = "Integer", paramType = "query", example = ""),
+            @ApiImplicitParam(name = "type", value = "鏈嶅姟绫诲瀷", dataType = "Integer", paramType = "query", example = ""),
+            @ApiImplicitParam(name = "data", value = "鏁版嵁绫诲瀷", dataType = "Integer", paramType = "query", example = ""),
             @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<ResEntity>> selectByPageAndCount(String name, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<ResEntity>> selectByPageAndCount(String name, Integer status, Integer category, Integer type, Integer data, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
             }
 
-            int count = resService.selectCount(name);
+            int count = resService.selectCount(name, status, category, type, data);
             if (count == 0) {
                 return success(0, null);
             }
 
-            List<ResEntity> rs = resService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
+            List<ResEntity> rs = resService.selectByPage(name, status, category, type, data, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
         } catch (Exception ex) {
@@ -132,6 +100,19 @@
     }
 
     @SysLog()
+    @ApiOperation(value = "鏌ヨ鎵�鏈�")
+    @GetMapping(value = "/selectAll")
+    public ResponseMsg<List<ResEntity>> selectAll() {
+        try {
+            List<ResEntity> list = resService.selectAll();
+
+            return success(list);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
+    @SysLog()
     @ApiOperation(value = "鏍规嵁ID鏌ヨ")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
@@ -158,8 +139,10 @@
             UserEntity ue = tokenService.getCurrentUser(req);
             if (ue != null) {
                 entity.setCreateUser(ue.getId());
+                entity.setDepid(ue.getDepcode());
             }
 
+            permsService.clearPermsCache();
             int count = resService.insert(entity);
 
             return success(count);
@@ -180,9 +163,11 @@
             if (ue != null) {
                 for (ResEntity entity : list) {
                     entity.setCreateUser(ue.getId());
+                    entity.setDepid(ue.getDepcode());
                 }
             }
 
+            permsService.clearPermsCache();
             int count = resService.inserts(list);
 
             return success(count);
@@ -199,6 +184,7 @@
     @GetMapping(value = "/delete")
     public ResponseMsg<Integer> delete(int id) {
         try {
+            permsService.clearPermsCache();
             int count = resService.delete(id);
 
             return success(count);
@@ -219,7 +205,9 @@
                 return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
             }
 
-            int count = resService.deletes(ids);
+            permsService.clearPermsCache();
+            String strs = StringHelper.join(ids, ",");
+            int count = resService.deletes(strs);
 
             return success(count);
         } catch (Exception ex) {
@@ -239,8 +227,10 @@
             UserEntity ue = tokenService.getCurrentUser(req);
             if (ue != null) {
                 entity.setUpdateUser(ue.getId());
+                entity.setDepid(ue.getDepcode());
             }
 
+            permsService.clearPermsCache();
             int count = resService.update(entity);
 
             return success(count);
@@ -262,9 +252,11 @@
             if (ue != null) {
                 for (ResEntity entity : list) {
                     entity.setUpdateUser(ue.getId());
+                    entity.setDepid(ue.getDepcode());
                 }
             }
 
+            permsService.clearPermsCache();
             int count = resService.updates(list);
 
             return success(count);

--
Gitblit v1.9.3