平台菜单查询

service-system/service-system-api/src/main/java/com/usky/system/domain/SysUserVO.java

@@ -73,6 +73,10 @@ public class SysUserVO extends BaseEntity
 
     /** 角色ID */
     private Long roleId;
+    /**
+     * 租户id
+     */
+    private Integer tenantId;
 
     public Integer getTenantId() {
         return tenantId;
@@ -82,7 +86,7 @@ public class SysUserVO extends BaseEntity
         this.tenantId = tenantId;
     }
 
-    private Integer tenantId;
+
 
     public SysUserVO()
     {

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysPlatformController.java

@@ -1,14 +1,19 @@
 package com.usky.system.controller.web;
 
 
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.system.domain.SysMenu;
+import com.usky.system.service.ISysMenuService;
 import com.usky.system.service.SysPlatformService;
 import com.usky.system.service.vo.PlatformMenuVo;
 import com.usky.system.service.vo.SysPlatformVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -23,6 +28,9 @@ public class SysPlatformController {
     @Autowired
     private SysPlatformService sysPlatformService;
 
+    @Autowired
+    private ISysMenuService menuService;
+
     /**
      * 平台挂管理-列表查询
      *
@@ -52,7 +60,13 @@ public class SysPlatformController {
      */
     @GetMapping("/getPlatformMenu")
     public ApiResult<Map<String, Object>> getPlatformMenu(@RequestParam Long platformId) {
-        return ApiResult.success(sysPlatformService.getPlatformMenu(platformId));
+
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenu> menus = menuService.selectMenuList(userId);
+        Map<String,Object> ajax = new HashMap<>();
+        ajax.put("checkedKeys", sysPlatformService.getPlatformMenu(platformId));
+        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+        return ApiResult.success(ajax);
     }
 
 

service-system/service-system-biz/src/main/java/com/usky/system/service/SysPlatformService.java

@@ -22,7 +22,7 @@ public interface SysPlatformService extends CrudService<SysPlatform> {
 
     CommonPage<SysPlatformVo> getPlatformList(String platformName, String startTime, String endTime, Integer page, Integer size, Integer id);
 
-    Map<String, Object> getPlatformMenu(Long platformId);
+    Long[] getPlatformMenu(Long platformId);
 
     void updatePlatformMenu(PlatformMenuVo platformMenuVo);
 }

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysPlatformServiceImpl.java

@@ -63,14 +63,7 @@ public class SysPlatformServiceImpl extends AbstractCrudService<SysPlatformMappe
     }
 
     @Override
-    public Map<String, Object> getPlatformMenu(Long platformId) {
-        //全部目录查询
-        List<SysMenu> sysMenuListTwo = menuMapper.getSysMenuList("M");
-        //全部菜单查询
-        List<SysMenu> sysMenuListOne = menuMapper.getSysMenuList("C");
-        //全部按钮列表
-        List<SysMenu> sysMenuListThree = menuMapper.getSysMenuList("F");
-        //已选中按钮列表
+    public Long[] getPlatformMenu(Long platformId) {
         LambdaQueryWrapper<SysPlatformMenu> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(SysPlatformMenu::getPlatformId, platformId);
         List<SysPlatformMenu> sysMenuListFour = sysPlatformMenuService.list(queryWrapper);
@@ -80,107 +73,7 @@ public class SysPlatformServiceImpl extends AbstractCrudService<SysPlatformMappe
         for (int i = 0; i < menuList.size(); i++) {
             arr[i] = menuList.get(i).getMenuId();
         }
-
-
-        List<SysMenuTwoVo> sysMenuVoListOne = new ArrayList<>();
-        List<SysMenuOneVo> SysMenuVoList = new ArrayList<>();
-        List<SysMenuVo> SysMenuVoListOne = new ArrayList<>();
-        List<Object> list = new ArrayList<>();
-        for (int i = 0; i < sysMenuListThree.size(); i++) {
-            SysMenuTwoVo sysMenuTwoVo = new SysMenuTwoVo();
-            sysMenuTwoVo.setId(sysMenuListThree.get(i).getMenuId());
-            sysMenuTwoVo.setName(sysMenuListThree.get(i).getMenuName());
-            sysMenuTwoVo.setFid(sysMenuListThree.get(i).getParentId());
-            long Id = sysMenuListThree.get(i).getMenuId();
-            sysMenuTwoVo.setChecked(false);
-            if (sysMenuListFour.size() > 0) {
-                for (int j = 0; j < sysMenuListFour.size(); j++) {
-                    long MenuId = sysMenuListFour.get(j).getMenuId();
-                    if (Id == MenuId) {
-                        sysMenuTwoVo.setChecked(true);
-                    }
-                }
-            } else {
-                sysMenuTwoVo.setChecked(false);
-            }
-
-            sysMenuVoListOne.add(sysMenuTwoVo);
-        }
-
-        for (int i = 0; i < sysMenuListOne.size(); i++) {
-            SysMenuOneVo sysMenuOneVo = new SysMenuOneVo();
-            sysMenuOneVo.setId(sysMenuListOne.get(i).getMenuId());
-            sysMenuOneVo.setMenu(sysMenuListOne.get(i).getMenuName());
-            sysMenuOneVo.setFid(sysMenuListOne.get(i).getParentId());
-            long id = sysMenuListOne.get(i).getMenuId();
-            List<SysMenuTwoVo> sysMenuVoListTwo = new ArrayList<>();
-            List<SysMenuTwoVo> menuListTrue = new ArrayList<>();
-            for (int j = 0; j < sysMenuVoListOne.size(); j++) {
-                long FId = sysMenuVoListOne.get(j).getFid();
-                Boolean pd = sysMenuVoListOne.get(j).getChecked();
-                if (id == FId) {
-                    sysMenuVoListTwo.add(sysMenuVoListOne.get(j));
-                    if (pd == true) {
-                        menuListTrue.add(sysMenuVoListOne.get(j));
-                    }
-                }
-            }
-            sysMenuOneVo.setAuthority(sysMenuVoListTwo);
-            if (menuListTrue.size() > 0) {
-                sysMenuOneVo.setChecked(true);
-            } else {
-                sysMenuOneVo.setChecked(false);
-            }
-            SysMenuVoList.add(sysMenuOneVo);
-        }
-
-        for (int i = 0; i < sysMenuListTwo.size(); i++) {
-            SysMenuVo sysMenuVo = new SysMenuVo();
-            sysMenuVo.setId(sysMenuListTwo.get(i).getMenuId());
-            sysMenuVo.setMenu(sysMenuListTwo.get(i).getMenuName());
-            sysMenuVo.setFid(sysMenuListTwo.get(i).getParentId());
-            long id = sysMenuListTwo.get(i).getMenuId();
-            List<SysMenuOneVo> SysMenuVoListThree = new ArrayList<>();
-            List<SysMenuOneVo> menuListtrueOne = new ArrayList<>();
-            for (int j = 0; j < SysMenuVoList.size(); j++) {
-                long FId = SysMenuVoList.get(j).getFid();
-                Boolean pd = SysMenuVoList.get(j).getChecked();
-                if (id == FId) {
-                    SysMenuVoListThree.add(SysMenuVoList.get(j));
-                    if (pd == true) {
-                        menuListtrueOne.add(SysMenuVoList.get(j));
-                    }
-                }
-            }
-            sysMenuVo.setChildren(SysMenuVoListThree);
-            if (menuListtrueOne.size() > 0) {
-                sysMenuVo.setChecked(true);
-            } else {
-                sysMenuVo.setChecked(false);
-            }
-
-            SysMenuVoListOne.add(sysMenuVo);
-        }
-
-        for (int i = 0; i < SysMenuVoListOne.size(); i++) {
-            String name = SysMenuVoListOne.get(i).getMenu();
-            if (name.equals("数据管理") || name.equals("电能质量") || name.equals("系统管理") || name.equals("租户管理") || name.equals("统计管理")) {
-                list.add(SysMenuVoListOne.get(i));
-            } else {
-                for (int j = 0; j < SysMenuVoList.size(); j++) {
-                    String name2 = SysMenuVoList.get(j).getMenu();
-                    if (name.equals(name2)) {
-                        list.add(SysMenuVoList.get(j));
-                    }
-                }
-            }
-        }
-        Map<String, Object> ajax = new HashMap<>();
-        ajax.put("checkedKeys", arr);
-        ajax.put("menus", list);
-
-        return ajax;
-//        return list;
+        return arr;
     }
 
 

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -447,7 +447,8 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         // 权限集合
         Set<String> permissions = sysPermissionService.getMenuPermission(sysUser);
         LoginUser SysUser = new LoginUser();
-        SysUser.setSysUser(BeanMapperUtils.map(sysUser,SysUserVO.class));
+        SysUserVO sysUserVO = BeanMapperUtils.map(sysUser, SysUserVO.class);
+        SysUser.setSysUser(sysUserVO);
         SysUser.setRoles(roles);
         SysUser.setPermissions(permissions);
         return SysUser;