From 89f9b7d46346da4f9263d27f6ce20032b9458bd5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 25 八月 2023 11:10:56 +0800
Subject: [PATCH] 元数据管理添加空间过滤条件

---
 src/main/java/com/moon/server/controller/all/PermsController.java |   61 ++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 20 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 9394500..3ec3983 100644
--- a/src/main/java/com/moon/server/controller/all/PermsController.java
+++ b/src/main/java/com/moon/server/controller/all/PermsController.java
@@ -1,11 +1,12 @@
 package com.moon.server.controller.all;
 
 import com.moon.server.annotation.SysLog;
+import com.moon.server.entity.sys.LayerEntity;
 import com.moon.server.entity.sys.MenuEntity;
 import com.moon.server.entity.sys.ResEntity;
 import com.moon.server.entity.sys.UserEntity;
 import com.moon.server.service.all.PermsService;
-import com.moon.server.service.data.LayerService;
+import com.moon.server.service.sys.LayerService;
 import com.moon.server.service.sys.MenuService;
 import com.moon.server.service.sys.TokenService;
 import com.moon.server.entity.all.*;
@@ -40,6 +41,44 @@
     LayerService layerService;
 
     @SysLog()
+    @ApiOperation(value = "鏌ヨ褰撳墠鐢ㄦ埛鐨勫浘灞傛巿鏉�")
+    @GetMapping(value = "/selectLayers")
+    public ResponseMsg<Object> selectLayers(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.selectLayers(uid);
+
+            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);
+        }
+    }
+
+    @SysLog()
     @ApiOperation(value = "鏌ヨ褰撳墠鐢ㄦ埛鐨勮祫婧愭巿鏉�")
     @GetMapping(value = "/selectRes")
     public ResponseMsg<Object> selectRes(HttpServletRequest req) {
@@ -52,7 +91,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);
         }
@@ -180,22 +219,4 @@
             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