应用表

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysAppController.java

@@ -111,6 +111,17 @@ public class SysAppController extends BaseController {
     }
 
     /**
+     * 移动端查询全部应用列表
+     * homePage:0-非首页应用;1-首页应用
+     */
+    @PreAuthorize("@ss.hasPermi('system:app:list')")
+    @GetMapping("/listBy")
+    public AjaxResult listBy(SysApp sysApp) {
+        List<SysApp> list = sysAppService.listBy(sysApp);
+        return success(list);
+    }
+
+    /**
      * 根据角色ID查询应用列表
      */
     @GetMapping(value = "/roleAppSelect/{roleId}")

airport-system/src/main/java/com/sundot/airport/system/mapper/SysAppRoleMapper.java

@@ -3,6 +3,7 @@ package com.sundot.airport.system.mapper;
 import java.util.List;
 
 import com.sundot.airport.system.domain.SysAppRole;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 应用和角色关联Mapper接口
@@ -82,4 +83,12 @@ public interface SysAppRoleMapper {
      * @return 结果
      */
     public int batchAppRole(List<SysAppRole> list);
+
+    /**
+     * 查询应用和角色关联
+     *
+     * @param list 角色ID列表
+     * @return 应用和角色关联
+     */
+    public List<SysAppRole> selectSysAppRoleByRoleIds(@Param("list") List<Long> list);
 }

airport-system/src/main/java/com/sundot/airport/system/service/ISysAppService.java

@@ -29,6 +29,14 @@ public interface ISysAppService {
     public List<SysApp> selectSysAppList(SysApp sysApp);
 
     /**
+     * 移动端查询全部应用列表
+     *
+     * @param sysApp 应用
+     * @return 应用集合
+     */
+    public List<SysApp> listBy(SysApp sysApp);
+
+    /**
      * 新增应用
      *
      * @param sysApp 应用

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysAppServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sundot.airport.system.service.impl;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -9,6 +10,7 @@ import com.sundot.airport.common.core.domain.AjaxResult;
 import com.sundot.airport.common.core.domain.entity.SysRole;
 import com.sundot.airport.common.enums.HomePageEnum;
 import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.common.utils.SecurityUtils;
 import com.sundot.airport.system.domain.SysAppRole;
 import com.sundot.airport.system.mapper.SysAppRoleMapper;
 import com.sundot.airport.system.service.ISysRoleService;
@@ -65,6 +67,30 @@ public class SysAppServiceImpl implements ISysAppService {
     @Override
     public List<SysApp> selectSysAppList(SysApp sysApp) {
         return sysAppMapper.selectSysAppList(sysApp);
+
+    }
+
+    /**
+     * 移动端查询全部应用列表
+     *
+     * @param sysApp 应用
+     * @return 应用集合
+     */
+    @Override
+    public List<SysApp> listBy(SysApp sysApp) {
+        if (StrUtil.isEmpty(sysApp.getHomePage())) {
+            sysApp.setHomePage(HomePageEnum.NO.getCode());
+        }
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        if (CollUtil.isEmpty(roles)) {
+            return Collections.emptyList();
+        }
+        List<Long> roleIdList = roles.stream().map(SysRole::getRoleId).collect(Collectors.toList());
+        List<SysAppRole> sysAppRoleList = sysAppRoleMapper.selectSysAppRoleByRoleIds(roleIdList);
+        List<Long> appIdList = sysAppRoleList.stream().filter(item -> StrUtil.equals(item.getHomePage(), sysApp.getHomePage())).map(SysAppRole::getAppId).collect(Collectors.toList());
+        List<SysApp> result = sysAppMapper.selectSysAppList(sysApp);
+        result = result.stream().filter(item -> appIdList.contains(item.getAppId())).collect(Collectors.toList());
+        return result;
     }
 
     /**

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysRoleServiceImpl.java

@@ -443,7 +443,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
             }
         }
         if (listHomePage.size() > 0) {
-            rows = appRoleMapper.batchAppRole(list);
+            rows = appRoleMapper.batchAppRole(listHomePage);
         }
         return rows;
     }

airport-system/src/main/resources/mapper/system/SysAppMapper.xml

@@ -48,7 +48,6 @@
             <if test="appUrl != null  and appUrl != ''">and app_url = #{appUrl}</if>
             <if test="appSort != null ">and app_sort = #{appSort}</if>
             <if test="status != null  and status != ''">and status = #{status}</if>
-            <if test="homePage != null  and homePage != ''">and home_page = #{homePage}</if>
             <if test="homePageIcon != null  and homePageIcon != ''">and home_page_icon = #{homePageIcon}</if>
             <if test="workbenchIcon != null  and workbenchIcon != ''">and workbench_icon = #{workbenchIcon}</if>
             <if test="createByUserId != null ">and create_by_user_id = #{createByUserId}</if>

airport-system/src/main/resources/mapper/system/SysAppRoleMapper.xml

@@ -87,4 +87,12 @@
         </foreach>
     </insert>
 
+    <select id="selectSysAppRoleByRoleIds">
+        <include refid="selectSysAppRoleVo"/>
+        where role_id in
+        <foreach collection="list" item="roleId" open="(" separator="," close=")">
+            #{roleId}
+        </foreach>
+    </select>
+
 </mapper>