From 810ad9dbaa8553299a4516790a9f546a9b84905e Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 08 七月 2025 16:16:26 +0800
Subject: [PATCH] 添加图层管理,修改权限管理

---
 se-system/src/main/java/com/terra/system/controller/sys/LayerController.java |   97 ++++++++++++------------------------------------
 1 files changed, 24 insertions(+), 73 deletions(-)

diff --git a/se-system/src/main/java/com/terra/system/controller/data/LayerController.java b/se-system/src/main/java/com/terra/system/controller/sys/LayerController.java
similarity index 69%
rename from se-system/src/main/java/com/terra/system/controller/data/LayerController.java
rename to se-system/src/main/java/com/terra/system/controller/sys/LayerController.java
index c1d543e..46fb208 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/LayerController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/LayerController.java
@@ -1,94 +1,57 @@
-package com.terra.system.controller.data;
+package com.terra.system.controller.sys;
 
 import com.terra.system.annotation.SysLog;
 import com.terra.system.controller.all.BaseController;
 import com.terra.system.entity.all.ResponseMsg;
-import com.terra.system.entity.data.LayerEntity;
+import com.terra.system.entity.sys.LayerEntity;
 import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.service.data.LayerService;
+import com.terra.system.service.all.PermsService;
+import com.terra.system.service.sys.LayerService;
 import com.terra.system.service.sys.TokenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import javax.annotation.Resource;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
-/**
- * 鍥惧眰绠$悊
- * @author WWW
- */
-@Api(tags = "鏁版嵁绠$悊\\鍥惧眰绠$悊")
+@Api(tags = "杩愮淮绠$悊\\鍥惧眰绠$悊")
 @RestController
+@SuppressWarnings("ALL")
 @RequestMapping("/layer")
 public class LayerController extends BaseController {
-    @Resource
+    @Autowired
     LayerService layerService;
 
-    @Resource
+    @Autowired
     TokenService tokenService;
 
-    @SysLog()
-    @ApiOperation(value = "鏌ヨ璁板綍鏁�")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cnName", value = "涓枃鍚嶇О", dataType = "String", paramType = "query", required = false, example = "")
-    })
-    @GetMapping({"/selectCount"})
-    public ResponseMsg<Integer> selectCount(String cnName) {
-        try {
-            int count = layerService.selectCount(cnName);
-
-            return success(count);
-        } catch (Exception ex) {
-            return fail(ex, -1);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "鍒嗛〉鏌ヨ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "cnName", value = "涓枃鍚嶇О", dataType = "String", paramType = "query", example = ""),
-            @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
-            @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
-    })
-    @GetMapping(value = "/selectByPage")
-    public ResponseMsg<List<LayerEntity>> selectByPage(String cnName, Integer pageSize, Integer pageIndex) {
-        try {
-            if (pageSize < 1 || pageIndex < 1) {
-                return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
-            }
-
-            List<LayerEntity> rs = layerService.selectByPage(cnName, pageSize, pageSize * (pageIndex - 1));
-
-            return success(rs);
-        } catch (Exception ex) {
-            return fail(ex, null);
-        }
-    }
+    @Autowired
+    PermsService permsService;
 
     @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "cnName", value = "涓枃鍚嶇О", dataType = "String", paramType = "query", example = ""),
+            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
             @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
     @GetMapping(value = "/selectByPageAndCount")
-    public ResponseMsg<List<LayerEntity>> selectByPageAndCount(String cnName, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<LayerEntity>> selectByPageAndCount(String name, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
             }
 
-            int count = layerService.selectCount(cnName);
+            int count = layerService.selectCount(name);
             if (count == 0) {
                 return success(0, null);
             }
 
-            List<LayerEntity> rs = layerService.selectByPage(cnName, pageSize, pageSize * (pageIndex - 1));
+            List<LayerEntity> rs = layerService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
         } catch (Exception ex) {
@@ -99,9 +62,9 @@
     @SysLog()
     @ApiOperation(value = "鏌ヨ鎵�鏈�")
     @GetMapping(value = "/selectAll")
-    public ResponseMsg<List<LayerEntity>> selectAll() {
+    public ResponseMsg<List<LayerEntity>> selectAll(Integer flag) {
         try {
-            List<LayerEntity> list = layerService.selectAll();
+            List<LayerEntity> list = layerService.selectAll(flag);
 
             return success(list);
         } catch (Exception ex) {
@@ -138,10 +101,8 @@
                 entity.setCreateUser(ue.getId());
             }
 
+            permsService.clearPermsCache();
             int count = layerService.insert(entity);
-            if (count > 0) {
-                layerService.clearCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
@@ -164,10 +125,8 @@
                 }
             }
 
+            permsService.clearPermsCache();
             int count = layerService.inserts(list);
-            if (count > 0) {
-                layerService.clearCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
@@ -183,10 +142,8 @@
     @GetMapping(value = "/delete")
     public ResponseMsg<Integer> delete(int id) {
         try {
+            permsService.clearPermsCache();
             int count = layerService.delete(id);
-            if (count > 0) {
-                layerService.clearCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
@@ -206,10 +163,8 @@
                 return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
             }
 
+            permsService.clearPermsCache();
             int count = layerService.deletes(ids);
-            if (count > 0) {
-                layerService.clearCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
@@ -231,10 +186,8 @@
                 entity.setUpdateUser(ue.getId());
             }
 
+            permsService.clearPermsCache();
             int count = layerService.update(entity);
-            if (count > 0) {
-                layerService.clearCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
@@ -258,10 +211,8 @@
                 }
             }
 
+            permsService.clearPermsCache();
             int count = layerService.updates(list);
-            if (count > 0) {
-                layerService.clearCache();
-            }
 
             return success(count);
         } catch (Exception ex) {

--
Gitblit v1.9.3