diff --git a/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonEnergyPriceServiceImpl.java b/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonEnergyPriceServiceImpl.java index 3e184d6..a55c087 100644 --- a/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonEnergyPriceServiceImpl.java +++ b/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonEnergyPriceServiceImpl.java @@ -242,12 +242,13 @@ public class CarbonEnergyPriceServiceImpl extends BaseServiceImpl params = new HashMap<>(); UserDetail userDetail = SecurityUser.getUser(); Long tenantCode = TenantContext.getTenantCode(userDetail); - List tenantCodeList; + List tenantCodeList = new ArrayList<>(); List 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 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 diff --git a/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonPeakConfigServiceImpl.java b/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonPeakConfigServiceImpl.java index b8451b5..ea16cbe 100644 --- a/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonPeakConfigServiceImpl.java +++ b/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonPeakConfigServiceImpl.java @@ -106,15 +106,15 @@ public class CarbonPeakConfigServiceImpl extends BaseServiceImpl tenantList() { + boolean flag = true; Map params = new HashMap<>(); UserDetail userDetail = SecurityUser.getUser(); Long tenantCode = TenantContext.getTenantCode(userDetail); - List tenantCodeList; + List tenantCodeList = new ArrayList<>(); List 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 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 diff --git a/modules/thing/src/main/java/com/thing/sys/tenant/dto/SysTenantDTO.java b/modules/thing/src/main/java/com/thing/sys/tenant/dto/SysTenantDTO.java index 26a7ef7..0a58ff8 100644 --- a/modules/thing/src/main/java/com/thing/sys/tenant/dto/SysTenantDTO.java +++ b/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; } \ No newline at end of file diff --git a/modules/visual-design/src/main/java/com/thing/visual/board/controller/IotVisualManageController.java b/modules/visual-design/src/main/java/com/thing/visual/board/controller/IotVisualManageController.java index 0f93f58..9a6dc49 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/board/controller/IotVisualManageController.java +++ b/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> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params){ PageData page = iotVisualManageService.pageIotBoardManageDTO(params); return new Result>().ok(page);