From 3e084edee1164f1cea66b4dc37f9ea6851ccb543 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 21 四月 2025 13:51:16 +0800
Subject: [PATCH] 功率因数-根据nodeName获取最近1440min历史数据，包含月最大，最小值
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 95 +++++++++++++++++++++++++++++++
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerHistoryDTO.java | 29 +++++++++
2 files changed, 122 insertions(+), 2 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 d7cb177..14b453d 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.iailab.framework.common.exception.enums.GlobalErrorCodeConstants;
import com.iailab.framework.common.pojo.CommonResult;
+import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.ansteel.api.dto.*;
import com.iailab.module.ansteel.power.entity.*;
@@ -11,6 +12,7 @@
import com.iailab.module.data.api.point.DataPointApi;
import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
+import com.iailab.module.data.api.point.dto.ApiPointsValueQueryDTO;
import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.PredictLastValueReqVO;
import io.swagger.v3.oas.annotations.Operation;
@@ -22,6 +24,8 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -296,6 +300,7 @@
});
return success(result);
}
+
@GetMapping("/demand/list")
@Operation(summary = "负荷移植-月最大需量，实测需量，有功功率")
public CommonResult<List<PowerDemandDTO>> getPowerDemandList(@RequestParam Map<String, Object> params) {
@@ -342,8 +347,8 @@
List<ApiPointValueDTO> monthValues = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
double max = 0;
- for (int i = 0; i < monthValues.size()-1; i++) {
- if(max < monthValues.get(i).getV()){
+ for (int i = 0; i < monthValues.size() - 1; i++) {
+ if (max < monthValues.get(i).getV()) {
max = monthValues.get(i).getV();
}
}
@@ -355,4 +360,90 @@
return success(result);
}
+
+ @GetMapping("/power/historyData")
+ @Operation(summary = "功率因数-根据nodeName获取最近1440min历史数据，月最大，最小值")
+ public CommonResult<PowerHistoryDTO> getPowerHistoryData(@RequestParam Map<String, Object> params) {
+
+ PowerNetFactorEntity powerNetFactor = powerNetFactorService.list(params).get(0);
+ PowerHistoryDTO result = new PowerHistoryDTO();
+ if (powerNetFactor == null) {
+ return success(result);
+ }
+
+ ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
+ String pointNo = "";
+ Date start = null;
+ Date end = null;
+
+ switch (params.get("queryType").toString()) {
+ case "p":
+ pointNo = powerNetFactor.getCurP();
+
+ case "q":
+ pointNo = powerNetFactor.getCurQ();
+
+ case "cos":
+ pointNo = powerNetFactor.getCurCos();
+ }
+
+ apiPointValueQueryDTO.setPointNo(pointNo);
+ SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ if (params.get("startTime") != null) {
+ try {
+ start = ft.parse(params.get("startTime").toString());
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ start = new Date(System.currentTimeMillis() - 1440L * 60 * 1000);
+ }
+ apiPointValueQueryDTO.setStart(start);
+ if (params.get("endTime") != null) {
+ try {
+ end = ft.parse(params.get("endTime").toString());
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ end = new Date();
+ }
+ apiPointValueQueryDTO.setEnd(end);
+ List<ApiPointValueDTO> chartData = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
+ List<List<Object>> dataList = new ArrayList<>();
+ for (ApiPointValueDTO dto : chartData) {
+ List<Object> data = new ArrayList<>();
+ String time = ft.format(dto.getT());
+ double value = dto.getV();
+ data.add(time);
+ data.add(value);
+ dataList.add(data);
+ }
+ List<String> categories = DateUtils.getTimeScale(start, end, 5);
+ result.setCategories(categories);
+ result.setDataList(dataList);
+ result.setMax(getMax(dataList));
+ result.setMin(getMin(dataList));
+ return success(result);
+ }
+
+ 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())) {
+ result = Double.parseDouble(dataList.get(i).get(1).toString());
+ }
+ }
+ return result;
+ }
+
+ private double getMin(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())) {
+ result = Double.parseDouble(dataList.get(i).get(1).toString());
+ }
+ }
+ return result;
+ }
}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerHistoryDTO.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerHistoryDTO.java
new file mode 100644
index 0000000..896c5e9
--- /dev/null
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerHistoryDTO.java
@@ -0,0 +1,29 @@
+package com.iailab.module.ansteel.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author dyk
+ * @date 2025年04月21日
+ */
+@Data
+public class PowerHistoryDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "x轴")
+ private List<String> categories;
+
+ @Schema(description = "图表数据")
+ private List<List<Object>> dataList;
+
+ @Schema(description = "最大值")
+ private double max;
+
+ @Schema(description = "最小值")
+ private double min;
+
+}
\ No newline at end of file
--
Gitblit v1.9.3