Merge branch 'system-165' of uskycloud/usky-cloud into master

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/HceCategoryController.java

@@ -4,6 +4,7 @@ package com.usky.system.controller.web;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.system.domain.HceCategory;
 import com.usky.system.service.HceCategoryService;
+import com.usky.system.service.vo.HceCategoryListVO;
 import com.usky.system.service.vo.HceCategoryVO;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +36,7 @@ public class HceCategoryController {
      * @return
      */
     @PostMapping("page")
-    public ApiResult<List<HceCategory>> page(@RequestBody HceCategoryVO hceCategoryVO){
+    public ApiResult<List<HceCategoryListVO>> page(@RequestBody HceCategoryVO hceCategoryVO){
         return ApiResult.success(hceCategoryService.page(hceCategoryVO));
     }
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/HceArticle.java

@@ -86,8 +86,13 @@ public class HceArticle implements Serializable {
     private LocalDateTime modifydate;
 
     /**
-     * 栏目名称
+     * 内容排序
+     */
+    private Integer sortindex;
+
+    /**
+     * 菜单名称
      */
     @TableField(exist = false)
-    private String categoryName;
+    private String menuName;
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/HceCategory.java

@@ -84,6 +84,11 @@ public class HceCategory implements Serializable {
      */
     private String description;
 
+    /**
+     * 菜单显示顺序
+     */
+    private Integer orderNum;
+
     /**
      * 子级
      */

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysMenu.java

@@ -69,6 +69,12 @@ public class SysMenu extends BaseEntity
     /** 菜单图标 */
     private String icon;
 
+    /** 备注 */
+    private String remark;
+
+    /** 是否新窗口;0:否 1:是 */
+    private Integer isNew;
+
     /** 子菜单 */
     @TableField(exist = false)
     private List<SysMenu> children = new ArrayList<SysMenu>();
@@ -230,6 +236,20 @@ public class SysMenu extends BaseEntity
         this.icon = icon;
     }
 
+    public String getRemark()
+    {
+        return remark;
+    }
+
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
+
+    public Integer getIsNew() { return isNew; }
+
+    public void setIsNew(Integer isNew) { this.isNew = isNew; }
+
     public List<SysMenu> getChildren()
     {
         return children;
@@ -239,7 +259,7 @@ public class SysMenu extends BaseEntity
     {
         this.children = children;
     }
-    
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -256,11 +276,12 @@ public class SysMenu extends BaseEntity
             .append("status ", getStatus())
             .append("perms", getPerms())
             .append("icon", getIcon())
+            .append("remark", getRemark())
+            .append("isNew", getIsNew())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
             .toString();
     }
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/HceCategoryMapper.java

@@ -2,6 +2,10 @@ package com.usky.system.mapper;
 
 import com.usky.system.domain.HceCategory;
 import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.system.service.vo.HceCategoryListVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +16,9 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @since 2023-08-29
  */
 public interface HceCategoryMapper extends CrudMapper<HceCategory> {
+    List<HceCategoryListVO> selectMenuTreeAll(@Param("categoryName") String categoryName, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    List<HceCategoryListVO> selectMenuTreeByUserId(@Param("categoryName") String categoryName, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("userId") Long userId);
 
+    List<HceCategoryListVO> selectMenuTreeByUserIdOne(@Param("categoryName") String categoryName, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("tenantId") Integer tenantId);
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -151,7 +151,7 @@ public interface SysUserMapper extends CrudMapper<SysUser> {
                                      @Param("userId") long userId);
 
     public List<SysUser> userList(@Param("tenantId") Integer tenantId,
-                                  @Param("createBy") String createBy);
+                                  @Param("userName") String userName);
 
     SysUser selectUserData(@Param("userName") String userName,
                            @Param("tenantId") Integer tenantId);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/HceCategoryService.java

@@ -2,6 +2,7 @@ package com.usky.system.service;
 
 import com.usky.system.domain.HceCategory;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.system.service.vo.HceCategoryListVO;
 import com.usky.system.service.vo.HceCategoryVO;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -17,7 +18,7 @@ import java.util.List;
  */
 public interface HceCategoryService extends CrudService<HceCategory> {
 
-    List<HceCategory> page(HceCategoryVO hceCategoryVO);
+    List<HceCategoryListVO> page(HceCategoryVO hceCategoryVO);
 
     void add(HceCategory hceCategory);
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/HceArticleServiceImpl.java

@@ -44,12 +44,11 @@ public class HceArticleServiceImpl extends AbstractCrudService<HceArticleMapper,
         queryWrapper.eq(hceArticleVO.getCategoryid() != null,HceArticle::getCategoryid,hceArticleVO.getCategoryid())
                 .like(StringUtils.isNotBlank(hceArticleVO.getTitle()),HceArticle::getTitle,hceArticleVO.getTitle())
                 .between(StringUtils.isNotBlank(hceArticleVO.getStartTime()) && StringUtils.isNotBlank(hceArticleVO.getEndTime()),HceArticle::getCreatedate,hceArticleVO.getStartTime(),hceArticleVO.getEndTime())
-                .orderByDesc(HceArticle::getIstop, HceArticle::getId);
+                .orderByDesc(HceArticle::getIstop).orderByAsc(HceArticle::getSortindex, HceArticle::getId);
         page = this.page(page,queryWrapper);
         if(page.getRecords().size() > 0){
             LambdaQueryWrapper<HceCategory> queryWrapper1 = Wrappers.lambdaQuery();
-            queryWrapper1.eq(HceCategory::getStatus,1)
-                    .orderByDesc(HceCategory::getSortindex);
+            queryWrapper1.eq(HceCategory::getStatus,1);
             List<HceCategory> list = hceCategoryMapper.selectList(queryWrapper1);
             if(CollectionUtils.isNotEmpty(list)){
                 for(int i=0;i<page.getRecords().size();i++){
@@ -58,7 +57,7 @@ public class HceArticleServiceImpl extends AbstractCrudService<HceArticleMapper,
                         Integer categoryId1 = page.getRecords().get(i).getCategoryid();
                         Integer categoryId2 = list.get(j).getId();
                         if(categoryId1.equals(categoryId2)){
-                            page.getRecords().get(i).setCategoryName(list.get(j).getCategoryName());
+                            page.getRecords().get(i).setMenuName(list.get(j).getMenuName());
                         }
                     }
                 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/HceCategoryServiceImpl.java

@@ -5,13 +5,17 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.exception.BusinessException;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.HceArticle;
 import com.usky.system.domain.HceCategory;
+import com.usky.system.domain.SysUser;
 import com.usky.system.mapper.HceArticleMapper;
 import com.usky.system.mapper.HceCategoryMapper;
 import com.usky.system.service.HceArticleService;
 import com.usky.system.service.HceCategoryService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.system.service.ISysUserService;
+import com.usky.system.service.vo.HceCategoryListVO;
 import com.usky.system.service.vo.HceCategoryVO;
 import org.apache.tomcat.jni.Local;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,18 +39,30 @@ import java.util.stream.Collectors;
 public class HceCategoryServiceImpl extends AbstractCrudService<HceCategoryMapper, HceCategory> implements HceCategoryService {
     @Resource
     private HceArticleMapper hceArticleMapper;
+    @Autowired
+    private ISysUserService userService;
 
     @Override
-    public List<HceCategory> page(HceCategoryVO hceCategoryVO){
-        LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(HceCategory::getStatus,1)
-                .like(StringUtils.isNotBlank(hceCategoryVO.getCategoryName()), HceCategory::getCategoryName,hceCategoryVO.getCategoryName())
-                .in(hceCategoryVO.getMenuIdList() != null,HceCategory::getMenuId,hceCategoryVO.getMenuIdList())
-                .between(StringUtils.isNotBlank(hceCategoryVO.getStartTime()) && StringUtils.isNotBlank(hceCategoryVO.getEndTime()),HceCategory::getCreatedate,hceCategoryVO.getStartTime(),hceCategoryVO.getEndTime())
-                .orderByAsc(HceCategory::getSortindex);
-        List<HceCategory> list = this.list(queryWrapper);
-        List<HceCategory> list1 = list.stream().filter(s ->s.getPid() == 0).map(
-                menu->{menu.setChildren(getChildrenData(menu,list));
+    public List<HceCategoryListVO> page(HceCategoryVO hceCategoryVO){
+        long userId = SecurityUtils.getUserId();
+        SysUser sysUser = userService.selectUserByIdOne(userId);
+        List<HceCategoryListVO> list = new ArrayList<>();
+        if(("00").equals(sysUser.getUserType())){
+            if (1L == userId)
+            {
+                list = baseMapper.selectMenuTreeAll(hceCategoryVO.getCategoryName(),hceCategoryVO.getStartTime(),hceCategoryVO.getEndTime());
+            }
+            else
+            {
+                list = baseMapper.selectMenuTreeByUserId(hceCategoryVO.getCategoryName(),hceCategoryVO.getStartTime(),hceCategoryVO.getEndTime(),userId);
+            }
+        }else{
+            list = baseMapper.selectMenuTreeByUserIdOne(hceCategoryVO.getCategoryName(),hceCategoryVO.getStartTime(),hceCategoryVO.getEndTime(),SecurityUtils.getTenantId());
+        }
+
+        List<HceCategoryListVO> finalList = list;
+        List<HceCategoryListVO> list1 = list.stream().filter(s ->s.getParentId() == 0).map(
+                menu->{menu.setChildren(getChildrenData(menu, finalList));
                     return menu;
                 }
         ).collect(Collectors.toList());
@@ -54,8 +70,8 @@ public class HceCategoryServiceImpl extends AbstractCrudService<HceCategoryMappe
         return list1;
     }
 
-    private List<HceCategory> getChildrenData(HceCategory parent, List<HceCategory> all){
-        List<HceCategory> children = all.stream().filter(k ->k.getPid().equals(parent.getId())).map(
+    private List<HceCategoryListVO> getChildrenData(HceCategoryListVO parent, List<HceCategoryListVO> all){
+        List<HceCategoryListVO> children = all.stream().filter(k ->k.getParentId().equals(parent.getMenuId())).map(
                 menu->{
                     menu.setChildren(getChildrenData(menu,all));
                     return menu;
@@ -65,12 +81,12 @@ public class HceCategoryServiceImpl extends AbstractCrudService<HceCategoryMappe
     }
 
     public void add(HceCategory hceCategory){
-        LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(HceCategory::getCategoryName,hceCategory.getCategoryName());
-        List<HceCategory> list = this.list(queryWrapper);
-        if(list.size() > 0){
-            throw new BusinessException("栏目名称重复，请重新填写栏目名称");
-        }
+//        LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
+//        queryWrapper.eq(HceCategory::getCategoryName,hceCategory.getCategoryName());
+//        List<HceCategory> list = this.list(queryWrapper);
+//        if(list.size() > 0){
+//            throw new BusinessException("栏目名称重复，请重新填写栏目名称");
+//        }
         LambdaQueryWrapper<HceCategory> queryWrapper1 = Wrappers.lambdaQuery();
         queryWrapper1.eq(HceCategory::getMenuId,hceCategory.getMenuId());
         List<HceCategory> list1 = this.list(queryWrapper1);
@@ -78,18 +94,17 @@ public class HceCategoryServiceImpl extends AbstractCrudService<HceCategoryMappe
             throw new BusinessException("关联菜单名称重复");
         }
         hceCategory.setCreatedate(LocalDateTime.now());
-        hceCategory.setStatus(1);
         this.save(hceCategory);
     }
 
     public void update(HceCategory hceCategory){
-        LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(HceCategory::getCategoryName,hceCategory.getCategoryName())
-                .ne(HceCategory::getId,hceCategory.getId());
-        List<HceCategory> list = this.list(queryWrapper);
-        if(list.size() > 0){
-            throw new BusinessException("栏目名称重复，请重新填写栏目名称");
-        }
+//        LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
+//        queryWrapper.eq(HceCategory::getCategoryName,hceCategory.getCategoryName())
+//                .ne(HceCategory::getId,hceCategory.getId());
+//        List<HceCategory> list = this.list(queryWrapper);
+//        if(list.size() > 0){
+//            throw new BusinessException("栏目名称重复，请重新填写栏目名称");
+//        }
         LambdaQueryWrapper<HceCategory> queryWrapper1 = Wrappers.lambdaQuery();
         queryWrapper1.eq(HceCategory::getMenuId,hceCategory.getMenuId())
                 .ne(HceCategory::getId,hceCategory.getId());
@@ -111,6 +126,13 @@ public class HceCategoryServiceImpl extends AbstractCrudService<HceCategoryMappe
         if(list.size() > 0){
             throw new BusinessException("该栏目存在栏目内容不可删除");
         }
+        LambdaQueryWrapper<HceCategory> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.eq(HceCategory::getPid,id)
+                .eq(HceCategory::getStatus,1);
+        List<HceCategory> list1 = this.list(queryWrapper1);
+        if(list1.size()>0){
+            throw new BusinessException("该栏目存在子栏目不可删除");
+        }
         this.removeById(id);
 
     }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysMenuServiceImpl.java

@@ -226,7 +226,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
             router.setName(getRouteName(menu));
             router.setPath(getRouterPath(menu));
             router.setComponent(getComponent(menu));
-            router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+            router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath(), menu.getIsFrame(), menu.getIsNew(), menu.getRemark()));
             List<SysMenu> cMenus = menu.getChildren();
             if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()))
             {
@@ -242,13 +242,13 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
                 children.setPath(menu.getPath());
                 children.setComponent(menu.getComponent());
                 children.setName(StringUtils.capitalize(menu.getPath()));
-                children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+                children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath(), menu.getIsFrame(), menu.getIsNew(), menu.getRemark()));
                 childrenList.add(children);
                 router.setChildren(childrenList);
             }
             else if (menu.getParentId().intValue() == 0 && isInnerLink(menu))
             {
-                router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon()));
+                router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), menu.getIsFrame(), menu.getIsNew(), menu.getRemark()));
                 router.setPath("/inner");
                 List<RouterVo> childrenList = new ArrayList<RouterVo>();
                 RouterVo children = new RouterVo();
@@ -256,7 +256,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
                 children.setPath(routerPath);
                 children.setComponent(UserConstants.INNER_LINK);
                 children.setName(StringUtils.capitalize(routerPath));
-                children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), menu.getPath()));
+                children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), menu.getPath(), menu.getIsFrame(), menu.getIsNew(), menu.getRemark()));
                 childrenList.add(children);
                 router.setChildren(childrenList);
             }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysMobileMenuServiceImpl.java

