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 |   43 +++++++++++++++++--------------------------
 1 files changed, 17 insertions(+), 26 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 a9a73e8..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,7 @@
 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;
@@ -21,10 +22,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
-/**
- * 璧勬簮绠$悊
- * @author WWW
- */
+@SuppressWarnings("ALL")
 @Api(tags = "杩愮淮绠$悊\\璧勬簮绠$悊")
 @RestController
 @RequestMapping("/res")
@@ -47,22 +45,26 @@
     @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) {
@@ -140,10 +142,8 @@
                 entity.setDepid(ue.getDepcode());
             }
 
+            permsService.clearPermsCache();
             int count = resService.insert(entity);
-            if (count > 0) {
-                permsService.clearPermsCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
@@ -167,10 +167,8 @@
                 }
             }
 
+            permsService.clearPermsCache();
             int count = resService.inserts(list);
-            if (count > 0) {
-                permsService.clearPermsCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
@@ -186,10 +184,8 @@
     @GetMapping(value = "/delete")
     public ResponseMsg<Integer> delete(int id) {
         try {
+            permsService.clearPermsCache();
             int count = resService.delete(id);
-            if (count > 0) {
-                permsService.clearPermsCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
@@ -209,10 +205,9 @@
                 return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
             }
 
-            int count = resService.deletes(ids);
-            if (count > 0) {
-                permsService.clearPermsCache();
-            }
+            permsService.clearPermsCache();
+            String strs = StringHelper.join(ids, ",");
+            int count = resService.deletes(strs);
 
             return success(count);
         } catch (Exception ex) {
@@ -235,10 +230,8 @@
                 entity.setDepid(ue.getDepcode());
             }
 
+            permsService.clearPermsCache();
             int count = resService.update(entity);
-            if (count > 0) {
-                permsService.clearPermsCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
@@ -263,10 +256,8 @@
                 }
             }
 
+            permsService.clearPermsCache();
             int count = resService.updates(list);
-            if (count > 0) {
-                permsService.clearPermsCache();
-            }
 
             return success(count);
         } catch (Exception ex) {

--
Gitblit v1.9.3