From 32eb942e25aa366563b7f40b05a382c0c462213c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 22 七月 2025 10:29:38 +0800
Subject: [PATCH] 修改切面日志功能

---
 se-system/src/main/java/com/terra/system/controller/all/PermsController.java |  116 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 77 insertions(+), 39 deletions(-)

diff --git a/se-system/src/main/java/com/terra/system/controller/all/PermsController.java b/se-system/src/main/java/com/terra/system/controller/all/PermsController.java
index 9fb4aae..38f7e38 100644
--- a/se-system/src/main/java/com/terra/system/controller/all/PermsController.java
+++ b/se-system/src/main/java/com/terra/system/controller/all/PermsController.java
@@ -1,20 +1,25 @@
 package com.terra.system.controller.all;
 
-import com.terra.system.annotation.SysLog;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
+import com.terra.common.annotation.SysLog;
 import com.terra.system.entity.all.*;
-import com.terra.system.entity.data.LayerEntity;
+import com.terra.system.entity.sys.LayerEntity;
 import com.terra.system.entity.sys.MenuEntity;
+import com.terra.system.entity.sys.ResEntity;
 import com.terra.system.entity.sys.UserEntity;
 import com.terra.system.service.all.PermsService;
-import com.terra.system.service.data.LayerService;
+import com.terra.system.service.sys.LayerService;
 import com.terra.system.service.sys.MenuService;
 import com.terra.system.service.sys.TokenService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
 import javax.annotation.Resource;
 
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -23,7 +28,7 @@
  * 鎺堟潈鎺у埗鍣�
  * @author WWW
  */
