添加新的菜单权限模块

common-lib/pom.xml

@@ -82,6 +82,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 

fill-manager/db/add.sql

@@ -60,4 +60,140 @@ CREATE TABLE mortals_xhx_app_config(
    `createUserId` bigint(20)      COMMENT '创建用户',
    `updateTime` datetime      COMMENT '修改时间',
    PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='应用列';
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 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 '激活目录',
+    `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

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

 package com.mortals.xhx.base.login.web;
 
-import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.mortals.framework.ap.GlobalSysInfo;
-import com.mortals.framework.ap.SysConstains;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.service.ICacheService;
-import com.mortals.framework.service.ITokenService;
 import com.mortals.framework.service.IUser;
-import com.mortals.framework.util.AESUtil;
-import com.mortals.framework.util.DateUtils;
-import com.mortals.framework.util.HttpUtil;
-import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.menu.model.MenuEntity;
 import com.mortals.xhx.base.system.menu.service.MenuService;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.service.UserService;
-import com.mortals.xhx.base.system.valid.service.ValidCodeService;
 import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.pdu.user.LoginPdu;
-import com.mortals.xhx.common.pdu.user.UserPdu;
+import com.mortals.xhx.common.utils.MenuEncodeUtil;
 import com.mortals.xhx.feign.user.IUserFeign;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,31 +26,24 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 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")
 public class LoginController extends BaseCRUDJsonBodyMappingController<UserService, UserEntity, Long> {
 
-    @Autowired
-    private UserService userService;
-    @Autowired
-    private ValidCodeService validCodeService;
     @Autowired
     private ResourceService resourceService;
     @Autowired
     private MenuService menuService;
     @Autowired
-    private ITokenService tokenService;
-    @Autowired
     private ICacheService cacheService;
-
     @Autowired
     private IUserFeign userFeign;
-
-    private static Log logger = LogFactory.getLog(LoginController.class);
-
     @RequestMapping("login")
     public String login( @RequestBody LoginForm loginForm) throws Exception {
-
         String loginName = loginForm.getLoginName();
         String password = loginForm.getPassword();
         LoginPdu loginPdu = new LoginPdu();
@@ -80,68 +65,32 @@ 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());
-        List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls);
+        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();
     }
 
-    @RequestMapping("validcode")
-    public String validCode(HttpServletRequest request, HttpServletResponse response, LoginForm loginForm) {
-        JSONObject ret = new JSONObject();
-        String loginName = loginForm.getLoginName();
-        String password = loginForm.getPassword();
-        if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
-            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-            ret.put(KEY_RESULT_MSG, "登录名或密码为空");
-        }
-        UserEntity user = null;
-        try {
-            user = userService.doCheckUser(loginName, password);
-            if (user == null) {
-                ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-                ret.put(KEY_RESULT_MSG, "用户名或密码不正确");
-            } else if (StringUtils.isEmpty(user.getMobile())) {
-                ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-                ret.put(KEY_RESULT_MSG, "用户无正确的手机号");
-            } else {
-                String mobile = StringUtils.trim(user.getMobile());
-                String sessionId = request.getSession().getId();
-                String ip = super.getRequestIP(request);
-                boolean result = validCodeService.createSmsValidCode(sessionId, ip, mobile);
-                if (result) {
-                    ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
-                } else {
-                    ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-                    ret.put(KEY_RESULT_MSG, "验证码发送失败，请稍后在试！");
-                }
-            }
-        } catch (Exception e) {
-            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-            ret.put(KEY_RESULT_MSG, "验证码发送失败：" + super.convertException(e));
-        } finally {
-            if (user == null) {
-                user = new UserEntity();
-                user.setLoginName(loginName);
-            }
-            recordSysLog(request, user, "用户获取短信验证码");
-        }
-        return ret.toJSONString();
-    }
-
 }

fill-manager/src/main/java/com/mortals/xhx/base/system/area/dao/ibatis/AreaDaoImpl.java

@@ -7,11 +7,11 @@
 */
 
 package com.mortals.xhx.base.system.area.dao.ibatis;
-import org.springframework.stereotype.Repository;
 
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import com.mortals.xhx.base.system.area.dao.AreaDao;
 import com.mortals.xhx.base.system.area.model.AreaEntity;
+import org.springframework.stereotype.Repository;
 
 /**
  * Title: 区域信息 <br/>

fill-manager/src/main/java/com/mortals/xhx/base/system/area/model/AreaEntity.java

@@ -8,10 +8,10 @@
 
 package com.mortals.xhx.base.system.area.model;
 
-import java.util.Date;
-
 import com.mortals.framework.model.BaseEntityLong;
 
+import java.util.Date;
+
 /**
  * <p>Title: 区域信息</p>
  * <p>Description: AreaEntity  </p>

fill-manager/src/main/java/com/mortals/xhx/base/system/area/service/impl/AreaServiceImpl.java

@@ -9,12 +9,10 @@
 package com.mortals.xhx.base.system.area.service.impl;
 
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
-import org.springframework.stereotype.Service;
-
-import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.base.system.area.dao.AreaDao;
 import com.mortals.xhx.base.system.area.model.AreaEntity;
 import com.mortals.xhx.base.system.area.service.AreaService;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>Title: 区域信息</p>

fill-manager/src/main/java/com/mortals/xhx/base/system/area/web/AreaController.java

@@ -4,30 +4,28 @@
 
 package com.mortals.xhx.base.system.area.web;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.util.StringUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.ap.SysConstains;
 import com.mortals.framework.common.IBaseEnum;
 import com.mortals.framework.common.code.YesNo;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
+import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseCRUDJsonMappingController;
 import com.mortals.xhx.base.system.area.model.AreaEntity;
 import com.mortals.xhx.base.system.area.service.AreaService;
 import com.mortals.xhx.common.code.AreaLevelEnum;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>

fill-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;
 
 /**

fill-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>

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

@@ -4,7 +4,6 @@ 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;

fill-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

fill-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

fill-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

fill-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

fill-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;
 
 /**

fill-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>

fill-manager/src/main/java/com/mortals/xhx/base/system/oper/service/impl/OperLogServiceImpl.java

@@ -21,7 +21,6 @@ import com.mortals.xhx.base.system.oper.dao.OperLogDao;
 import com.mortals.xhx.base.system.oper.model.OperLogEntity;
 import com.mortals.xhx.base.system.oper.service.OperLogService;
 import com.mortals.xhx.common.code.OperTypeEnum;
-
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -104,15 +103,12 @@ public class OperLogServiceImpl extends AbstractCRUDServiceImpl<OperLogDao,OperL
         OperLogEntity operLogEntity = new OperLogEntity();
         operLogEntity.setIp(ip);
         operLogEntity.setLogDate(new Date());
-
-        operLogEntity.setPlatformMark(GlobalSysInfo.getPropertyValue(SysConstains.PROP_PLATFORM_MARK));
-        //operLogEntity.setOperType(operType.getValue());
+        operLogEntity.setPlatformMark(GlobalSysInfo.getPropertyValue(SysConstains.PROP_PLATFORM_MARK)==null?"unknow":GlobalSysInfo.getPropertyValue(SysConstains.PROP_PLATFORM_MARK));
         operLogEntity.setRequestUrl(requestUrl);
         operLogEntity.setLoginName(loginName);
         operLogEntity.setUserId(userId);
         operLogEntity.setUserName(userName);
         operLogEntity.setContent(content);
-
         save(operLogEntity, null);
     }
     private void formatterLogContent(OperLogEntity operLogEntity, String content, String id, OperTypeEnum operType) {
@@ -153,4 +149,5 @@ public class OperLogServiceImpl extends AbstractCRUDServiceImpl<OperLogDao,OperL
         }
         operLogEntity.setContent(content.toString());
     }
+	
 }
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/base/system/oper/web/OperLogController.java

@@ -8,7 +8,6 @@
 package com.mortals.xhx.base.system.oper.web;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
@@ -16,15 +15,9 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.oper.model.OperLogEntity;
 import com.mortals.xhx.base.system.oper.service.OperLogService;
 import com.mortals.xhx.common.code.OperTypeEnum;
-
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.mortals.framework.web.BaseCRUDJsonMappingController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -43,7 +36,6 @@ import java.util.Map;
 public class OperLogController extends BaseCRUDJsonBodyMappingController<OperLogService, OperLogEntity, Long> {
 
     public OperLogController() {
-        super.setFormClass(OperLogForm.class);
         super.setModuleDesc("操作日志");
     }