james 2 년 전
부모
커밋
d675c5048a

+ 16 - 0
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysMobileMenuController.java

@@ -47,6 +47,13 @@ public class SysMobileMenuController  extends BaseController {
         return ApiResult.success(menus);
     }
 
+    @GetMapping("getAppRouters")
+    public ApiResult getAppRouters(@RequestParam(value = "domain") String domain)
+    {
+        List<SysMobileMenu> menus = sysMobileMenuService.moveAppRoute(domain);
+        return ApiResult.success(menus);
+    }
+
     /**
      * 移动端系统管理-菜单管理-列表展示
      */
@@ -59,6 +66,15 @@ public class SysMobileMenuController  extends BaseController {
         return ApiResult.success(menus);
     }
 
+    /**
+     * 移动端系统管理-菜单管理-根据菜单编号获取详细信息
+     */
+    @GetMapping(value = "/{menuId}")
+    public ApiResult getInfo(@PathVariable Long menuId)
+    {
+        return ApiResult.success(sysMobileMenuService.selectMenuById(menuId));
+    }
+
     /**
      * 移动端系统管理-菜单管理-新增菜单
      */

+ 8 - 0
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysMobileMenuMapper.java

@@ -35,6 +35,14 @@ public interface SysMobileMenuMapper extends CrudMapper<SysMobileMenu> {
      */
     public List<SysMobileMenu> selectMobileMenuList(SysMobileMenu menu);
 
+    /**
+     * 根据菜单ID查询信息
+     *
+     * @param menuId 菜单ID
+     * @return 菜单信息
+     */
+    public SysMobileMenu selectMenuById(@Param("menuId") Long menuId);
+
     /**
      * 根据用户查询系统菜单列表
      *

+ 14 - 0
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/SysMobileMenuService.java

@@ -22,6 +22,12 @@ public interface SysMobileMenuService extends CrudService<SysMobileMenu> {
      */
     List<SysMobileMenu> moveRoute();
 
+    /**
+     * 手机APP-首页路由
+     * @return
+     */
+    List<SysMobileMenu> moveAppRoute(String domain);
+
     /**
      * 根据用户查询系统菜单列表
      *
@@ -31,6 +37,14 @@ public interface SysMobileMenuService extends CrudService<SysMobileMenu> {
      */
     public List<SysMobileMenu> selectMobileMenuList(SysMobileMenu menu, Long userId);
 
+    /**
+     * 根据菜单ID查询信息
+     *
+     * @param menuId 菜单ID
+     * @return 菜单信息
+     */
+    public SysMobileMenu selectMenuById(Long menuId);
+
     /**
      * 校验菜单名称是否唯一
      *

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

@@ -7,16 +7,14 @@ import com.usky.common.core.constants.Constants;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.controller.web.SysMenuController;
-import com.usky.system.domain.SysMenu;
-import com.usky.system.domain.SysMobileMenu;
-import com.usky.system.domain.SysMobileTenantMenu;
-import com.usky.system.domain.SysUserVO;
+import com.usky.system.domain.*;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysMobileMenuMapper;
 import com.usky.system.mapper.SysRoleMenuMapper;
 import com.usky.system.service.SysMobileMenuService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.system.service.SysMobileTenantMenuService;
+import com.usky.system.service.SysTenantService;
 import com.usky.system.service.vo.MetaVo;
 import com.usky.system.service.vo.RouterVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +42,9 @@ public class SysMobileMenuServiceImpl extends AbstractCrudService<SysMobileMenuM
     @Autowired
     private SysMobileTenantMenuService sysMobileTenantMenuService;
 
+    @Autowired
+    private SysTenantService sysTenantService;
+
     /**
      * 查询系统菜单列表
      *
@@ -67,6 +68,18 @@ public class SysMobileMenuServiceImpl extends AbstractCrudService<SysMobileMenuM
         return menuList;
     }
 
+    /**
+     * 根据菜单ID查询信息
+     *
+     * @param menuId 菜单ID
+     * @return 菜单信息
+     */
+    @Override
+    public SysMobileMenu selectMenuById(Long menuId)
+    {
+        return sysMobileMenuMapper.selectMenuById(menuId);
+    }
+
     /**
      * 修改保存菜单信息
      *
@@ -143,6 +156,38 @@ public class SysMobileMenuServiceImpl extends AbstractCrudService<SysMobileMenuM
         return list;
     }
 
+    @Override
+    public List<SysMobileMenu> moveAppRoute(String domain){
+        List<SysMobileMenu> list = new ArrayList<>();
+        List<SysTenant> list1 = sysTenantService.getAppData(domain);
+
+        if(CollectionUtils.isNotEmpty(list1)){
+            Integer tenantId = list1.get(0).getId();
+            String platformId = list1.get(0).getSystemName();
+            LambdaQueryWrapper<SysMobileTenantMenu> query = Wrappers.lambdaQuery();
+            query.eq(SysMobileTenantMenu::getTenantId, tenantId);
+            List<SysMobileTenantMenu> tenantMenuList = sysMobileTenantMenuService.list(query);
+            if (CollectionUtils.isNotEmpty(tenantMenuList)){
+                List<Long> menuIdList = new ArrayList<>();
+                for (int i = 0; i < tenantMenuList.size(); i++) {
+                    menuIdList.add(tenantMenuList.get(i).getMenuId());
+                }
+                LambdaQueryWrapper<SysMobileMenu> queryOne = Wrappers.lambdaQuery();
+                queryOne.select(SysMobileMenu::getMenuId,SysMobileMenu::getMenuName,SysMobileMenu::getParentId,SysMobileMenu::getOrderNum,
+                        SysMobileMenu::getPath,SysMobileMenu::getComponent,SysMobileMenu::getIsFrame,SysMobileMenu::getIsCache,SysMobileMenu::getMenuType,
+                        SysMobileMenu::getVisible,SysMobileMenu::getStatus,SysMobileMenu::getPerms,SysMobileMenu::getIcon,SysMobileMenu::getCreateBy,
+                        SysMobileMenu::getCreateTime,SysMobileMenu::getUpdateBy,SysMobileMenu::getUpdateTime,SysMobileMenu::getRemark)
+                        .in(SysMobileMenu::getMenuId, menuIdList)
+                        .eq(SysMobileMenu::getVisible,0)
+                        .eq(SysMobileMenu::getStatus,0);
+                queryOne.orderByAsc(SysMobileMenu::getOrderNum);
+                List<SysMobileMenu> menuList = this.list(queryOne);
+                list = getChildPerms(menuList, 0);
+            }
+        }
+        return list;
+    }
+
     /**
      * 是否存在菜单子节点
      *

+ 13 - 4
base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysMobileMenuMapper.xml

@@ -10,7 +10,6 @@
         <result column="order_num" property="orderNum" />
         <result column="path" property="path" />
         <result column="component" property="component" />
-        <result column="query" property="query" />
         <result column="is_frame" property="isFrame" />
         <result column="is_cache" property="isCache" />
         <result column="menu_type" property="menuType" />
@@ -39,7 +38,11 @@
                status,
                ifnull(perms, '') as perms,
                icon,
-               create_time
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
         from sys_mobile_menu
     </sql>
 
@@ -59,9 +62,15 @@
         order by parent_id, order_num
     </select>
 
+
+    <select id="selectMenuById" parameterType="Long" resultMap="BaseResultMap">
+        <include refid="selectMobileMenuVo"/>
+        where menu_id = #{menuId}
+    </select>
+
     <select id="selectMobileMenuListByUserId" parameterType="com.usky.system.domain.SysMobileMenu" resultMap="BaseResultMap">
-        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
+        select distinct m.menu_id, m.menu_name, m.parent_id, m.order_num, m.path, m.component, m.is_frame, m.is_cache, m.menu_type, m.visible, m.status,
+        ifnull(m.perms,'') as perms, m.icon, m.create_by, m.create_time, m.update_by, m.update_time, m.remark
         from sys_mobile_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