From 1b720f575891058b303720ebaf9a2e86e19cd8a3 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Wed, 25 Dec 2024 13:35:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/controller/ScreenAuthController.java | 14 ++++++++++++++
 .../xmgl/modules/basicdata/entity/ScreenAuth.java  | 10 +++++++++-
 .../basicdata/entity/dto/ScreenAuthDto.java        |  3 +++
 .../basicdata/service/IScreenAuthService.java      |  2 ++
 .../service/impl/ScreenAuthServiceImpl.java        | 12 ++++++++++++
 5 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/ScreenAuthController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/ScreenAuthController.java
index b80084753..61214fd29 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/ScreenAuthController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/ScreenAuthController.java
@@ -118,6 +118,20 @@ public class ScreenAuthController {
         return Result.success(list);
     }
 
+    /**
+     * 列表查询
+     *
+     * @param screenAuth
+     * @return
+     */
+    @OperLog(operModul = "大屏权限配置管理", operType = "列表查询", operDesc = "树形查询大屏权限配置类型")
+    @ApiOperation(value = " 树形查询大屏权限配置类型", notes = "树形查询大屏权限配置类型", httpMethod = "POST")
+    @PostMapping(value = "/getType")
+    public Result<Object> getType(@RequestBody ScreenAuth screenAuth) {
+        QueryWrapper<ScreenAuth> queryWrapper = QueryGenerator.initQueryWrapper(screenAuth);
+        return Result.success(screenAuthService.getType(queryWrapper));
+    }
+
 
 
 //    /**
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/ScreenAuth.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/ScreenAuth.java
index 50096e817..4fb108a1b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/ScreenAuth.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/ScreenAuth.java
@@ -61,7 +61,7 @@ public class ScreenAuth implements Serializable {
      */
     @Excel(name = "下标排序", width = 15)
     @ApiModelProperty(value = "下标排序")
-    private Integer sortIndex;
+    private String sortIndex;
     /**
      * 父级ID
      */
@@ -80,6 +80,14 @@ public class ScreenAuth implements Serializable {
     @Excel(name = "对应唯一标识", width = 15)
     @ApiModelProperty(value = "对应唯一标识")
     private String uniqueFlag;
+
+    /**
+     * 级别
+     */
+    @Excel(name = "级别", width = 15)
+    @ApiModelProperty(value = "级别")
+    private Integer level;
+
     /**
      * 权限类型(1：模版菜单;2：自定义菜单)
      */
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/dto/ScreenAuthDto.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/dto/ScreenAuthDto.java
index 73df4b45b..004e254d5 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/dto/ScreenAuthDto.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/dto/ScreenAuthDto.java
@@ -47,6 +47,9 @@ public class ScreenAuthDto {
     @ApiModelProperty(value = "权限类型(1：模版菜单;2：自定义菜单)")
     private Integer type;
 
+    @ApiModelProperty(value = "级别")
+    private Integer level;
+
     @ApiModelProperty(value = "子级菜单")
     private List<ScreenAuthDto> children;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IScreenAuthService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IScreenAuthService.java
index 9170daf71..17eadc0a6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IScreenAuthService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IScreenAuthService.java
@@ -20,6 +20,8 @@ public interface IScreenAuthService extends IService<ScreenAuth> {
 
     List<ScreenAuthDto> treeList(Wrapper<ScreenAuth> wrapper);
 
+    int getType(Wrapper<ScreenAuth> wrapper);
+
     boolean saveInfo(ScreenAuthVo screenAuthVo);
 
     boolean delInfo(String id);
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ScreenAuthServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ScreenAuthServiceImpl.java
index 31ef1c1bf..1f5cecc00 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ScreenAuthServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ScreenAuthServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.xmgl.modules.basicdata.entity.*;
 import com.zhgd.xmgl.modules.basicdata.entity.dto.ScreenAuthDto;
 import com.zhgd.xmgl.modules.basicdata.entity.vo.ScreenAuthVo;
@@ -93,6 +94,15 @@ public class ScreenAuthServiceImpl extends ServiceImpl<ScreenAuthMapper, ScreenA
         return treeList;
     }
 
+    @Override
+    public int getType(Wrapper<ScreenAuth> wrapper) {
+        List<ScreenAuth> allList = baseMapper.selectPage(new Page<>(1, 1), wrapper).getRecords();
+        if (allList.size() == 0) {
+            return 1;
+        }
+        return allList.get(0).getType();
+    }
+
     @Override
     public boolean saveInfo(ScreenAuthVo screenAuthVo) {
         return saveOrUpdate(screenAuthVo.getScreenAuth(), screenAuthVo.getAuthType(), screenAuthVo.getUniqueFlag());
@@ -247,6 +257,7 @@ public class ScreenAuthServiceImpl extends ServiceImpl<ScreenAuthMapper, ScreenA
             screenAuthDto.setRoutePath(baseModule.getModulePath());
             screenAuthDto.setSortIndex(baseModule.getSortIndex());
             screenAuthDto.setParentId(0L);
+            screenAuthDto.setLevel(1);
             screenAuthList.add(screenAuthDto);
         }
         return screenAuthList;
@@ -262,6 +273,7 @@ public class ScreenAuthServiceImpl extends ServiceImpl<ScreenAuthMapper, ScreenA
             screenAuthDto.setRoutePath(baseMenu.getPath());
             screenAuthDto.setSortIndex(baseMenu.getPriority().toString());
             screenAuthDto.setParentId(baseMenu.getModuleId());
+            screenAuthDto.setLevel(2);
             screenAuthList.add(screenAuthDto);
         }
         return screenAuthList;