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/all/PermsController.java |   99 ++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/all/PermsController.java b/src/main/java/com/lf/server/controller/all/PermsController.java
index e577b88..ba2a378 100644
--- a/src/main/java/com/lf/server/controller/all/PermsController.java
+++ b/src/main/java/com/lf/server/controller/all/PermsController.java
@@ -1,14 +1,17 @@
 package com.lf.server.controller.all;
 
-import com.lf.server.aspect.SysLog;
-import com.lf.server.entity.all.MenusAuthEntity;
-import com.lf.server.entity.all.PermsAuthEntity;
-import com.lf.server.entity.all.ResAuthEntity;
-import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.annotation.SysLog;
+import com.lf.server.entity.all.*;
+import com.lf.server.entity.data.LayerEntity;
+import com.lf.server.entity.sys.MenuEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.service.all.PermsService;
+import com.lf.server.service.data.LayerService;
+import com.lf.server.service.sys.MenuService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
+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.*;
@@ -30,6 +33,12 @@
     @Autowired
     TokenService tokenService;
 
+    @Autowired
+    MenuService menuService;
+
+    @Autowired
+    LayerService layerService;
+
     @SysLog()
     @ApiOperation(value = "鏌ヨ褰撳墠鐢ㄦ埛鐨勮祫婧愭巿鏉�")
     @GetMapping(value = "/selectRes")
@@ -40,11 +49,12 @@
                 return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
 
-            List<ResAuthEntity> rs = permsService.selectRes(ue.getUid());
+            String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
+            List<ResAuthEntity> rs = permsService.selectRes(uid);
 
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -58,11 +68,12 @@
                 return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
 
-            List<MenusAuthEntity> rs = permsService.selectMenus(ue.getUid());
+            String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
+            List<MenusAuthEntity> rs = permsService.selectMenus(uid);
 
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -76,11 +87,12 @@
                 return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
 
-            List<String> rs = permsService.selectPerms(ue.getUid());
+            String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
+            List<String> rs = permsService.selectPerms(uid);
 
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -94,11 +106,12 @@
                 return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
 
-            List<PermsAuthEntity> rs = permsService.selectPermsEntity(ue.getUid());
+            String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
+            List<PermsAuthEntity> rs = permsService.selectPermsEntity(uid);
 
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -111,7 +124,65 @@
 
             return success(true);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), false);
+            return fail(ex, false);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏌ヨ鐢ㄦ埛瑙掕壊")
+    @GetMapping("/selectRoles")
+    public ResponseMsg<Object> selectRoles(HttpServletRequest req) {
+        try {
+            UserEntity ue = tokenService.getCurrentUser(req);
+            if (ue == null) {
+                return fail("鐢ㄦ埛鏈櫥褰�", null);
+            }
+
+            List<Integer> list = permsService.selectRoles(ue.getUid());
+
+            return success(list);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "閫掑綊鏌ヨ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "鑿滃崟ID", dataType = "Integer", paramType = "query", example = "14")
+    })
+    @GetMapping(value = "/selectMenuRecursive")
+    public ResponseMsg<Object> selectMenuRecursive(int id, 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<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) {
+            return fail(ex, null);
         }
     }
 }

--
Gitblit v1.9.3