From 77b06515edaa46cbbb0e55fe5f37db09aa8991fd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 22 四月 2025 16:06:40 +0800
Subject: [PATCH] 调整后的功率因数与无功倒送量
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 143 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 138 insertions(+), 5 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..4c97a10 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,7 +24,10 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -55,6 +60,9 @@
@Autowired
private PowerDemandService powerDemandService;
+
+ @Autowired
+ private PowerAdjustedFactorService powerAdjustedFactorService;
@Resource
private DataPointApi dataPointApi;
@@ -296,6 +304,7 @@
});
return success(result);
}
+
@GetMapping("/demand/list")
@Operation(summary = "负荷移植-月最大需量，实测需量，有功功率")
public CommonResult<List<PowerDemandDTO>> getPowerDemandList(@RequestParam Map<String, Object> params) {
@@ -333,17 +342,15 @@
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
- calendar.add(Calendar.MONTH, 1);
- Date end = calendar.getTime();
ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
apiPointValueQueryDTO.setStart(start);
- apiPointValueQueryDTO.setEnd(end);
+ apiPointValueQueryDTO.setEnd(new Date());
apiPointValueQueryDTO.setPointNo(dto.getMaxDemand());
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 +362,130 @@
return success(result);
}
+
+ @PostMapping("/net-factor/history")
+ @Operation(summary = "功率因数-根据nodeName获取最近1440min历史数据，月最大，最小值")
+ public CommonResult<PowerHistoryDTO> getPowerHistoryData(@RequestBody PowerNetFactorHisReqDTO dto) {
+ log.info("PowerNetFactorHisReqDTO=" + JSONObject.toJSONString(dto));
+ String nodeCode = dto.getNodeCode();
+ if (StringUtils.isBlank(nodeCode)) {
+ return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST);
+ }
+ String queryType = dto.getQueryType();
+ if (StringUtils.isBlank(queryType)) {
+ return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST);
+ }
+ PowerNetFactorEntity powerNetFactor = powerNetFactorService.getByNodeCode(nodeCode);
+ PowerHistoryDTO result = new PowerHistoryDTO();
+ if (powerNetFactor == null) {
+ log.info("powerNetFactor is null");
+ return success(result);
+ }
+ log.info("开始查询，");
+
+ ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
+ String pointNo = "";
+ switch (queryType.toUpperCase()) {
+ case "P":
+ pointNo = powerNetFactor.getCurP();
+ break;
+ case "Q":
+ pointNo = powerNetFactor.getCurQ();
+ break;
+ case "COS":
+ pointNo = powerNetFactor.getCurCos();
+ break;
+ default:
+ break;
+ }
+ //查询图表
+ apiPointValueQueryDTO.setPointNo(pointNo);
+ Calendar calendar0 = Calendar.getInstance();
+ calendar0.set(Calendar.MILLISECOND, 0);
+ calendar0.set(Calendar.SECOND, 0);
+ Date end = dto.getEndTime() == null ? calendar0.getTime() : dto.getEndTime();
+ calendar0.add(Calendar.MINUTE, -1440);
+ Date start = dto.getStartTime() == null ? calendar0.getTime() : dto.getStartTime();
+ apiPointValueQueryDTO.setEnd(end);
+ apiPointValueQueryDTO.setStart(start);
+ List<ApiPointValueDTO> chartData = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
+ List<Object[]> dataList = new ArrayList<>();
+ for (ApiPointValueDTO pv : chartData) {
+ Object[] data = new Object[2];
+ data[0] = DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ data[1] = pv.getV();
+ dataList.add(data);
+ }
+ List<String> categories = DateUtils.getTimeScale(start, end, 60);
+ result.setCategories(categories);
+ result.setDataList(dataList);
+
+ //查询月最大最小值
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ calendar.set(Calendar.MILLISECOND, 0);
+ start = calendar.getTime();
+ apiPointValueQueryDTO.setStart(start);
+ apiPointValueQueryDTO.setEnd(new Date());
+ List<ApiPointValueDTO> monthChartData = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
+ List<Double> monthValues = new ArrayList<>();
+ if (CollectionUtils.isEmpty(monthChartData)) {
+ monthValues = monthChartData.stream().map(item -> {
+ return item.getV();
+ }).collect(Collectors.toList());
+
+ result.setMax(monthValues.stream().max(Double::compareTo).get());
+ result.setMin(monthValues.stream().min(Double::compareTo).get());
+ }
+ return success(result);
+ }
+
+ 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());
+ }
+ }
+ return 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;
+ }
+
+ @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) {
+ if (StringUtils.isNotBlank(dto.getPointNo())) {
+ points.add(dto.getPointNo());
+ }
+ }
+ if (!CollectionUtils.isEmpty(points)) {
+ dataMap = dataPointApi.queryPointsRealValue(points);
+ }
+ for (PowerAdjustedFactorDTO powerAdjustedFactorDTO : dtoList) {
+ Double value = dataMap.get(powerAdjustedFactorDTO.getPointNo()) == null ? 0 : Double.parseDouble(dataMap.get(powerAdjustedFactorDTO.getPointNo()).toString());
+ result.put(powerAdjustedFactorDTO.getName(), value);
+ }
+ return success(result);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3