From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

---
 src/main/java/com/lf/server/controller/sys/AuthController.java |   74 ++++++++++++++++++++++++++++++------
 1 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/sys/AuthController.java b/src/main/java/com/lf/server/controller/sys/AuthController.java
index 49bdedd..240bc4c 100644
--- a/src/main/java/com/lf/server/controller/sys/AuthController.java
+++ b/src/main/java/com/lf/server/controller/sys/AuthController.java
@@ -1,10 +1,11 @@
 package com.lf.server.controller.sys;
 
-import com.lf.server.aspect.SysLog;
+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.sys.AuthEntity;
 import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.service.all.PermsService;
 import com.lf.server.service.sys.AuthService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
@@ -32,6 +33,9 @@
     @Autowired
     TokenService tokenService;
 
+    @Autowired
+    PermsService permsService;
+
     @SysLog()
     @ApiOperation(value = "鏌ヨ璁板綍鏁�")
     @ApiImplicitParams({
@@ -44,7 +48,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -64,7 +68,7 @@
             List<AuthEntity> rs = authService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -91,14 +95,41 @@
 
             return success(count, rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏍规嵁鑿滃崟鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "menuid", value = "鑿滃崟ID", dataType = "Integer", paramType = "query", example = "1"),
+            @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
+            @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
+    })
+    @GetMapping(value = "/selectByPageForMenu")
+    public ResponseMsg<List<AuthEntity>> selectByPageForMenu(Integer menuid, Integer pageSize, Integer pageIndex) {
+        try {
+            if (pageSize < 1 || pageIndex < 1) {
+                return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+            }
+
+            int count = authService.selectCountForMenu(menuid);
+            if (count == 0) {
+                return success(0, null);
+            }
+
+            List<AuthEntity> rs = authService.selectByPageForMenu(menuid, pageSize, pageSize * (pageIndex - 1));
+
+            return success(count, rs);
+        } catch (Exception ex) {
+            return fail(ex, null);
         }
     }
 
     @SysLog()
     @ApiOperation(value = "鎻掑叆涓�鏉�")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "entity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.AuthEntity", paramType = "body", example = "")
+            @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "AuthEntity", paramType = "body", example = "")
     })
     @PostMapping(value = "/insertAuth", produces = "application/json; charset=UTF-8")
     public ResponseMsg<Integer> insertAuth(@RequestBody AuthEntity entity, HttpServletRequest req) {
@@ -109,10 +140,13 @@
             }
 
             int count = authService.insertAuth(entity);
+            if (count > 0) {
+                permsService.clearPermsCache();
+            }
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -132,10 +166,13 @@
             }
 
             int count = authService.insertAuths(list);
+            if (count > 0) {
+                permsService.clearPermsCache();
+            }
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -148,17 +185,20 @@
     public ResponseMsg<Integer> deleteAuth(int id) {
         try {
             int count = authService.deleteAuth(id);
+            if (count > 0) {
+                permsService.clearPermsCache();
+            }
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
     @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 = "/deleteAuths")
     public ResponseMsg<Integer> deleteAuths(@RequestParam List<Integer> ids) {
@@ -166,10 +206,15 @@
             if (ids == null || ids.isEmpty()) {
                 return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
             }
+
             int count = authService.deleteAuths(ids);
+            if (count > 0) {
+                permsService.clearPermsCache();
+            }
+
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -188,10 +233,13 @@
             }
 
             int count = authService.updateAuth(entity);
+            if (count > 0) {
+                permsService.clearPermsCache();
+            }
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -207,7 +255,7 @@
 
             return success(authEntity);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -220,7 +268,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 }

--
Gitblit v1.9.3