From dbbfe5de7b6a80c143aa32e576b8bee589d7985a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 13 九月 2023 13:52:08 +0800
Subject: [PATCH] 修改mn下的所有实体类
---
src/main/java/com/moon/server/controller/all/PermsController.java | 71 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 25 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 2ecc464..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.data.LayerEntity;
+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,9 +41,9 @@
LayerService layerService;
@SysLog()
- @ApiOperation(value = "鏌ヨ褰撳墠鐢ㄦ埛鐨勮祫婧愭巿鏉�")
- @GetMapping(value = "/selectRes")
- public ResponseMsg<List<ResAuthEntity>> selectRes(HttpServletRequest req) {
+ @ApiOperation(value = "鏌ヨ褰撳墠鐢ㄦ埛鐨勫浘灞傛巿鏉�")
+ @GetMapping(value = "/selectLayers")
+ public ResponseMsg<Object> selectLayers(HttpServletRequest req) {
try {
UserEntity ue = tokenService.getCurrentUser(req);
if (ue == null) {
@@ -50,9 +51,47 @@
}
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 = "鏌ヨ褰撳墠鐢ㄦ埛鐨勬姇褰卞浘灞傛巿鏉�")
+ @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) {
+ 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);
}
@@ -174,24 +213,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