From 209abd30cffae7f3419c7046dbd4d696717600d0 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期一, 27 二月 2023 18:06:37 +0800
Subject: [PATCH] 20230227@xingjs@提交官网一张图相关内容接口(专题展示和工程展示相关模块内容)

---
 src/main/java/com/lf/server/controller/all/PermsController.java |   64 +++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 18 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 cc757f8..ad25dec 100644
--- a/src/main/java/com/lf/server/controller/all/PermsController.java
+++ b/src/main/java/com/lf/server/controller/all/PermsController.java
@@ -5,10 +5,11 @@
 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.entity.data.DirEntity;
+import com.lf.server.entity.sys.LayerEntity;
+import com.lf.server.entity.sys.MenuEntity;
 import com.lf.server.entity.sys.UserEntity;
-import com.lf.server.helper.StringHelper;
 import com.lf.server.service.all.PermsService;
+import com.lf.server.service.sys.LayerService;
 import com.lf.server.service.sys.MenuService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
@@ -19,7 +20,6 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -39,6 +39,9 @@
     @Autowired
     MenuService menuService;
 
+    @Autowired
+    LayerService layerService;
+
     @SysLog()
     @ApiOperation(value = "鏌ヨ褰撳墠鐢ㄦ埛鐨勮祫婧愭巿鏉�")
     @GetMapping(value = "/selectRes")
@@ -53,7 +56,7 @@
 
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -71,7 +74,7 @@
 
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -89,7 +92,7 @@
 
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -107,7 +110,7 @@
 
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -120,39 +123,64 @@
 
             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, HttpServletResponse res) {
+    public ResponseMsg<Object> selectRoles(HttpServletRequest req) {
         try {
-            //
+            UserEntity ue = tokenService.getCurrentUser(req);
+            if (ue == null) {
+                return fail("鐢ㄦ埛鏈櫥褰�", null);
+            }
 
-            return success(null);
+            List<Integer> list = permsService.selectRoles(ue.getUid());
+
+            return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
     @SysLog()
     @ApiOperation(value = "閫掑綊鏌ヨ")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "name", value = "鑿滃崟鍚嶇О", dataType = "String", paramType = "query", required = false, example = "绠￠亾鍩虹澶ф暟鎹钩鍙�")
+            @ApiImplicitParam(name = "id", value = "鑿滃崟ID", dataType = "Integer", paramType = "query", example = "14")
     })
     @GetMapping(value = "/selectMenuRecursive")
-    public ResponseMsg<List<DirEntity>> selectMenuRecursive(String name) {
+    public ResponseMsg<Object> selectMenuRecursive(int id, HttpServletRequest req) {
         try {
-            if (StringHelper.isEmpty(name)) {
-                name = "绠￠亾鍩虹澶ф暟鎹钩鍙�";
+            UserEntity ue = tokenService.getCurrentUser(req);
+            if (ue == null) {
+                return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
-            List<DirEntity> list = menuService.selectMenuRecursive(name);
+
+            List<MenuEntity> list = permsService.selectMenuRecursive(id, ue.getUid());
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            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