From 60e6dd183d9fc6da1d10e895dcc40d396788d64f Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 22 四月 2025 08:58:24 +0800
Subject: [PATCH] 调整后的功率因与无功倒送量
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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 765873e..d71a866 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
@@ -60,6 +60,9 @@
@Autowired
private PowerDemandService powerDemandService;
+ @Autowired
+ private PowerAdjustedFactorService powerAdjustedFactorService;
+
@Resource
private DataPointApi dataPointApi;
@@ -446,8 +449,8 @@
return success(result);
}
- private double getMax(List<List<Object>> dataList) {
- double result = 0;
+ private double getMin(List<List<Object>> dataList) {
+ double result = Double.parseDouble(dataList.get(0).get(1).toString());
for (int i = 0; i < dataList.size() - 1; i++) {
if (result > Double.parseDouble(dataList.get(i).get(1).toString())) {
result = Double.parseDouble(dataList.get(i).get(1).toString());
@@ -456,7 +459,7 @@
return result;
}
- private double getMin(List<List<Object>> dataList) {
+ private double getMax(List<List<Object>> dataList) {
double result = 0;
for (int i = 0; i < dataList.size() - 1; i++) {
if (result < Double.parseDouble(dataList.get(i).get(1).toString())) {
@@ -465,4 +468,25 @@
}
return result;
}
+
+ @GetMapping("/adjust-factor")
+ @Operation(summary = "负荷移植-调整后的功率因数与无功倒送量")
+ public CommonResult<Map<String, Double>> getPowerAdjustFactor(@RequestParam Map<String, Object> params) {
+ List<PowerAdjustedFactorEntity> list = powerAdjustedFactorService.list(params);
+ List<PowerAdjustedFactorDTO> dtoList = ConvertUtils.sourceToTarget(list, PowerAdjustedFactorDTO.class);
+ Map<String, Double> result = new HashMap<>();
+ if (CollectionUtils.isEmpty(list)) {
+ return success(result);
+ }
+ List<String> points = new ArrayList<>();
+ Map<String, Object> dataMap = new HashMap<>();
+ for (PowerAdjustedFactorDTO dto : dtoList) {
+ points.add(dto.getPointNo());
+ }
+ dataMap = dataPointApi.queryPointsRealValue(points);
+ for (PowerAdjustedFactorDTO powerAdjustedFactorDTO : dtoList) {
+ result.put(powerAdjustedFactorDTO.getName(), Double.parseDouble(dataMap.get(powerAdjustedFactorDTO.getPointNo()).toString()));
+ }
+ return success(result);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3