From 1e530831761d706b020e53c836ace35a2c90b88d Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 15 四月 2025 08:48:55 +0800
Subject: [PATCH] 功率因数-电网拓扑
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 945e04f..b7f7676 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
@@ -9,15 +9,18 @@
import com.iailab.module.ansteel.api.dto.PowerNetFactorDTO;
import com.iailab.module.ansteel.api.entity.*;
import com.iailab.module.ansteel.api.service.*;
+import com.iailab.module.data.api.point.DataPointApi;
import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -50,11 +53,37 @@
@Autowired
private PowerControlDetService powerControlDetService;
+ @Resource
+ private DataPointApi dataPointApi;
+
@GetMapping("/net-factor/list")
@Operation(summary = "功率因数-电网拓扑")
public CommonResult<List<PowerNetFactorDTO>> getPowerNetFactorList(@RequestParam Map<String, Object> params) {
List<PowerNetFactorEntity> list = powerNetFactorService.list(params);
- return success(ConvertUtils.sourceToTarget(list, PowerNetFactorDTO.class));
+ List<PowerNetFactorDTO> result = ConvertUtils.sourceToTarget(list, PowerNetFactorDTO.class);
+ if (CollectionUtils.isEmpty(result)) {
+ return success(result);
+ }
+ for(PowerNetFactorDTO dto : result) {
+ List<String> points = new ArrayList<>();
+ if (StringUtils.isNotBlank(dto.getCurP())) {
+ points.add(dto.getCurP());
+ }
+ if (StringUtils.isNotBlank(dto.getCurQ())) {
+ points.add(dto.getCurQ());
+ }
+ if (!CollectionUtils.isEmpty(points)) {
+ Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
+ if (pointsRealValue.get(dto.getCurP()) != null) {
+ dto.setCurP(pointsRealValue.get(dto.getCurP()).toString());
+ }
+ if (pointsRealValue.get(dto.getCurQ()) != null) {
+ dto.setCurQ(pointsRealValue.get(dto.getCurQ()).toString());
+ }
+ }
+ }
+
+ return success(result);
}
@GetMapping("/capacitor-status/list")
--
Gitblit v1.9.3