change - 首页传感器数量修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/IndexController.java

@@ -218,6 +218,7 @@ public class IndexController {
       List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
 
       List<BaseSensorInfoDto> baseSensorInfoDtos = new ArrayList<>();
+      if(!ShiroUtils.getLoginName().equals("admin")){
         for (SysRole sysRole : sysRoles) {
           BaseSensorInfo baseSensorInfo = new BaseSensorInfo();
           baseSensorInfo.setEnableFlag(0L);
@@ -225,6 +226,10 @@ public class IndexController {
           List<BaseSensorInfoDto> baseSensorInfoDtos1 = baseSensorInfoService.selectBaseSensorInfoList(baseSensorInfo);
           baseSensorInfoDtos.addAll(baseSensorInfoDtos1);
         }
+      }else {
+        List<BaseSensorInfoDto> baseSensorInfoDtos1 = baseSensorInfoService.selectBaseSensorInfoList(new BaseSensorInfo(null,0L));
+        baseSensorInfoDtos.addAll(baseSensorInfoDtos1);
+      }
 
       /*List<BaseSensorInfoDto> baseSensorInfoDtos =
           baseSensorInfoService.selectBaseSensorInfoList(new BaseSensorInfo());*/
@@ -303,6 +308,7 @@ public class IndexController {
       baseSensorTypeList.forEach(
           x -> {
             List<BaseSensorInfoDto> baseSensorInfoDtos = new ArrayList<>();
+            if(!ShiroUtils.getLoginName().equals("admin")){
               for (SysRole sysRole : sysRoles) {
                 //
                 BaseSensorInfo baseSensorInfo = new BaseSensorInfo();
@@ -312,6 +318,10 @@ public class IndexController {
                 List<BaseSensorInfoDto> baseSensorInfoDtos1 = baseSensorInfoService.selectBaseSensorInfoList(baseSensorInfo);
                 baseSensorInfoDtos.addAll(baseSensorInfoDtos1);
               }
+            }else{
+              List<BaseSensorInfoDto> baseSensorInfoDtos1 = baseSensorInfoService.selectBaseSensorInfoList(new BaseSensorInfo(x.getSensortypeId(),0L));
+              baseSensorInfoDtos.addAll(baseSensorInfoDtos1);
+            }
 
             data.add(
                     new ArrayList<String>() {
@@ -371,6 +381,8 @@ public class IndexController {
     SysUser sysUser = ShiroUtils.getSysUser();
 
     List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+
+    if(!ShiroUtils.getLoginName().equals("admin")){
       for (SysRole sysRole : sysRoles) {
         //
         BaseSensorInfo baseSensorInfo = new BaseSensorInfo();
@@ -385,6 +397,16 @@ public class IndexController {
                 baseMonitorunitInfoService.selectBaseMonitorunitInfoDtoList(baseMonitorunitInfo);
         baseMonitorunitInfoDtoList.addAll(baseMonitorunitInfoDtos);
       }
+    }else{
+
+      List<BaseSensorInfoDto> baseSensorInfoDtos1 = baseSensorInfoService.selectBaseSensorInfoList(new BaseSensorInfo(null,0L));
+      baseSensorInfoDtos.addAll(baseSensorInfoDtos1);
+
+      List<BaseMonitorunitInfoDto> baseMonitorunitInfoDtos =
+              baseMonitorunitInfoService.selectBaseMonitorunitInfoDtoList(new BaseMonitorunitInfo());
+      baseMonitorunitInfoDtoList.addAll(baseMonitorunitInfoDtos);
+    }
+
     List<Integer> result =
         new ArrayList<Integer>() {
           {