修改同步任务

sample-form-manager/db/add.sql

@@ -68,3 +68,132 @@ ALTER TABLE mortals_xhx_device
 
 ALTER TABLE mortals_xhx_device
     ADD COLUMN `resolution`   varchar(64)      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='菜单信息业务';

sample-form-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;
 
 /**

sample-form-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>

sample-form-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;

sample-form-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

sample-form-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

sample-form-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

sample-form-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

sample-form-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,23 +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 menuList 菜单信息业务列表
+     * @return 下拉树结构列表
+     */
+    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

sample-form-manager/src/main/java/com/mortals/xhx/base/system/menu/web/MenuController.java

-/**
-* 文件：MenuController.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
 package com.mortals.xhx.base.system.menu.web;
 
 
@@ -12,96 +5,150 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
-
-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 com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.menu.model.MenuEntity;
+import com.mortals.xhx.base.system.menu.model.MenuQuery;
+import com.mortals.xhx.base.system.menu.model.MenuTreeSelect;
 import com.mortals.xhx.base.system.menu.service.MenuService;
 import com.mortals.xhx.common.code.DataSatus;
-import com.mortals.xhx.common.code.MenuAuthType;
-import com.mortals.xhx.common.code.MenuComm;
-import com.mortals.xhx.common.code.MenuLinkType;
-import com.mortals.xhx.common.code.MenuType;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 /**
- * <p>Title: 菜单信息</p>
- * <p>Description: MenuController  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author 
- * @version 1.0.0
+ * 菜单信息
+ *
+ * @author: zxfei
+ * @date: 2024/9/6 16:23
  */
 @RestController
 @RequestMapping("menu")
