系统配置-配置列表查询、新增、修改增加大屏路径字段

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysMenuController.java

@@ -78,7 +78,7 @@ public class SysMenuController extends BaseController
     public ApiResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        List<SysMenu> menus = menuService.selectMenuList(loginUser.getUser().getUserId());
+        List<SysMenu> menus = menuService.selectMenuListOne(new SysMenu(),loginUser.getUser().getUserId());
         Map<String,Object> ajax = new HashMap<>();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
         ajax.put("menus", menuService.buildMenuTreeSelect(menus));

fiveep-model/src/main/java/com/bizmatics/model/SysTenantConfig.java

@@ -128,5 +128,10 @@ public class SysTenantConfig implements Serializable {
      */
     private Integer middleStatus;
 
+    /**
+     * 大屏路径
+     */
+    private String largeScreenUrl;
+
 
 }

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysMenuMapper.java

@@ -41,6 +41,8 @@ public interface SysMenuMapper {
      */
     public List<SysMenu> selectMenuListByUserId(SysMenu menu);
 
+    public List<SysMenu> selectMenuListByUserIdOne(SysMenu menu, Integer tenantId);
+
     /**
      * 根据用户ID查询权限
      *

fiveep-persistence/src/main/resources/mapper/mysql/SysTenantConfigMapper.xml

@@ -25,6 +25,7 @@
         <result column="update_time" property="updateTime" />
         <result column="label_icon" property="labelIcon" />
         <result column="middle_status" property="middleStatus" />
+        <result column="large_screen_url" property="largeScreenUrl" />
     </resultMap>
     <select id="getTenantConfig" resultType="com.bizmatics.model.vo.SysTenantConfigVo">
         SELECT

fiveep-persistence/src/main/resources/mapper/mysql/system/SysMenuMapper.xml

@@ -78,6 +78,16 @@
 		order by m.parent_id, m.order_num
 	</select>
 
+	<select id="selectMenuListByUserIdOne" parameterType="com.bizmatics.model.system.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
+		from sys_menu m
+		join sys_tenant_menu rm on m.menu_id = rm.menu_id
+		where rm.tenant_id = #{tenantId}
+			AND m.visible = 0
+			AND m.status = 0
+		order by m.parent_id, m.order_num
+	</select>
+
     <select id="selectMenuTreeByUserId" parameterType="Long" 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
 		from sys_menu m

fiveep-service/src/main/java/com/bizmatics/service/system/ISysMenuService.java

@@ -31,6 +31,8 @@ public interface ISysMenuService
      */
     public List<SysMenu> selectMenuList(SysMenu menu, Long userId);
 
+    public List<SysMenu> selectMenuListOne(SysMenu menu, Long userId);
+
     /**
      * 根据用户ID查询权限
      * 

fiveep-service/src/main/java/com/bizmatics/service/system/impl/SysMenuServiceImpl.java

@@ -1,11 +1,8 @@
 package com.bizmatics.service.system.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.bizmatics.common.core.exception.BusinessException;
 import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.utils.ServletUtils;
-import com.bizmatics.model.PlatformArea;
 import com.bizmatics.model.base.TreeSelect;
 import com.bizmatics.model.constants.Constants;
 import com.bizmatics.model.constants.UserConstants;
@@ -18,7 +15,6 @@ import com.bizmatics.persistence.mapper.system.SysRoleMapper;
 import com.bizmatics.persistence.mapper.system.SysRoleMenuMapper;
 import com.bizmatics.persistence.mapper.system.SysUserMapper;
 import com.bizmatics.service.config.security.LoginUser;
-import com.bizmatics.service.impl.DeviceServiceImpl;
 import com.bizmatics.service.system.ISysMenuService;
 import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,6 +81,13 @@ public class SysMenuServiceImpl implements ISysMenuService {
         return menuList;
     }
 
+    @Override
+    public List<SysMenu> selectMenuListOne(SysMenu menu, Long userId) {
+        List<SysUser> tenantIdList = userMapper.getTenantId(userId);
+        List<SysMenu> menuList = menuMapper.selectMenuListByUserIdOne(menu,tenantIdList.get(0).getTenantId());
+        return menuList;
+    }
+
     /**
      * 根据用户ID查询权限
      *
@@ -495,8 +498,8 @@ public class SysMenuServiceImpl implements ISysMenuService {
 //        if (SecurityUtils.isAdmin(user.getUserId())) {
 //            sysMenuList = menuMapper.getButtonlistOne(menuName);
 //        } else {
-            Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
-            List<SysUser> tenantIdList = userMapper.getTenantId(userId);
+//            Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
+            List<SysUser> tenantIdList = userMapper.getTenantId(user.getUserId());
 //            role.setTenantId(sysMenuList.get(0).getTenantId());
             if (tenantIdList.get(0).getUserType().equals("00")){
                 sysMenuList = menuMapper.getButtonlist(user.getUserId(), menuName, 0L);
@@ -689,7 +692,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
 
         }
         //已选中按钮列表
-        List<SysMenu> sysMenuListFour = sysMenuListFour = menuMapper.getButtonlistTwo(0L, null, roleId);
+        List<SysMenu>  sysMenuListFour = menuMapper.getButtonlistTwo(0L, null, roleId);
 
 
         List<SysMenuTwoVo> sysMenuVoListOne = new ArrayList<>();
@@ -754,7 +757,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
 
         for (int i = 0; i < SysMenuVoListOne.size(); i++) {
             String name = SysMenuVoListOne.get(i).getMenu();
-            if (name.equals("数据管理") || name.equals("电能质量") || name.equals("系统管理")) {
+            if (name.equals("数据管理") || name.equals("电能质量") || name.equals("系统管理")|| name.equals("租户管理")) {
                 list.add(SysMenuVoListOne.get(i));
             } else {
                 for (int j = 0; j < SysMenuVoList.size(); j++) {