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

diff --git a/src/main/java/com/moon/server/controller/all/PermsController.java b/src/main/java/com/moon/server/controller/all/PermsController.java
index 8279d9e..52479d8 100644
--- a/src/main/java/com/moon/server/controller/all/PermsController.java
+++ b/src/main/java/com/moon/server/controller/all/PermsController.java
@@ -20,13 +20,10 @@
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
-/**
- * 鎺堟潈鎺у埗鍣�
- * @author WWW
- */
 @Api(tags = "杩愮淮绠$悊\\鎺堟潈绠$悊")
 @RestController
 @RequestMapping("/perms")
+@SuppressWarnings("ALL")
 public class PermsController extends BaseController {
     @Autowired
     PermsService permsService;
@@ -41,7 +38,7 @@
     LayerService layerService;
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ褰撳墠鐢ㄦ埛鐨勮祫婧愭巿鏉�")
+    @ApiOperation(value = "鏌ヨ褰撳墠鐢ㄦ埛鐨勫浘灞傛巿鏉�")
     @GetMapping(value = "/selectLayers")
     public ResponseMsg<Object> selectLayers(HttpServletRequest req) {
         try {
@@ -53,7 +50,26 @@
             String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
             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 = "鏌ヨ褰撳墠鐢ㄦ埛鐨勬姇褰卞浘灞傛巿鏉�")
+    @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);
         }
@@ -72,7 +88,7 @@
             String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
             List<ResEntity> rs = permsService.selectRes(uid);
 
-            return success(rs);
+            return success(null == rs ? 0 : rs.size(), rs);
         } catch (Exception ex) {
             return fail(ex, null);
         }

--
Gitblit v1.9.3