-public class MenuController extends BaseCRUDJsonMappingController<MenuService, MenuForm,MenuEntity,Long> {
+public class MenuController extends BaseCRUDJsonBodyMappingController<MenuService, MenuEntity, Long> {
+
+    public MenuController() {
+        super.setModuleDesc("菜单信息");
+    }
+
+    @Override
+    protected void doListBefore(MenuEntity query, Map<String, Object> model, Context context) throws AppException {
+        List<OrderCol> orderColList = new ArrayList<>();
+        orderColList.add(new OrderCol("orderId"));
+        query.setOrderColList(orderColList);
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "linkType", LinkTypeEnum.getEnumMap());
+        this.addDict(model, "commMenu", CommMenuEnum.getEnumMap());
+        this.addDict(model, "menuType", MenuTypeEnum.getEnumMap());
+        this.addDict(model, "authType", AuthTypeEnum.getEnumMap());
+        this.addDict(model, "visible", VisibleEnum.getEnumMap());
+        this.addDict(model, "status", StatusEnum.getEnumMap());
+    }
+
+    /**
+     * 改变状态
+     */
+    @ApiOperation(value = "改变状态", notes = "改变状态")
+    @RequestMapping(value = "change/status")
+    public String changeStatus(@RequestBody MenuEntity query) {
+        JSONObject ret = new JSONObject();
+        Context context = getContext();
+        try {
+            MenuEntity entity = this.service.get(query.getId(), context);//.doSubmitAudit(form.getEntity(), context);
+            if (null == entity) {
+                throw new AppException("菜单不存在!");
+            }
+            if (null == entity.getStatus()) {
+                throw new AppException("菜单状态不能为空!");
+            }
+            if (entity.getStatus() != DataSatus.ENABLE.getValue() && entity.getStatus() != DataSatus.DISENABLE.getValue()) {
+                throw new AppException("非法菜单状态!");
+            }
+            String busiDesc = DataSatus.getByValue(entity.getStatus()).getDesc();
+            entity.setStatus(entity.getStatus());
+            this.service.update(entity, context);
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+            ret.put(KEY_RESULT_MSG, busiDesc + "成功");
+            recordSysLog(request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+
+        } catch (Exception e) {
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            ret.put(KEY_RESULT_MSG, super.convertException(e));
+        }
+        return ret.toJSONString();
+    }
 
-	public MenuController(){
-		super.setFormClass(MenuForm.class);
-		super.setModuleDesc("菜单信息");
-	}
 
+    /**
+     * 更换排序
+     */
+    @ApiOperation(value = "更换排序")
+    @PostMapping(value = "upOrDown")
+    public String upOrDownTopicList(@RequestBody MenuEntity query) {
+        JSONObject ret = new JSONObject();
+        ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+        try {
+            this.service.upOrDown(query.getId(), query.getType());
+        } catch (Exception e) {
+            log.error("更新错误", e);
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            ret.put(KEY_RESULT_MSG, e.getMessage());
+        }
+        return ret.toJSONString();
+    }
 
-	@Override
-	protected void doListBefore(HttpServletRequest request, HttpServletResponse response, MenuForm form, Map<String, Object> model, Context context) throws AppException {
-		List<OrderCol> orderColList = new ArrayList<OrderCol>();
-		orderColList.add(new OrderCol("parentId"));
-		orderColList.add(new OrderCol("orderId"));
-		form.getQuery().setOrderColList(orderColList);
-	}
 
-	@Override
-	protected void init(HttpServletRequest request, HttpServletResponse response, MenuForm form, Map<String, Object> model,
-						Context context) {
-		Map<String, Object> status = new HashMap<String, Object>();
-		status.put("status", DataSatus.getEnumMap(DataSatus.CLOSE.getValue(), DataSatus.DELETE.getValue(), DataSatus.OVERDUE.getValue(), DataSatus.USEOUT.getValue()));
-		status.put("linkType", MenuLinkType.getEnumMap());
-		status.put("commMenu", MenuComm.getEnumMap());
-		status.put("menuType", MenuType.getEnumMap());
-		status.put("authType", MenuAuthType.getEnumMap());
-		model.put(KEY_RESULT_DICT, status);
-		super.init(request, response, form, model, context);
-	}
+    /**
+     * 获取站点下拉树列表
+     */
+    @ApiOperation(value = "菜单树列表")
+    @PostMapping("treeselect")
+    public String treeselect() {
+        Map<String, Object> model = new HashMap<>();
+        JSONObject ret = new JSONObject();
+        String busiDesc = "查询" + this.getModuleDesc();
+        int code = VALUE_RESULT_SUCCESS;
+        try {
+            List<MenuEntity> list = this.service.find(new MenuQuery());
+            List<MenuTreeSelect> treeSelects = this.service.buildMenuTreeSelect(list);
+            model.put("result", treeSelects);
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            code = VALUE_RESULT_FAILURE;
+            this.doException(request, busiDesc, model, e);
+        }
+        ret.put(KEY_RESULT_DATA, model);
+        ret.put(KEY_RESULT_CODE, code);
+        return ret.toJSONString();
+    }
 
-	/**
-	 * 改变状态
-	 */
-	@RequestMapping(value = "change/status")
-	public String changeStatus(HttpServletRequest request, HttpServletResponse response, MenuForm form) {
-		JSONObject ret = new JSONObject();
-		Context context = getContext();
-		try {
-			MenuEntity entity = this.service.get(form.getEntity().getId(), context);//.doSubmitAudit(form.getEntity(), context);
-			if (null == entity) {
-				throw new AppException("菜单不存在!");
-			}
-			if (null == form.getEntity().getStatus()) {
-				throw new AppException("菜单状态不能为空!");
-			}
-			if (form.getEntity().getStatus() != DataSatus.ENABLE.getValue() && form.getEntity().getStatus() != DataSatus.DISENABLE.getValue()) {
-				throw new AppException("非法菜单状态!");
-			}
-			String busiDesc = DataSatus.getByValue(form.getEntity().getStatus()).getDesc();
-			entity.setStatus(form.getEntity().getStatus());
-			this.service.update(entity, context);
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
-			ret.put(KEY_RESULT_MSG, busiDesc + "成功");
-			recordSysLog(request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
 
-		} catch (Exception e) {
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-		}
-		return ret.toJSONString();
-	}
+    /**
+     * 根据parentId查询子信息
+     */
+    @ApiOperation(value = "根据parentId查询子信息")
+    @GetMapping(value = "getListByParentId")
+    public String getListByParentId(Long parentId) {
+        JSONObject ret = new JSONObject();
+        Map<String, Object> model = new HashMap<>();
+        String busiDesc = "查询" + this.getModuleDesc() + "子节点";
+        try {
+            List<MenuTreeSelect> treeList = this.service.getListByParentId(parentId, getContext());
+            model.put(KEY_RESULT_DATA, treeList);
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+            ret.put(KEY_RESULT_DATA, model);
+            recordSysLog(request, busiDesc + "【成功】");
+        } catch (Exception e) {
+            log.error("根据parentId查询子信息错误", e);
+            this.doException(request, busiDesc, model, e);
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            ret.put(KEY_RESULT_MSG, e.getMessage());
+        }
+        return ret.toJSONString();
+    }
 }
\ No newline at end of file