From 1d9abe2a92a8c2bdf7d4534ad1aa20ad615b33ca Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 12 五月 2025 11:44:33 +0800
Subject: [PATCH] 负荷移植-最大需量发生记录分页
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
index 973926e..116fa6d 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
@@ -472,14 +472,14 @@
}
@GetMapping("/control-main/list")
- @Operation(summary = "功率因数-管控变电站列表")
+ @Operation(summary = "功率因数-管控变电站列表(已废弃)")
public CommonResult<List<PowerControlMainDTO>> getPowerControlMainList(@RequestParam Map<String, Object> params) {
List<PowerControlMainEntity> list = powerControlMainService.list(params);
return success(ConvertUtils.sourceToTarget(list, PowerControlMainDTO.class));
}
@PostMapping("/control-main/update")
- @Operation(summary = "功率因数-管控变电站修改上下限")
+ @Operation(summary = "功率因数-管控变电站修改上下限(已废弃)")
public CommonResult<Boolean> updatePowerControlMain(@RequestBody PowerControlMainDTO dto) {
if (StringUtils.isBlank(dto.getId())) {
return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST);
@@ -493,7 +493,7 @@
}
@GetMapping("/control-det/list")
- @Operation(summary = "功率因数-管控功率因数详情")
+ @Operation(summary = "功率因数-管控功率因数详情(已废弃)")
public CommonResult<List<PowerControlDetDTO>> getPowerControlDetList(@RequestParam Map<String, Object> params) {
List<PowerControlDetDTO> result = new ArrayList<>();
String name = (String) params.get("name");
@@ -508,18 +508,13 @@
result = ConvertUtils.sourceToTarget(list, PowerControlDetDTO.class);
result.forEach(item -> {
- // 设置随机数据，0.8左右
- Random rand = new Random();
- int min = 700;
- int max = 900;
- int randomNumber = rand.nextInt(max - min + 1) + min;
- BigDecimal rv = new BigDecimal(randomNumber * 0.001).setScale(4, BigDecimal.ROUND_HALF_UP);
+ /*BigDecimal rv = new BigDecimal(randomNumber * 0.001).setScale(4, BigDecimal.ROUND_HALF_UP);
item.setValue(rv);
if (item.getLimitL() != null && rv.compareTo(item.getLimitL()) < 0) {
item.setStatus(1);
} else {
item.setStatus(0);
- }
+ }*/
});
return success(result);
}
@@ -1109,20 +1104,28 @@
return success(result);
}
- @GetMapping("/power-maxDemand/page")
- @Operation(summary = "负荷移植-最大需量折叠分页列表")
+ @GetMapping("/power-maxdemand/page")
+ @Operation(summary = "负荷移植-最大需量发生记录分页")
public CommonResult<PageResult<PowerMaxDemandMainDTO>> getPowerMaxDemandMainPage(@Validated PowerMaxDemandMainPageReqVO reqVO) {
- PageResult<PowerMaxDemandMainDTO> page = powerMaxDemandMainService.page(reqVO);
- List<String> parentIds = page.getList()
+ PageResult<PowerMaxdemandMainEntity> page = powerMaxDemandMainService.page(reqVO);
+ PageResult<PowerMaxDemandMainDTO> result = BeanUtils.toBean(page, PowerMaxDemandMainDTO.class);
+ /*List<String> parentIds = result.getList()
.stream()
.map(PowerMaxDemandMainDTO::getId)
.collect(Collectors.toList());
List<PowerMaxdemandDetEntity> children = powerMaxdemandDetService.selectListByRelIds(parentIds);
Map<String, List<PowerMaxdemandDetEntity>> childrenMap = children.stream()
- .collect(Collectors.groupingBy(PowerMaxdemandDetEntity::getRelId));
- page.getList().forEach(
- dto -> dto.setChildren(childrenMap.getOrDefault(dto.getId(), Collections.emptyList()))
- );
- return success(BeanUtils.toBean(page, PowerMaxDemandMainDTO.class));
+ .collect(Collectors.groupingBy(PowerMaxdemandDetEntity::getRelId));*/
+ result.getList().forEach(dto0 -> {
+ List<PowerMaxdemandDetEntity> detList0 = powerMaxdemandDetService.selectListByRelId(dto0.getId(), dto0.getOccurTime());
+ dto0.setChildren(ConvertUtils.sourceToTarget(detList0, PowerMaxdemandDetDTO.class));
+ if (CollectionUtils.isEmpty(dto0.getChildren())) {
+ dto0.getChildren().forEach(dto1 -> {
+ List<PowerMaxdemandDetEntity> detList1 = powerMaxdemandDetService.selectListByRelId(dto1.getId(), dto1.getOccurTime());
+ dto1.setChildren(ConvertUtils.sourceToTarget(detList1, PowerMaxdemandDetDTO.class));
+ });
+ }
+ });
+ return success(result);
}
}
\ No newline at end of file
--
Gitblit v1.9.3