Browse Source

'单位管理界面中新增系统平台字段刷选逻辑和开发手机APP菜单权限刷选接口'

james 2 years ago
parent
commit
e60ffc9df5

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

@@ -4,8 +4,10 @@ package com.usky.system.controller.web;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.SysMobileMenu;
 import com.usky.system.domain.SysMobileMenu;
+import com.usky.system.domain.SysTenant;
 import com.usky.system.service.ISysMenuService;
 import com.usky.system.service.ISysMenuService;
 import com.usky.system.service.SysPlatformMenuService;
 import com.usky.system.service.SysPlatformMenuService;
+import com.usky.system.service.SysTenantService;
 import com.usky.system.service.vo.TenantMenuVo;
 import com.usky.system.service.vo.TenantMenuVo;
 import com.usky.system.service.vo.MobileTenantMenuVO;
 import com.usky.system.service.vo.MobileTenantMenuVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +33,9 @@ public class AuthorityConfigController {
     @Autowired
     @Autowired
     private ISysMenuService menuService;
     private ISysMenuService menuService;
 
 
+    @Autowired
+    private SysTenantService sysTenantService;
+
 
 
     /**
     /**
      * 租户管理-权限配置-目录查询
      * 租户管理-权限配置-目录查询
@@ -80,6 +85,25 @@ public class AuthorityConfigController {
         return ApiResult.success(ajax);
         return ApiResult.success(ajax);
     }
     }
 
 
+    /**
+     * 手机端APP租户管理-权限配置-目录查询
+     *
+     * @param domain 域名
+     * @return
+     */
+    @GetMapping("getAppConfigMenuList")
+    public ApiResult<Map<String, Object>> getAppConfigMenuList(@RequestParam(value = "domain") String domain) {
+        List<SysTenant> list = sysTenantService.getAppData(domain);
+
+        Integer tenantId = list.get(0).getId();
+        String platformId = list.get(0).getSystemName();
+        List<SysMobileMenu> menus =sysPlatformMenuService.getMobilePlatformMenuList(Integer.parseInt(platformId));
+        Map<String, Object> ajax = new HashMap<>();
+        ajax.put("checkedKeys", sysPlatformMenuService.selectMobilePlatformMenu(tenantId));
+        ajax.put("menus", menuService.buildMobileMenuTreeSelect(menus));
+        return ApiResult.success(ajax);
+    }
+
     /**
     /**
      * 租户管理-权限配置-目录保存
      * 租户管理-权限配置-目录保存
      *
      *

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

@@ -20,10 +20,13 @@ public interface SysTenantMapper extends CrudMapper<SysTenant> {
 
 
     List<SysTenantVo> getUserData(@Param("userId") int userId);
     List<SysTenantVo> getUserData(@Param("userId") int userId);
 
 
+    List<SysTenant> getAppData(@Param("domain") String domain);
+
     List<SysTenantTwoVo> getTenantData(@Param("tenantName") String tenantName,
     List<SysTenantTwoVo> getTenantData(@Param("tenantName") String tenantName,
                                        @Param("tenantManager") String tenantManager,
                                        @Param("tenantManager") String tenantManager,
                                        @Param("tenantType") String tenantType,
                                        @Param("tenantType") String tenantType,
                                        @Param("status") String status,
                                        @Param("status") String status,
+                                       @Param("platformName") String platformName,
                                        @Param("startTime") String startTime,
                                        @Param("startTime") String startTime,
                                        @Param("endTime") String endTime,
                                        @Param("endTime") String endTime,
                                        @Param("current") Integer current,
                                        @Param("current") Integer current,

+ 2 - 0
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/SysTenantService.java

@@ -20,6 +20,8 @@ import java.util.List;
 public interface SysTenantService extends CrudService<SysTenant> {
 public interface SysTenantService extends CrudService<SysTenant> {
     List<SysTenantVo> getUserData();
     List<SysTenantVo> getUserData();
 
 
+    List<SysTenant> getAppData(String domain);
+
     CommonPage<SysTenantTwoVo> getTenantData(SysTenantOneVo sysTenantOneVo);
     CommonPage<SysTenantTwoVo> getTenantData(SysTenantOneVo sysTenantOneVo);
 
 
     void addTenantData(SysTenant sysTenant);
     void addTenantData(SysTenant sysTenant);

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

@@ -33,6 +33,18 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
         return list;
         return list;
     }
     }
 
 
+    /**
+     * 手机端APP租户管理-权限配置-目录查询
+     *
+     * @param domain
+     * @return
+     */
+    @Override
+    public List<SysTenant> getAppData(String domain){
+        List<SysTenant> list = baseMapper.getAppData(domain);
+        return list;
+    }
+
     /**
     /**
      * 租户管理-租户列表查询
      * 租户管理-租户列表查询
      *
      *
@@ -48,6 +60,7 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
                 sysTenantOneVo.getTenantManager(),
                 sysTenantOneVo.getTenantManager(),
                 sysTenantOneVo.getTenantType(),
                 sysTenantOneVo.getTenantType(),
                 sysTenantOneVo.getStatus(),
                 sysTenantOneVo.getStatus(),
+                sysTenantOneVo.getPlatformName(),
                 sysTenantOneVo.getStartTime(),
                 sysTenantOneVo.getStartTime(),
                 sysTenantOneVo.getEndTime(), null, null, sysTenantOneVo.getId());
                 sysTenantOneVo.getEndTime(), null, null, sysTenantOneVo.getId());
         int total = 0;
         int total = 0;
@@ -62,6 +75,7 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
                 sysTenantOneVo.getTenantManager(),
                 sysTenantOneVo.getTenantManager(),
                 sysTenantOneVo.getTenantType(),
                 sysTenantOneVo.getTenantType(),
                 sysTenantOneVo.getStatus(),
                 sysTenantOneVo.getStatus(),
+                sysTenantOneVo.getPlatformName(),
                 sysTenantOneVo.getStartTime(),
                 sysTenantOneVo.getStartTime(),
                 sysTenantOneVo.getEndTime(),
                 sysTenantOneVo.getEndTime(),
                 current,
                 current,

+ 5 - 0
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/SysTenantOneVo.java

@@ -54,6 +54,11 @@ public class SysTenantOneVo implements Serializable {
      */
      */
     private String status;
     private String status;
 
 
+    /**
+     * 系统名称
+     */
+    private String platformName;
+
     /**
     /**
      * 当前页
      * 当前页
      */
      */

+ 13 - 0
base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysTenantMapper.xml

@@ -35,6 +35,16 @@
         </where>
         </where>
     </select>
     </select>
 
 
+    <select id="getAppData" resultType="com.usky.system.domain.SysTenant">
+        SELECT
+        a.*
+        FROM
+        sys_tenant AS a
+        <where>
+            a.domain = #{domain}
+        </where>
+    </select>
+
     <select id="getTenantData" resultType="com.usky.system.service.vo.SysTenantTwoVo">
     <select id="getTenantData" resultType="com.usky.system.service.vo.SysTenantTwoVo">
         SELECT
         SELECT
         a.*,b.platform_name
         a.*,b.platform_name
@@ -53,6 +63,9 @@
             <if test="tenantType != null and tenantType != ''">
             <if test="tenantType != null and tenantType != ''">
                 and a.tenant_type = #{tenantType}
                 and a.tenant_type = #{tenantType}
             </if>
             </if>
+            <if test="platformName != null and platformName != ''">
+                and b.platform_name LIKE CONCAT(CONCAT('%', #{platformName}), '%')
+            </if>
             <if test="status != null and status != ''">
             <if test="status != null and status != ''">
                 and a.status = #{status}
                 and a.status = #{status}
             </if>
             </if>