From a1d06a075aa87421939149a3e0f7b15a951535f2 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期日, 27 四月 2025 17:50:27 +0800
Subject: [PATCH] 清理旧数据 ind
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 c6dbdb2..52defdf 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
@@ -263,7 +263,7 @@
if (StringUtils.isBlank(dto.getQueryType())) {
return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST, "queryType不能为空");
}
-
+ log.info("id={}", dto.getId());
PowerGenStatusEntity powerGenStatus = powerGenStatusDaoService.getById(dto.getId());
if (powerGenStatus == null) {
log.info("未找到code对应的数据: {}", dto.getId());
@@ -271,20 +271,22 @@
}
String queryType = dto.getQueryType().toUpperCase();
+ log.info("queryType={}", queryType);
String pointNo;
switch (queryType.toUpperCase()) {
- case "D":
+ case "P":
pointNo = powerGenStatus.getCurP();
break;
- case "P":
+ case "Q":
pointNo = powerGenStatus.getCurQ();
break;
case "COS":
- pointNo = powerGenStatus.getCurCOS();
+ pointNo = powerGenStatus.getCurCos();
break;
default:
throw new IllegalArgumentException("不支持的queryType: " + queryType);
}
+ log.info("开始查询，pointNo={}", pointNo);
// 默认查最近24小时
Date end = Optional.ofNullable(dto.getEndTime()).orElseGet(() -> {
@@ -334,6 +336,7 @@
@Operation(summary = "功率因数-电容器投退指示灯")
public CommonResult<List<PowerCapacitorDetDTO>> getPowerCapacitorDetList(@RequestParam Map<String, Object> params) {
List<PowerCapacitorDetEntity> list = powerCapacitorDetService.list(params);
+ log.info("list.size=" + list.size());
List<String> points = list.stream().map(item -> {
return item.getPointNo();
}).collect(Collectors.toList());
@@ -345,6 +348,7 @@
List<PowerCapacitorDetDTO> result = new ArrayList<>();
for (PowerCapacitorDetEntity entity : list) {
PowerCapacitorDetDTO dto = ConvertUtils.sourceToTarget(entity, PowerCapacitorDetDTO.class);
+ result.add(dto);
dto.setStatus(0);
if (!pointsRealValue.containsKey(entity.getPointNo()) || pointsRealValue.get(entity.getPointNo()) == null) {
continue;
@@ -353,12 +357,11 @@
if (val.compareTo(BigDecimal.ZERO) >= 0.1) {
dto.setStatus(1);
}
- result.add(dto);
}
return success(result);
}
- @GetMapping("/capacitor-det/list")
+ @GetMapping("/capacitor-his/list")
@Operation(summary = "功率因数-电容器投退历史")
public CommonResult<List<PowerCapacitorHisDTO>> getPowerCapacitorHisList(@RequestParam Map<String, Object> params) {
List<PowerCapacitorHisEntity> list = powerCapacitorHisService.list(params);
--
Gitblit v1.9.3