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

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,9 @@ public class SysMenu extends BaseEntity
     /** 菜单图标 */
     private String icon;
 
+    /** 是否新窗口;0:否 1:是 */
+    private Integer isNew;
+
     /** 子菜单 */
     @TableField(exist = false)
     private List<SysMenu> children = new ArrayList<SysMenu>();
@@ -230,6 +233,10 @@ public class SysMenu extends BaseEntity
         this.icon = icon;
     }
 
+    public Integer getIsNew() { return isNew; }
+
+    public void setIsNew(Integer isNew) { this.isNew = isNew; }
+
     public List<SysMenu> getChildren()
     {
         return children;
@@ -261,6 +268,7 @@ public class SysMenu extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("isNew", getIsNew())
             .toString();
     }
 }

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

@@ -43,7 +43,7 @@ public class HceCategoryServiceImpl extends AbstractCrudService<HceCategoryMappe
                 .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);
+                .orderByAsc(HceCategory::getOrderNum,HceCategory::getId);
         List<HceCategory> list = this.list(queryWrapper);
         List<HceCategory> list1 = list.stream().filter(s ->s.getPid() == 0).map(
                 menu->{menu.setChildren(getChildrenData(menu,list));

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()));
             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()));
                 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()));
                 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()));
                 childrenList.add(children);
                 router.setChildren(childrenList);
             }

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,10 +33,25 @@ public class MetaVo
       */
     private Boolean affix;
 
+    /** 是否为外链（0是 1否） */
+    private String isFrame;
+
+    /** 是否新窗口;0:否 1:是 */
+    private Integer isNew;
+
     public MetaVo()
     {
     }
 
+    public MetaVo(String title, String aliasTitle, String icon, String isFrame, Integer isNew)
+    {
+        this.title = title;
+        this.aliasTitle = aliasTitle;
+        this.icon = icon;
+        this.isFrame = isFrame;
+        this.isNew = isNew;
+    }
+
     public MetaVo(String title, String aliasTitle, String icon)
     {
         this.title = title;
@@ -50,6 +66,15 @@ public class MetaVo
         this.icon = icon;
     }
 
+    public MetaVo(String title, String aliasTitle, String icon, String link, String isFrame, Integer isNew)
+    {
+        this.title = title;
+        this.aliasTitle = aliasTitle;
+        this.icon = icon;
+        this.isFrame = isFrame;
+        this.isNew = isNew;
+    }
+
     public MetaVo(String title, String aliasTitle, String icon, String link)
     {
         this.title = title;
@@ -57,6 +82,19 @@ public class MetaVo
         this.icon = icon;
     }
 
+    public MetaVo(String title, String aliasTitle, String icon, boolean noCache, String link, String isFrame, Integer isNew)
+    {
+        this.title = title;
+        this.aliasTitle = aliasTitle;
+        this.icon = icon;
+        this.isFrame = isFrame;
+        this.isNew = isNew;
+        if (StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS))
+        {
+
+        }
+    }
+
     public MetaVo(String title, String aliasTitle, String icon, boolean noCache, String link)
     {
         this.title = title;
@@ -110,4 +148,18 @@ 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; }
 }

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,7 @@
         <result column="menu_name" property="menuName" />
         <result column="menu_id" property="menuId" />
         <result column="description" property="description" />
+        <result column="order_num" property="orderNum" />
     </resultMap>
 
 </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">
@@ -127,7 +128,8 @@
                         m.menu_type,
                         m.icon,
                         m.order_num,
-                        m.create_time
+                        m.create_time,
+                        m.isNew
         from sys_menu m
         where m.menu_type in ('M', 'C')
           and m.status = 0
@@ -136,7 +138,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.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 +186,8 @@
                         m.menu_type,
                         m.icon,
                         m.order_num,
-                        m.create_time
+                        m.create_time,
+                        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 +216,8 @@
             m.menu_type,
             m.icon,
             m.order_num,
-            m.create_time
+            m.create_time,
+            m.isNew
         FROM
             sys_menu m
                 JOIN sys_tenant_menu t
@@ -320,6 +324,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 +342,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()
         )