尖峰谷平配置

modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonEnergyPriceServiceImpl.java

@@ -242,12 +242,13 @@ public class CarbonEnergyPriceServiceImpl extends BaseServiceImpl<CarbonEnergyPr
         Map<String, Object> params = new HashMap<>();
         UserDetail userDetail = SecurityUser.getUser();
         Long tenantCode = TenantContext.getTenantCode(userDetail);
-        List<Long> tenantCodeList;
+        List<Long> tenantCodeList = new ArrayList<>();
         List<Long> resultTenantCodeList = new ArrayList<>();
 
+        boolean flag = true;
         if (!Objects.equals(userDetail.getSuperAdmin(), SuperAdminEnum.YES.value())
                 || !Objects.equals(tenantCode, userDetail.getTenantCode())) {
-            tenantCodeList = sysTenantGroupService.getChildren(tenantCode);
+            flag = false;
             tenantCodeList.add(tenantCode);
             tenantCodeList.add(1001L);
             QueryWrapper wrapper = new QueryWrapper();
@@ -264,9 +265,20 @@ public class CarbonEnergyPriceServiceImpl extends BaseServiceImpl<CarbonEnergyPr
             resultTenantCodeList.add(-1L);
         }
         params.put("tenantCodeList", resultTenantCodeList);
-        return sysTenantDao.queryList(params).parallelStream()
-                .sorted(Comparator.comparingLong(SysTenantDTO::getTenantCode))
-                .collect(Collectors.toList());
+
+        List<SysTenantDTO> tenantDTOS = sysTenantDao.queryList(params).parallelStream().sorted(Comparator.comparingLong(SysTenantDTO::getTenantCode)).collect(Collectors.toList());
+        if(!flag){
+            tenantDTOS.forEach(temp->{
+                if(Objects.equals(temp.getTenantCode(), 1001L)){
+                    temp.setIsOperate(false);
+                    temp.setTenantName("系统默认");
+                }else {
+                    temp.setIsOperate(true);
+
+                }
+            });
+        }
+        return tenantDTOS;
     }
 
     @Override

modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonPeakConfigServiceImpl.java

@@ -106,15 +106,15 @@ public class CarbonPeakConfigServiceImpl extends BaseServiceImpl<CarbonPeakConfi
 
     @Override
     public List<SysTenantDTO> tenantList() {
+        boolean flag = true;
         Map<String,Object> params = new HashMap<>();
         UserDetail userDetail = SecurityUser.getUser();
         Long tenantCode = TenantContext.getTenantCode(userDetail);
-        List<Long> tenantCodeList;
+        List<Long> tenantCodeList = new ArrayList<>();
         List<Long> resultTenantCodeList= new ArrayList<>();
-
         if(!Objects.equals(userDetail.getSuperAdmin(), SuperAdminEnum.YES.value())
                 || !Objects.equals(tenantCode, userDetail.getTenantCode())) {
-            tenantCodeList=sysTenantGroupService.getChildren(tenantCode);
+            flag = false;
             tenantCodeList.add(tenantCode);
             tenantCodeList.add(1001L);
             QueryWrapper wrapper = new QueryWrapper();
@@ -131,7 +131,21 @@ public class CarbonPeakConfigServiceImpl extends BaseServiceImpl<CarbonPeakConfi
             resultTenantCodeList.add(-1L);
         }
         params.put("tenantCodeList",resultTenantCodeList);
-        return sysTenantDao.queryList(params).parallelStream().sorted(Comparator.comparingLong(SysTenantDTO::getTenantCode)).collect(Collectors.toList());
+
+        List<SysTenantDTO> tenantDTOS = sysTenantDao.queryList(params).parallelStream().sorted(Comparator.comparingLong(SysTenantDTO::getTenantCode)).collect(Collectors.toList());
+        if(!flag){
+            tenantDTOS.forEach(temp->{
+                if(Objects.equals(temp.getTenantCode(), 1001L)){
+                    temp.setIsOperate(false);
+                    temp.setTenantName("系统默认");
+                }else {
+                    temp.setIsOperate(true);
+
+                }
+            });
+        }
+
+        return tenantDTOS;
     }
 
     @Override

modules/thing/src/main/java/com/thing/sys/tenant/dto/SysTenantDTO.java

@@ -114,4 +114,7 @@ public class SysTenantDTO implements Serializable {
 
     @Schema(description = "企业物数量")
     private Integer enterpriseThings;
+
+    @Schema(description = "峰平谷尖/价格配置使用，是否可操作数据节点")
+    private Boolean isOperate;
 }

modules/visual-design/src/main/java/com/thing/visual/board/controller/IotVisualManageController.java

@@ -54,7 +54,7 @@ public class IotVisualManageController {
             @Parameter(name ="name",description ="看板名称"),
             @Parameter(name ="type",description ="看板类型")
     })
-    public Result<PageData<IotVisualManageDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<IotVisualManageDTO>> page(@RequestParam Map<String, Object> params){ 
         PageData<IotVisualManageDTO> page = iotVisualManageService.pageIotBoardManageDTO(params);
 
         return new Result<PageData<IotVisualManageDTO>>().ok(page);