Merge branch 'first' into second

# Conflicts:
#	base-manager/db/add.sql
#	base-manager/pom.xml
#	base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java
#	base-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartedService.java

base-manager/db/add.sql

@@ -440,3 +440,138 @@ CREATE TABLE `mortals_sys_dowork_stat` (
     ,KEY `year` (`year`) USING BTREE
     ,KEY `month` (`month`) USING BTREE
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='办件统计';
+
+
+
+
+
+-- ----------------------------
+-- 角色权限改造 2025-04-23
+-- ----------------------------
+-- ----------------------------
+-- 资源信息业务表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_resource`;
+CREATE TABLE mortals_xhx_resource(
+     `id` bigint(20)   AUTO_INCREMENT   COMMENT '菜单ID，主键，自增长',
+     `name` varchar(50)      COMMENT '名称',
+     `groupName` varchar(255)      COMMENT '分组名称',
+     `url` varchar(2000)      COMMENT '连接地址，多个地址以逗号分隔',
+     `authType` tinyint(2)    DEFAULT '3'  COMMENT '权限类型 (0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)',
+     `sourceType` tinyint(2)    DEFAULT '0'  COMMENT '资源类型，(0.系统资源，1.开放资源)',
+     `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
+     `createUserName` varchar(50)      COMMENT '创建用户名称',
+     `createTime` datetime NOT NULL     COMMENT '创建时间',
+     `updateUserId` bigint(20)      COMMENT '更新用户',
+     `updateUserName` varchar(50)      COMMENT '创建用户名称',
+     `updateTime` datetime      COMMENT '更新时间',
+     PRIMARY KEY  (`id`),
+     INDEX `idx_name`(`name`) USING BTREE,
+     INDEX `idx_groupName`(`groupName`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='资源信息业务';
+
+
+-- ----------------------------
+-- 角色信息业务表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_role`;
+CREATE TABLE mortals_xhx_role(
+     `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+     `name` varchar(50)      COMMENT '角色名称',
+     `remark` varchar(200)      COMMENT '备注',
+     `roleType` tinyint(2)    DEFAULT '2'  COMMENT '角色类型 (0.系统内置角色,1.默认系统角色.2.普通角色)',
+     `customerId` bigint(20)      COMMENT '归属客户ID',
+     `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
+     `createUserName` varchar(50)      COMMENT '创建用户名称',
+     `createTime` datetime NOT NULL     COMMENT '创建时间',
+     `updateUserId` bigint(20)      COMMENT '更新用户',
+     `updateUserName` varchar(50)      COMMENT '创建用户名称',
+     `updateTime` datetime      COMMENT '更新时间',
+     PRIMARY KEY  (`id`),
+     INDEX `idx_name`(`name`) USING BTREE,
+     INDEX `idx_roleType`(`roleType`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色信息业务';
+
+-- ----------------------------
+-- 角色资源权限业务表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_role_auth`;
+CREATE TABLE mortals_xhx_role_auth(
+  `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+  `roleId` bigint(20)      COMMENT '角色ID',
+  `menuId` bigint(20)      COMMENT '菜单ID',
+  `resourceId` bigint(20)      COMMENT '资源ID',
+  `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
+  `createUserName` varchar(50)      COMMENT '创建用户名称',
+  `createTime` datetime NOT NULL     COMMENT '创建时间',
+  `updateUserId` bigint(20)      COMMENT '更新用户',
+  `updateUserName` varchar(50)      COMMENT '创建用户名称',
+  `updateTime` datetime      COMMENT '更新时间',
+  PRIMARY KEY  (`id`),
+  INDEX `idx_roleId`(`roleId`) USING BTREE,
+  INDEX `idx_menuId`(`menuId`) USING BTREE,
+  INDEX `resourceId` (`resourceId`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色资源权限业务';
+
+
+-- ----------------------------
+-- 角色用户业务表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_role_user`;
+CREATE TABLE mortals_xhx_role_user(
+  `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+  `roleId` bigint(20)      COMMENT '角色ID',
+  `userId` bigint(20)      COMMENT '用户ID',
+  `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
+  `createUserName` varchar(50)      COMMENT '创建用户名称',
+  `createTime` datetime NOT NULL     COMMENT '创建时间',
+  `updateUserId` bigint(20)      COMMENT '更新用户',
+  `updateUserName` varchar(50)      COMMENT '创建用户名称',
+  `updateTime` datetime      COMMENT '更新时间',
+  PRIMARY KEY  (`id`),
+  INDEX `idx_roleId`(`roleId`) USING BTREE,
+  INDEX `idx_userId`(`userId`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色用户业务';
+
+
+DROP TABLE IF EXISTS `mortals_xhx_menu`;
+CREATE TABLE mortals_xhx_menu(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '菜单ID，主键，自增长',
+    `name` varchar(50)      COMMENT '菜单名称',
+    `url` varchar(256)      COMMENT '路由地址',
+    `ancestors` varchar(255)      COMMENT '当前节点父id路径，“，”分割',
+    `parentId` bigint(20)      COMMENT '父菜单ID，一级菜单的该字段值为-1',
+    `linkType` tinyint(2)    DEFAULT '0'  COMMENT '链接方式 (0.普通，1.弹出，2.脚本)',
+    `imgPath` varchar(128)      COMMENT '主菜单图标，主菜单图标的css样式名',
+    `buttonImgPath` varchar(128)      COMMENT '按钮图标，按钮图标的css样式名',
+    `imgCommPath` varchar(128)      COMMENT '常用菜单图标，常用菜单图标的css样式名',
+    `commMenu` tinyint(2)    DEFAULT '1'  COMMENT '是否常用菜单 (0.非常用，1.常用)',
+    `component` varchar(128)      COMMENT 'vue组件路径',
+    `menuType` tinyint(2)    DEFAULT '0'  COMMENT '菜单类型 (0.目录，1.菜单，2.按钮)',
+    `authType` tinyint(2)    DEFAULT '3'  COMMENT '权限类型 (0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)',
+    `visible` tinyint(2)    DEFAULT '0'  COMMENT '菜单显示状态 (0.显示，1.隐藏)',
+    `perms` varchar(128)      COMMENT '权限标识，多个逗号分割',
+    `orderId` int(4)      COMMENT '排序编号',
+    `status` tinyint(2)    DEFAULT '1'  COMMENT '菜单状态 (0.停用，1.启用)',
+    `cache` tinyint(2)    DEFAULT '0'  COMMENT '是否启用缓存 (0.否，1.是)',
+    `activeDir` varchar(128)      COMMENT '激活目录',
+    `resourceUrl` varchar(512)      COMMENT '资源访问路径，多个逗号分割',
+    `hideChildrenInMenu` tinyint(2)    DEFAULT '0'  COMMENT '是否隐藏(0.否，1.是)',
+    `remark` varchar(512)      COMMENT '备注信息',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `createUserName` varchar(50)      COMMENT '创建用户名称',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateUserName` varchar(50)      COMMENT '创建用户名称',
+    `updateTime` datetime      COMMENT '更新时间',
+     PRIMARY KEY  (`id`),
+    INDEX `idx_name`(`name`) USING BTREE,
+    INDEX `idx_url`(`url`) USING BTREE,
+    INDEX `idx_parentId`(`parentId`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='菜单信息业务';
+
+
+
+ALTER TABLE mortals_xhx_param ADD COLUMN   `updateUserId` bigint(20)      COMMENT '更新用户';
+ALTER TABLE mortals_xhx_param ADD COLUMN    `updateUserName` varchar(50)      COMMENT '创建用户名称';
+ALTER TABLE mortals_xhx_param ADD COLUMN    `updateTime` datetime      COMMENT '更新时间';
\ No newline at end of file

base-manager/pom.xml

@@ -250,6 +250,10 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+        </dependency>
 
 
         <!-- Spring Boot Data Elasticsearch依赖 -->

base-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -27,6 +27,7 @@ import com.mortals.xhx.base.system.valid.service.ValidCodeService;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.pdu.user.UserPdu;
+import com.mortals.xhx.common.utils.MenuEncodeUtil;
 import com.mortals.xhx.feign.user.IUserFeign;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.logging.Log;
@@ -44,6 +45,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED;
+import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
+
 @RestController
 @Slf4j
 @RequestMapping("login")
@@ -56,6 +60,8 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
     @Autowired
     private ResourceService resourceService;
     @Autowired
+    private MenuService menuService;
+    @Autowired
     private ICacheService cacheService;
     @Autowired
     private IAuthTokenService authTokenService;
@@ -65,73 +71,14 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
 
     @RequestMapping("login")
     public String login(@RequestBody LoginForm loginForm) throws Exception {
-
-        JSONObject ret = new JSONObject();
         String loginName = loginForm.getLoginName();
         String password = loginForm.getPassword();
-        String securityCode = loginForm.getSecurityCode();
-        String ip = super.getRequestIP(request);
-        if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
-            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-            ret.put(KEY_RESULT_MSG, "未获取到用户信息，请重新登录");
-            return ret.toJSONString();
-        }
-        UserEntity userEntity = null;
-        try {
-            loginForm.validate();
-            boolean result = validCodeService.doCheckImageValidCode(request.getSession().getId(), ip, securityCode);
-            if ("8888".equals(securityCode)) {
-                result = true;
-            }
-            if (!result) {
-                recordSysLog(request, userEntity, "登录验证码不正确或已过期!");
-                ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-                ret.put(KEY_RESULT_MSG, "登录验证码不正确或已过期!");
-                return ret.toJSONString();
-            }
-            userEntity = userService.doLogin(loginName, password, ip);
-            userEntity.setLastLoginAddress(ip);
-
-
-            recordSysLog(request, userEntity, "用户登录系统成功!");
-            // 返回拥有的菜单数据
-            Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
-            //List<MenuEntity> outlookBarList = menuService.findTreeMenu(userEntity, urls);
-            String currUserName = userEntity.getRealName();
-            if (currUserName == null || currUserName.trim().length() == 0) {
-                currUserName = "管理员";
-            }
-            JSONObject data = new JSONObject();
-            data.put("currUserName", currUserName);
-            //data.put("barList", outlookBarList);
-            data.put("id", userEntity.getId());
-            data.put("userType", userEntity.getUserType());
-            userEntity.setLoginTime(System.currentTimeMillis());
-            userEntity.setToken(IdUtil.fastSimpleUUID());
-            userEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
-            userEntity.setMenuUrl(generateMenuUrlCode(urls));
-
-            String token = authTokenService.createToken(userEntity);
-            data.put("token", token);
-            //设置token 和过期时间
-            //data.put("expiresTime", DateUtils.addCurrDate(7).getTime());
-            generateMenuUrlCode(urls);
-            //this.generateBlackCookie(request, response, loginName, urls);
-            ret.put(KEY_RESULT_DATA, data);
-            ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
-            ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
-            // ret.put("resources", urls);
-            return ret.toJSONString();
-        } catch (Exception e) {
-            log.error("login error ", e);
-            if (userEntity == null) {
-                userEntity = new UserEntity();
-                userEntity.setLoginName(loginName);
-            }
-            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-            ret.put(KEY_RESULT_MSG, super.convertException(e));
-            return ret.toJSONString();
-        }
+        UserPdu loginPdu = new UserPdu();
+        loginPdu.setLoginName(loginName);
+        loginPdu.setPassword(password);
+        loginPdu.setSecurityCode("admin");
+        String resp = userFeign.portalLogin(loginPdu);
+        return resp;
     }
 
 
@@ -167,49 +114,34 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         JSONObject ret = new JSONObject();
         IUser user = this.getCurUser();
         if (user == null) {
-            return "";
+            return JSONObject.toJSONString(Rest.fail(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT));
         }
         Set<String> urls = resourceService.findUrlSetByUserId(user.getId());
+        log.info("userId:{},urls:{}", user.getId(), JSON.toJSONString(urls));
         // List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls);
+
+        List<MenuEntity> treeMenuList = menuService.findTreeMenu(user);
         String currUserName = user.getRealName();
         if (currUserName == null || currUserName.trim().length() == 0) {
             currUserName = "管理员";
         }
         JSONObject data = new JSONObject();
+
+        String token = authTokenService.getToken(request);
+        data.put("token", token);
         data.put("currUserName", currUserName);
-        // data.put("barList", outlookBarList);
+        data.put("menuList", treeMenuList);
         data.put("id", user.getId());
         data.put("userType", user.getUserType());
         ret.put(KEY_RESULT_DATA, data);
-        //this.generateBlackCookie(request, response, user.getLoginName(), urls);
+        cacheService.hset(RedisKey.KEY_USER_MENU_CACHE, user.getId().toString(), MenuEncodeUtil.generateMenuUrlCode(urls));
+
         ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
         ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
         ret.put("resources", urls);
         return ret.toJSONString();
     }
 
-    private void generateBlackCookie(HttpServletRequest request, HttpServletResponse response, String loginName, Set<String> urls) {
-        try {
-            String cacheKey = RedisKey.KEY_MENU_CACHE + loginName;
-            String securityKey = GlobalSysInfo.getPropertyValue(SysConstains.PROP_COOKIE_SECURITY_KEY);
-            //应为Cookie会超长，所以改为仅存储key将值放入redis
-            //CookieService.setCookieForAuth(request, response, securityKey, null);
-            StringBuilder sb = new StringBuilder();
-            if (urls != null && urls.size() > 0) {
-                for (String url : urls) {
-                    int index = url.hashCode() & (Integer.MAX_VALUE - 1);
-                    sb.append(index).append(",");
-                }
-            }
-            String menuUrl = sb.toString();
-            menuUrl = AESUtil.encrypt(menuUrl, securityKey);
-            cacheService.set(cacheKey, menuUrl, 604800);
-            HttpUtil.setCookieValue(request, response, SysConstains.COOKIE_MENU, cacheKey, -1);
-
-        } catch (Throwable e) {
-
-        }
-    }
 
 
     private String generateMenuUrlCode(Set<String> urls) {

base-manager/src/main/java/com/mortals/xhx/base/system/idgenerator/dao/ibatis/IdgeneratorDaoImpl.java

@@ -3,7 +3,6 @@ package com.mortals.xhx.base.system.idgenerator.dao.ibatis;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import com.mortals.xhx.base.system.idgenerator.dao.IdgeneratorDao;
 import com.mortals.xhx.base.system.idgenerator.model.IdgeneratorEntity;
-
 import org.springframework.stereotype.Repository;
 
 /**

base-manager/src/main/java/com/mortals/xhx/base/system/idgenerator/service/IdgeneratorService.java

 package com.mortals.xhx.base.system.idgenerator.service;
 
-import java.util.List;
-
 import com.mortals.xhx.base.system.idgenerator.service.impl.IdgeneratorServiceImpl.IdGeneratorKey;
 
+import java.util.List;
+
 /**
  * <p>Title: id生成器</p>
  * <p>Description: IdgeneratorService service接口 </p>

base-manager/src/main/java/com/mortals/xhx/base/system/idgenerator/service/impl/IdgeneratorServiceImpl.java

 package com.mortals.xhx.base.system.idgenerator.service.impl;
 
-import cn.hutool.Hutool;
 import com.alibaba.fastjson.JSON;
 import com.mortals.xhx.base.system.idgenerator.dao.IdgeneratorDao;
 import com.mortals.xhx.base.system.idgenerator.model.IdgeneratorEntity;
 import com.mortals.xhx.base.system.idgenerator.service.IdgeneratorService;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.stereotype.Service;
@@ -69,8 +67,6 @@ public class IdgeneratorServiceImpl implements IdgeneratorService {
         private final Class[] factorsClazz;
 
         private IdGeneratorKey(Long step, String methodName, Class[] factorsClazz) {
-
-
             this.step = step;
             this.methodName = methodName;
             this.factorsClazz = factorsClazz;

base-manager/src/main/java/com/mortals/xhx/base/system/menu/dao/MenuDao.java

@@ -12,6 +12,8 @@ package com.mortals.xhx.base.system.menu.dao;
 import com.mortals.framework.dao.ICRUDDao;
 import com.mortals.xhx.base.system.menu.model.MenuEntity;
 
+import java.util.List;
+
 /**
  * <p>Title: 菜单信息</p>
  * <p>Description: MenuDao DAO接口 </p>
@@ -22,5 +24,14 @@ import com.mortals.xhx.base.system.menu.model.MenuEntity;
  */
 
 public interface MenuDao extends ICRUDDao<MenuEntity,Long> {
-	
+    List<MenuEntity> getListByUserId(Long userId);
+
+    /**
+     * 查询子节点
+     *
+     * @param
+     * @return
+     */
+    List<MenuEntity> selectChildrenMenuById(String menuId);
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/base/system/menu/dao/ibatis/MenuDaoImpl.java

@@ -9,11 +9,13 @@
 package com.mortals.xhx.base.system.menu.dao.ibatis;
 
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import com.mortals.framework.model.ParamDto;
 import com.mortals.xhx.base.system.menu.dao.MenuDao;
 import com.mortals.xhx.base.system.menu.model.MenuEntity;
-
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>Title: 菜单信息</p>
  * <p>Description: MenuDaoImpl DAO接口 </p>
@@ -25,4 +27,16 @@ import org.springframework.stereotype.Repository;
 @Repository("menuDao")
 public class MenuDaoImpl extends BaseCRUDDaoMybatis<MenuEntity,Long> implements MenuDao {
 
+
+    @Override
+    public List<MenuEntity> selectChildrenMenuById(String menuId) {
+        return getSqlSession().selectList(getSqlId("selectChildrenMenuById"), menuId);
+    }
+
+    @Override
+    public List<MenuEntity> getListByUserId(Long userId) {
+        ParamDto param = new ParamDto();
+        param.getCondition().put("userId", userId);
+        return getSqlSession().selectList(getSqlId("getListByUserId"), param);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/base/system/menu/model/MenuTreeSelect.java

+package com.mortals.xhx.base.system.menu.model;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.DefaultJSONParser;
+import com.alibaba.fastjson.parser.JSONToken;
+import com.alibaba.fastjson.parser.deserializer.ObjectDeserializer;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import org.springframework.util.ObjectUtils;
+
+import java.io.Serializable;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+* 菜单信息业务前端映射树结构实体类
+*
+* @author zxfei
+* @date 2024-09-06
+*/
+@Data
+public class MenuTreeSelect  implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 节点ID
+    */
+    private Long id;
+
+    /**
+    * 父节点ID
+    */
+    private Long parentId;
+
+    /**
+    * 节点名称
+    */
+    private String label;
+
+    /**
+     * 菜单类型 (0.目录，1.菜单，2.按钮)
+     */
+    private Integer menuType;
+
+    /**
+     * 菜单显示状态 (0.显示，1.隐藏)
+     */
+    private Integer visible;
+
+    /**
+     * 权限标识，多个逗号分割
+     */
+    private String perms;
+
+
+    /**
+     * 权限标识，多个逗号分割
+     */
+    private String resourceUrl;
+
+    /**
+     * 是否隐藏(0.否，1.是)
+     */
+    private Integer hideChildrenInMenu;
+
+    /**
+     * 是否选中，0为未选中，1选中。默认0
+     */
+    private Integer checked;
+
+    /**
+    * 子节点
+    */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<MenuTreeSelect> children;
+
+    public MenuTreeSelect() {};
+
+    public MenuTreeSelect(MenuEntity entity) {
+        this.id = entity.getId();
+        this.parentId = entity.getParentId();
+        this.label = entity.getName();
+        this.menuType = entity.getMenuType();
+        this.visible = entity.getVisible();
+        this.perms = entity.getPerms();
+        this.resourceUrl=entity.getResourceUrl();
+        this.checked=entity.getChecked();
+        this.hideChildrenInMenu = entity.getHideChildrenInMenu();
+        if(!ObjectUtils.isEmpty(entity.getChildren())){
+            this.children = entity.getChildren().stream().map(MenuTreeSelect::new).collect(Collectors.toList());
+        }
+    }
+
+    // 反序列化器
+    public  class Deserializer implements ObjectDeserializer {
+        @Override
+        public MenuTreeSelect deserialze(DefaultJSONParser parser, Type type, Object fieldName) {
+            MenuTreeSelect node = new MenuTreeSelect();
+            JSONObject jsonObject = parser.parseObject();
+            node.setId(jsonObject.getLong("id"));
+            node.setLabel(jsonObject.getString("label"));
+            node.setMenuType(jsonObject.getInteger("menuType"));
+            node.setVisible(jsonObject.getInteger("visible"));
+            node.setPerms(jsonObject.getString("perms"));
+            node.setResourceUrl(jsonObject.getString("resourceUrl"));
+            node.setChecked(jsonObject.getInteger("checked"));
+            node.setHideChildrenInMenu(jsonObject.getInteger("hideChildrenInMenu"));
+            JSONArray jsonArray = jsonObject.getJSONArray("children");
+            List<MenuTreeSelect> children = new ArrayList<>();
+            if(!ObjectUtils.isEmpty(jsonArray)){
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    MenuTreeSelect child = JSON.parseObject(jsonArray.getJSONObject(i).toJSONString(), MenuTreeSelect.class);
+                    children.add(child);
+                }
+            }
+            node.setChildren(children);
+            return node;
+        }
+
+        @Override
+        public int getFastMatchToken() {
+            return JSONToken.LBRACE;
+        }
+    }
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/base/system/menu/model/vo/MenuVo.java

+package com.mortals.xhx.base.system.menu.model.vo;
+
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.base.system.menu.model.MenuEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* 菜单信息业务视图对象
+*
+* @author zxfei
+* @date 2024-09-06
+*/
+@Data
+public class MenuVo extends BaseEntityLong {
+
+    /** 菜单ID，主键，自增长列表 */
+    private List <Long> idList;
+
+
+    /** 子菜单信息业务 */
+    private List<MenuEntity> children = new ArrayList<>();
+
+    private List<MenuEntity> childList = new ArrayList<>();
+
+
+    private Integer type;
+    /**
+     * 是否选中，0为未选中，1选中。默认0
+     */
+    private Integer checked;
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/base/system/menu/service/MenuService.java

@@ -10,22 +10,20 @@ package com.mortals.xhx.base.system.menu.service;
 
 
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.framework.service.IUser;
 import com.mortals.xhx.base.system.menu.model.MenuEntity;
+import com.mortals.xhx.base.system.menu.model.MenuTreeSelect;
 
 import java.util.List;
 import java.util.Set;
 
 /**
- * <p>Title: 菜单信息</p>
- * <p>Description: MenuService service接口 </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author 
- * @version 1.0.0
+ * 菜单资源类
+ * @author: zxfei
+ * @date: 2024/9/6 16:28
  */
-
 public interface MenuService extends ICRUDService<MenuEntity,Long> {
     /**
      * 获取所有可用菜单
@@ -33,31 +31,67 @@ public interface MenuService extends ICRUDService<MenuEntity,Long> {
      * @return
      * @throws AppException
      */
-    public List<MenuEntity> findAllEnable() throws AppException;
+     List<MenuEntity> findAllEnable() throws AppException;
 
     /**
      * 查询有权限的菜单
      *
      * @param user 当前用户
-     * @param urls 有权限的访问地址集合
      * @return
      * @throws AppException
      */
-    public List<MenuEntity> findTreeMenu(IUser user, Set<String> urls) throws AppException;
+    List<MenuEntity> findTreeMenu(IUser user) throws AppException;
+
+    /**
+     * 更新排列顺序
+     * @param id
+     * @param type
+     */
+    void upOrDown(Long id, Integer type);
+
+
 
     /**
-     * 查看所有菜单
+     * 是否存在菜单信息业务节点
      *
+     * @param menuId 菜单信息业务ID
+     * @return 结果
+     */
+    boolean hasChildByMenuId(Long menuId);
+
+    /**
+     * 构建树
+     * @param menuList
      * @return
-     * @throws AppException
      */
-    public List<MenuEntity> findTreeMenu() throws AppException;
+    List<MenuEntity> buildMenuTree(List<MenuEntity> menuList);
 
 
     /**
-     * 更新排列顺序
-     * @param id
-     * @param type
+     * 构建前端所需要下拉树结构
+     *
+     * @param menuList 菜单信息业务列表
+     * @return 下拉树结构列表
      */
-    void upOrDown(Long id, Integer type);
+    List<MenuTreeSelect> buildMenuTreeSelect(List<MenuEntity> menuList);
+
+
+    /**
+     * 构建树，包含是否选中
+     * @param allMenuList
+     * @param menuIdsChecked
+     * @return
+     */
+    List<MenuTreeSelect> buildMenuTreeChecked(List<MenuEntity> allMenuList, Set<Long> menuIdsChecked);
+
+
+    /**
+     * 根据父id查询子节点
+     * @param parentId
+     * @param context
+     * @return
+     */
+    List<MenuTreeSelect> getListByParentId(Long parentId, Context context);
+
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/base/system/oper/dao/ibatis/OperLogDaoImpl.java

@@ -11,7 +11,6 @@ package com.mortals.xhx.base.system.oper.dao.ibatis;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import com.mortals.xhx.base.system.oper.dao.OperLogDao;
 import com.mortals.xhx.base.system.oper.model.OperLogEntity;
-
 import org.springframework.stereotype.Repository;
 
 /**

base-manager/src/main/java/com/mortals/xhx/base/system/oper/model/OperLogEntity.java

@@ -8,10 +8,10 @@
 
 package com.mortals.xhx.base.system.oper.model;
 
-import java.util.Date;
-
 import com.mortals.framework.model.BaseEntityLong;
 
+import java.util.Date;
+
 /**
  * <p>Title: 操作日志</p>
  * <p>Description: OperLogEntity  </p>

base-manager/src/main/java/com/mortals/xhx/base/system/oper/service/OperLogService.java

@@ -76,6 +76,5 @@ public interface OperLogService extends ICRUDService<OperLogEntity,Long> {
     void insertOperLog(HttpServletRequest request, IUser user, BaseEntity oldEntity, BaseEntity newEntity, OperTypeEnum operType, String content, String id);
 
     void insertOperLog(String ip, String requestUrl, Long userId, String userName, String loginName, String content);
-
-
+	
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/base/system/param/dao/ibatis/ParamDaoImpl.java

@@ -11,7 +11,6 @@ package com.mortals.xhx.base.system.param.dao.ibatis;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import com.mortals.xhx.base.system.param.dao.ParamDao;
 import com.mortals.xhx.base.system.param.model.ParamEntity;
-
 import org.springframework.stereotype.Repository;
 
 /**

base-manager/src/main/java/com/mortals/xhx/base/system/role/dao/ibatis/RoleAuthDaoImpl.java

@@ -11,7 +11,6 @@ package com.mortals.xhx.base.system.role.dao.ibatis;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import com.mortals.xhx.base.system.role.dao.RoleAuthDao;
 import com.mortals.xhx.base.system.role.model.RoleAuthEntity;
-
 import org.springframework.stereotype.Repository;
 
 /**