@@ -335,7 +335,7 @@ public class SysMobileMenuServiceImpl extends AbstractCrudService<SysMobileMenuM
             router.setName(getRouteName(menu));
             router.setPath(getRouterPath(menu));
             router.setComponent(getComponent(menu));
-            router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+            router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath(), menu.getRemark()));
             List<SysMobileMenu> cMenus = menu.getChildren();
             if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()))
             {
@@ -351,13 +351,13 @@ public class SysMobileMenuServiceImpl extends AbstractCrudService<SysMobileMenuM
                 children.setPath(menu.getPath());
                 children.setComponent(menu.getComponent());
                 children.setName(StringUtils.capitalize(menu.getPath()));
-                children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+                children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath(), menu.getRemark()));
                 childrenList.add(children);
                 router.setChildren(childrenList);
             }
             else if (menu.getParentId().intValue() == 0 && isInnerLink(menu))
             {
-                router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon()));
+                router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), menu.getRemark()));
                 router.setPath("/inner");
                 List<RouterVo> childrenList = new ArrayList<RouterVo>();
                 RouterVo children = new RouterVo();

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysPlatformMenuServiceImpl.java

@@ -49,7 +49,7 @@ public class SysPlatformMenuServiceImpl extends AbstractCrudService<SysPlatformM
 
     public Long[] selectPlatformMenu(Integer tenantId){
         LambdaQueryWrapper<SysTenantMenu> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(SysTenantMenu::getTenantId, tenantId);
+        queryWrapper.eq(SysTenantMenu::getTenantId, tenantId).orderByAsc(SysTenantMenu::getMenuId);
         List<SysTenantMenu> menuList = sysTenantMenuService.list(queryWrapper);
         Long[] arr = new Long[menuList.size()];
         for (int i = 0; i < menuList.size(); i++) {
@@ -60,7 +60,7 @@ public class SysPlatformMenuServiceImpl extends AbstractCrudService<SysPlatformM
 
     public Long[] selectMobilePlatformMenu(Integer tenantId){
         LambdaQueryWrapper<SysMobileTenantMenu> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(SysMobileTenantMenu::getTenantId, tenantId);
+        queryWrapper.eq(SysMobileTenantMenu::getTenantId, tenantId).orderByAsc(SysMobileTenantMenu::getMenuId);
         List<SysMobileTenantMenu> menuList = sysMobileTenantMenuService.list(queryWrapper);
         Long[] arr = new Long[menuList.size()];
         for (int i = 0; i < menuList.size(); i++) {

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/HceCategoryListVO.java

@@ -0,0 +1,83 @@
+package com.usky.system.service.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.usky.system.domain.HceCategory;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class HceCategoryListVO {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 菜单ID
+     */
+    private Long menuId;
+
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+
+    /**
+     * 菜单昵称
+     */
+    private String menuAliasName;
+
+    /**
+     * 父菜单ID
+     */
+    private Long parentId;
+
+    /**
+     * 显示顺序
+     */
+    private String orderNum;
+
+    /**
+     * 是否为外链（0是 1否）
+     */
+    private String isFrame;
+
+    /**
+     * 是否缓存（0缓存 1不缓存）
+     */
+    private String isCache;
+
+    /**
+     * 栏目ID
+     */
+    private Integer categoryId;
+
+    /**
+     * 栏目图片;
+     */
+    private String imagePath;
+
+    /**
+     * 创建时间;
+     */
+    private LocalDateTime createdate;
+
+    /**
+     * 修改时间;
+     */
+    private LocalDateTime modifydate;
+
+    /**
+     * 栏目描述
+     */
+    private String description;
+
+    /**
+     * 栏目状态;0:关闭 1:开启
+     */
+    private Integer status;
+
+    /**
+     * 子级
+     */
+    private List<HceCategoryListVO> children;
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/MetaVo.java

@@ -3,6 +3,7 @@ package com.usky.system.service.vo;
 
 import com.usky.common.core.constants.Constants;
 import com.usky.common.core.util.StringUtils;
+import io.swagger.models.auth.In;
 
 
 /**
@@ -32,15 +33,35 @@ public class MetaVo
       */
     private Boolean affix;
 
+    /** 是否为外链（0是 1否） */
+    private String isFrame;
+
+    /** 是否新窗口;0:否 1:是 */
+    private Integer isNew;
+
+    /** 备注 */
+    private String remark;
+
     public MetaVo()
     {
     }
 
-    public MetaVo(String title, String aliasTitle, String icon)
+    public MetaVo(String title, String aliasTitle, String icon, String isFrame, Integer isNew, String remark)
     {
         this.title = title;
         this.aliasTitle = aliasTitle;
         this.icon = icon;
+        this.isFrame = isFrame;
+        this.isNew = isNew;
+        this.remark = remark;
+    }
+
+    public MetaVo(String title, String aliasTitle, String icon, String remark)
+    {
+        this.title = title;
+        this.aliasTitle = aliasTitle;
+        this.icon = icon;
+        this.remark = remark;
     }
 
     public MetaVo(String title, String aliasTitle, String icon, boolean noCache)
@@ -50,18 +71,44 @@ public class MetaVo
         this.icon = icon;
     }
 
-    public MetaVo(String title, String aliasTitle, String icon, String link)
+    public MetaVo(String title, String aliasTitle, String icon, String link, String isFrame, Integer isNew, String remark)
     {
         this.title = title;
         this.aliasTitle = aliasTitle;
         this.icon = icon;
+        this.isFrame = isFrame;
+        this.isNew = isNew;
+        this.remark = remark;
     }
 
-    public MetaVo(String title, String aliasTitle, String icon, boolean noCache, String link)
+    public MetaVo(String title, String aliasTitle, String icon, String link, String remark)
     {
         this.title = title;
         this.aliasTitle = aliasTitle;
         this.icon = icon;
+        this.remark = remark;
+    }
+
+    public MetaVo(String title, String aliasTitle, String icon, boolean noCache, String link, String isFrame, Integer isNew, String remark)
+    {
+        this.title = title;
+        this.aliasTitle = aliasTitle;
+        this.icon = icon;
+        this.isFrame = isFrame;
+        this.isNew = isNew;
+        this.remark = remark;
+        if (StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS))
+        {
+
+        }
+    }
+
+    public MetaVo(String title, String aliasTitle, String icon, boolean noCache, String link, String remark)
+    {
+        this.title = title;
+        this.aliasTitle = aliasTitle;
+        this.icon = icon;
+        this.remark = remark;
         if (StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS))
         {
 
@@ -110,4 +157,30 @@ public class MetaVo
     {
         this.affix = affix;
     }
+
+    public String getIsFrame()
+    {
+        return isFrame;
+    }
+
+    public void setIsFrame(String isFrame)
+    {
+        this.isFrame = isFrame;
+    }
+
+    public Integer getIsNew() { return isNew; }
+
+    public void setIsNew(Integer isNew) { this.isNew = isNew; }
+
+
+
+    public String getRemark()
+    {
+        return remark;
+    }
+
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
 }

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/HceArticleMapper.xml

@@ -17,6 +17,7 @@
         <result column="zhaiyao" property="zhaiyao" />
         <result column="createdate" property="createdate" />
         <result column="modifydate" property="modifydate" />
+        <result column="sortindex" property="sortindex" />
     </resultMap>
 
 </mapper>

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/HceCategoryMapper.xml

@@ -16,6 +16,100 @@
         <result column="menu_name" property="menuName" />
         <result column="menu_id" property="menuId" />
         <result column="description" property="description" />
+        <result column="order_num" property="orderNum" />
     </resultMap>
 
+    <select id="selectMenuTreeAll" resultType="com.usky.system.service.vo.HceCategoryListVO">
+        select distinct m.menu_id as menuId,
+                        m.menu_name as menuName,
+                        rm.menu_alias_name as menuAliasName,
+                        m.parent_id as parentId,
+                        m.order_num as orderNum,
+                        m.is_frame as isFrame,
+                        m.is_cache as isCache,
+                        h.id as categoryId,
+                        h.imagePath as imagePath,
+                        h.createdate as createdate,
+                        h.modifydate as modifydate,
+                        h.description as description,
+                        h.status as status
+        from sys_menu m
+            left join sys_role_menu rm on m.menu_id = rm.menu_id
+            inner JOIN hce_category h on m.menu_id = h.menu_id
+        where m.menu_type in ('M', 'C')
+          and m.visible = 0
+          and m.status = 0
+          <if test="categoryName != null">
+              and m.menu_name = #{categoryName}
+          </if>
+          <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+              and h.createdate between #{startTime} and #{endTime}
+          </if>
+        order by m.parent_id, m.order_num
+    </select>
+    <select id="selectMenuTreeByUserId" resultType="com.usky.system.service.vo.HceCategoryListVO">
+        select distinct m.menu_id as menuId,
+                        m.menu_name as menuName,
+                        rm.menu_alias_name as menuAliasName,
+                        m.parent_id as parentId,
+                        m.order_num as orderNum,
+                        m.is_frame as isFrame,
+                        m.is_cache as isCache,
+                        h.id as categoryId,
+                        h.imagePath as imagePath,
+                        h.createdate as createdate,
+                        h.modifydate as modifydate,
+                        h.description as description,
+                        h.status as status
+        from sys_menu m
+                 left join sys_role_menu rm on m.menu_id = rm.menu_id
+                 left join sys_user_role ur on rm.role_id = ur.role_id
+                 left join sys_role ro on ur.role_id = ro.role_id
+                 left join sys_user u on ur.user_id = u.user_id
+                 inner join hce_category h on m.menu_id = h.menu_id
+        where u.user_id = #{userId}
+          and m.menu_type in ('M', 'C')
+          and m.visible = 0
+          and m.status = 0
+          AND ro.status = 0
+        <if test="categoryName != null">
+            and m.menu_name = #{categoryName}
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and h.createdate between #{startTime} and #{endTime}
+        </if>
+        order by m.parent_id, m.order_num
+    </select>
+    <select id="selectMenuTreeByUserIdOne" resultType="com.usky.system.service.vo.HceCategoryListVO">
+        SELECT
+            distinct m.menu_id as menuId,
+                    m.menu_name as menuName,
+                    t.menu_alias_name as menuAliasName,
+                    m.parent_id as parentId,
+                    m.order_num as orderNum,
+                    m.is_frame as isFrame,
+                    m.is_cache as isCache,
+                    h.id as categoryId,
+                    h.imagePath as imagePath,
+                    h.createdate as createdate,
+                    h.modifydate as modifydate,
+                    h.description as description,
+                    h.status as status
+        FROM
+            sys_menu m
+                JOIN sys_tenant_menu t on m.menu_id = t.menu_id
+                inner join hce_category h on m.menu_id = h.menu_id
+        WHERE m.menu_type IN ('M', 'C')
+          and m.visible = 0
+          and m.status = 0
+          AND t.tenant_id=#{tenantId}
+        <if test="categoryName != null">
+            and m.menu_name = #{categoryName}
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and h.createdate between #{startTime} and #{endTime}
+        </if>
+        ORDER BY m.parent_id, m.order_num
+    </select>
+
 </mapper>

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -25,6 +25,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="remark" column="remark"/>
+        <result property="isNew" column="isNew"/>
     </resultMap>
 
     <resultMap type="com.usky.system.domain.SysMobileMenu" id="SysMobileMenuResult">
@@ -63,7 +64,9 @@
                status,
                ifnull(perms, '') as perms,
                icon,
-               create_time
+               create_time,
+               remark,
+               isNew
         from sys_menu
     </sql>
 
@@ -127,7 +130,9 @@
                         m.menu_type,
                         m.icon,
                         m.order_num,
-                        m.create_time
+                        m.create_time,
+                        m.remark,
+                        m.isNew
         from sys_menu m
         where m.menu_type in ('M', 'C')
           and m.status = 0
@@ -136,7 +141,7 @@
 
     <select id="selectMenuListByUserId" parameterType="com.usky.system.domain.SysMenu" resultMap="SysMenuResult">
         select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status,
-        ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+        ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.remark,m.isNew
         from sys_menu m
         left join sys_role_menu rm on m.menu_id = rm.menu_id
         left join sys_user_role ur on rm.role_id = ur.role_id
@@ -184,7 +189,9 @@
                         m.menu_type,
                         m.icon,
                         m.order_num,
-                        m.create_time
+                        m.create_time,
+                        m.remark,
+                        m.isNew
         from sys_menu m
                  left join sys_role_menu rm on m.menu_id = rm.menu_id
                  left join sys_user_role ur on rm.role_id = ur.role_id
@@ -213,7 +220,9 @@
             m.menu_type,
             m.icon,
             m.order_num,
-            m.create_time
+            m.create_time,
+            m.remark,
+            m.isNew
         FROM
             sys_menu m
                 JOIN sys_tenant_menu t
@@ -298,6 +307,7 @@
             <if test="perms !=null">perms = #{perms},</if>
             <if test="icon !=null and icon != ''">icon = #{icon},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="isNew != null">isNew = #{isNew},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
         </set>
@@ -320,6 +330,7 @@
         <if test="perms !=null and perms != ''">perms,</if>
         <if test="icon != null and icon != ''">icon,</if>
         <if test="remark != null and remark != ''">remark,</if>
+        <if test="isNew != null and isNew != 0">isNew,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
         create_time
         )values(
@@ -337,6 +348,7 @@
         <if test="perms !=null and perms != ''">#{perms},</if>
         <if test="icon != null and icon != ''">#{icon},</if>
         <if test="remark != null and remark != ''">#{remark},</if>
+        <if test="isNew != null and isNew != 0">#{isNew},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         sysdate()
         )

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysPlatformMenuMapper.xml

@@ -19,6 +19,7 @@
         <if test="menuType != null and menuType != ''">
             AND a.menu_type = #{menuType}
         </if>
+        order by a.parent_id, a.order_num
     </select>
 
     <select id="getMobileMenuList"  resultType="com.usky.system.domain.SysMobileMenu" >
@@ -32,6 +33,7 @@
         <if test="menuType != null and menuType != ''">
             AND a.menu_type = #{menuType}
         </if>
+        order by a.parent_id, a.order_num
     </select>
 
     <select id="getMenuIdList" resultType="com.usky.system.domain.SysMenu">

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -289,8 +289,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="tenantId != null and tenantId != 0">
 			and tenant_id = #{tenantId}
 		</if>
-		<if test="createBy != null and createBy != ''">
-			and create_by = #{createBy}
+		<if test="userName != null and userName != ''">
+			and user_name = #{userName}
 		</if>
 		order by user_id desc
 	</select>