-@Api(tags = "杩愮淮绠$悊\\鎺堟潈绠$悊")
+@Tag(name = "杩愮淮绠$悊\\鎺堟潈绠$悊")
 @RestController
 @RequestMapping("/perms")
 public class PermsController extends BaseController {
@@ -40,9 +45,9 @@
     LayerService layerService;
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ褰撳墠鐢ㄦ埛鐨勮祫婧愭巿鏉�")
-    @GetMapping(value = "/selectRes")
-    public ResponseMsg<List<ResAuthEntity>> selectRes(HttpServletRequest req) {
+    @Operation(summary = "鏌ヨ褰撳墠鐢ㄦ埛鐨勫浘灞傛巿鏉�")
+    @GetMapping(value = "/selectLayers")
+    public ResponseMsg<Object> selectLayers(HttpServletRequest req) {
         try {
             UserEntity ue = tokenService.getCurrentUser(req);
             if (ue == null) {
@@ -50,16 +55,54 @@
             }
 
             String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
-            List<ResAuthEntity> rs = permsService.selectRes(uid);
+            List<LayerEntity> rs = layerService.selectLayers(uid);
 
-            return success(rs);
+            return success(null == rs ? 0 : rs.size(), rs);
         } catch (Exception ex) {
             return fail(ex, null);
         }
     }
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ褰撳墠鐢ㄦ埛鐨勮彍鍗曟巿鏉�")
+    @Operation(summary = "鏌ヨ褰撳墠鐢ㄦ埛鐨勬姇褰卞浘灞傛巿鏉�")
+    @GetMapping(value = "/selectProjectLayers")
+    public ResponseMsg<Object> selectProjectLayers(HttpServletRequest req) {
+        try {
+            UserEntity ue = tokenService.getCurrentUser(req);
+            if (ue == null) {
+                return fail("鐢ㄦ埛鏈櫥褰�", null);
+            }
+
+            String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
+            List<LayerEntity> rs = layerService.selectProjectLayers(uid);
+
+            return success(null == rs ? 0 : rs.size(), rs);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
+    @SysLog()
+    @Operation(summary = "鏌ヨ褰撳墠鐢ㄦ埛鐨勮祫婧愭巿鏉�")
+    @GetMapping(value = "/selectRes")
+    public ResponseMsg<Object> selectRes(HttpServletRequest req) {
+        try {
+            UserEntity ue = tokenService.getCurrentUser(req);
+            if (ue == null) {
+                return fail("鐢ㄦ埛鏈櫥褰�", null);
+            }
+
+            String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
+            List<ResEntity> rs = permsService.selectRes(uid);
+
+            return success(null == rs ? 0 : rs.size(), rs);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
+    @SysLog()
+    @Operation(summary = "鏌ヨ褰撳墠鐢ㄦ埛鐨勮彍鍗曟巿鏉�")
     @GetMapping(value = "/selectMenus")
     public ResponseMsg<List<MenusAuthEntity>> selectMenus(HttpServletRequest req) {
         try {
@@ -78,7 +121,7 @@
     }
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ褰撳墠鐢ㄦ埛鐨勬潈闄愭巿鏉�")
+    @Operation(summary = "鏌ヨ褰撳墠鐢ㄦ埛鐨勬潈闄愭巿鏉�")
     @GetMapping(value = "/selectPerms")
     public ResponseMsg<List<String>> selectPerms(HttpServletRequest req) {
         try {
@@ -97,7 +140,7 @@
     }
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ褰撳墠鐢ㄦ埛鐨勬潈闄愭巿鏉冨疄浣撻泦鍚�")
+    @Operation(summary = "鏌ヨ褰撳墠鐢ㄦ埛鐨勬潈闄愭巿鏉冨疄浣撻泦鍚�")
     @GetMapping(value = "/selectPermsEntity")
     public ResponseMsg<List<PermsAuthEntity>> selectPermsEntity(HttpServletRequest req) {
         try {
@@ -116,7 +159,20 @@
     }
 
     @SysLog()
-    @ApiOperation(value = "娓呯┖鎵�鏈夋巿鏉冪紦瀛�")
+    @Operation(summary = "娓呯┖鎺堟潈缂撳瓨")
+    @GetMapping(value = "/deletePermsCache")
+    public ResponseMsg<Boolean> deletePermsCache() {
+        try {
+            permsService.clearPermsCache();
+
+            return success(true);
+        } catch (Exception ex) {
+            return fail(ex, false);
+        }
+    }
+
+    @SysLog()
+    @Operation(summary = "娓呯┖鎵�鏈夌紦瀛�")
     @GetMapping(value = "/deleteAllCache")
     public ResponseMsg<Boolean> deleteAllCache() {
         try {
@@ -129,7 +185,7 @@
     }
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ鐢ㄦ埛瑙掕壊")
+    @Operation(summary = "鏌ヨ鐢ㄦ埛瑙掕壊")
     @GetMapping("/selectRoles")
     public ResponseMsg<Object> selectRoles(HttpServletRequest req) {
         try {
@@ -147,9 +203,9 @@
     }
 
     @SysLog()
-    @ApiOperation(value = "閫掑綊鏌ヨ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "鑿滃崟ID", dataType = "Integer", paramType = "query", example = "14")
+    @Operation(summary = "閫掑綊鏌ヨ")
+    @Parameters({
+            @Parameter(name = "id", description = "鑿滃崟ID", in = ParameterIn.QUERY, example = "14")
     })
     @GetMapping(value = "/selectMenuRecursive")
     public ResponseMsg<Object> selectMenuRecursive(int id, HttpServletRequest req) {
@@ -161,24 +217,6 @@
 
             String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
             List<MenuEntity> list = permsService.selectMenuRecursive(id, uid);
-
-            return success(list);
-        } catch (Exception ex) {
-            return fail(ex, null);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "鏌ヨ鎵�鏈夊浘灞�")
-    @GetMapping(value = "/selectLayers")
-    public ResponseMsg<Object> selectLayers(HttpServletRequest req) {
-        try {
-            UserEntity ue = tokenService.getCurrentUser(req);
-            if (ue == null) {
-                return fail("鐢ㄦ埛鏈櫥褰�", null);
-            }
-
-            List<LayerEntity> list = layerService.selectAll();
 
             return success(list);
         } catch (Exception ex) {

--
Gitblit v1.9.3