From 58deca20c8968167cef74efb0613cf7194f88536 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 21 四月 2025 09:02:40 +0800
Subject: [PATCH] 焦化概况
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 110 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 91 insertions(+), 19 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 7e9bf92..d7cb177 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
@@ -1,5 +1,7 @@
package com.iailab.module.ansteel.api.controller.admin;
+import cn.hutool.core.util.NumberUtil;
+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.object.ConvertUtils;
@@ -7,6 +9,8 @@
import com.iailab.module.ansteel.power.entity.*;
import com.iailab.module.ansteel.power.service.*;
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.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.PredictLastValueReqVO;
import io.swagger.v3.oas.annotations.Operation;
@@ -49,6 +53,9 @@
@Autowired
private PowerGenStatusDaoService powerGenStatusDaoService;
+ @Autowired
+ private PowerDemandService powerDemandService;
+
@Resource
private DataPointApi dataPointApi;
@@ -70,6 +77,7 @@
calendar.set(Calendar.HOUR_OF_DAY, 0);
for (PowerNetFactorDTO dto : result) {
+ boolean cosFlag = false;
try {
List<String> points = new ArrayList<>();
if (StringUtils.isNotBlank(dto.getCurP())) {
@@ -82,27 +90,17 @@
Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
if (pointsRealValue.get(dto.getCurP()) != null) {
dto.setCurP(pointsRealValue.get(dto.getCurP()).toString());
- } else {
- dto.setCurP("");
}
if (pointsRealValue.get(dto.getCurQ()) != null) {
dto.setCurQ(pointsRealValue.get(dto.getCurQ()).toString());
- } else {
- dto.setCurQ("");
}
if (pointsRealValue.get(dto.getCurCos()) != null) {
dto.setCurCos(pointsRealValue.get(dto.getCurCos()).toString());
- } else {
- dto.setCurCos("");
+ cosFlag = true;
}
- } else {
- dto.setCurP("");
- dto.setCurQ("");
- dto.setCurCos("");
}
- } catch (Exception e) {
- log.info(dto.getNodeName() + "获取当前值异常");
- e.printStackTrace();
+ } catch (Exception ex) {
+ log.info(dto.getNodeName() + "获取当前值异常" + ex.getMessage());
}
try {
@@ -120,6 +118,7 @@
}
if (!CollectionUtils.isEmpty(itemNos)) {
reqVO.setItemNos(itemNos);
+ log.info("reqVO=" + JSONObject.toJSONString(reqVO));
Map<String, BigDecimal> preValues = mcsApi.getPredictValueByTime(reqVO);
if (StringUtils.isNotBlank(dto.getPreP()) && preValues.get(dto.getPreP()) != null) {
dto.setPreP(preValues.get(dto.getPreP()).toString());
@@ -130,16 +129,30 @@
if (StringUtils.isNotBlank(dto.getPreCos()) && preValues.get(dto.getPreCos()) != null) {
dto.setPreCos(preValues.get(dto.getPreCos()).toString());
}
- } else {
- dto.setPreP("");
- dto.setPreQ("");
- dto.setPreCos("");
}
} catch (Exception ex) {
- log.info(dto.getNodeName() + "获取预测值异常");
- ex.printStackTrace();
+ log.info(dto.getNodeName() + "获取预测值异常," + ex.getMessage());
+ }
+
+ // 设置状态
+ if (cosFlag && StringUtils.isNotBlank(dto.getCurCos()) && NumberUtil.isNumber(dto.getCurCos())) {
+ BigDecimal curCos = new BigDecimal(dto.getCurCos());
+ if (dto.getLimitL() != null && dto.getLimitH() != null &&
+ curCos.compareTo(dto.getLimitL()) < 0 || curCos.compareTo(dto.getLimitH()) > 0) {
+ dto.setStatus(1);
+ } else {
+ dto.setStatus(0);
+ }
}
}
+ return success(result);
+ }
+
+ @GetMapping("/net-factor-dropdown/list")
+ @Operation(summary = "功率因数-电网拓扑下拉列表")
+ public CommonResult<List<PowerNetFactorDropdownDTO>> getPowerNetFactorDropdownList(@RequestParam String nodeName) {
+ List<PowerNetFactorEntity> list = powerNetFactorService.listDropdown(nodeName);
+ List<PowerNetFactorDropdownDTO> result = ConvertUtils.sourceToTarget(list, PowerNetFactorDropdownDTO.class);
return success(result);
}
@@ -283,4 +296,63 @@
});
return success(result);
}
+ @GetMapping("/demand/list")
+ @Operation(summary = "负荷移植-月最大需量，实测需量，有功功率")
+ public CommonResult<List<PowerDemandDTO>> getPowerDemandList(@RequestParam Map<String, Object> params) {
+ List<PowerDemandEntity> list = powerDemandService.list(params);
+ List<PowerDemandDTO> result = ConvertUtils.sourceToTarget(list, PowerDemandDTO.class);
+ if (CollectionUtils.isEmpty(result)) {
+ return success(result);
+ }
+ for (PowerDemandDTO dto : result) {
+ List<String> points = new ArrayList<>();
+ if (StringUtils.isNotBlank(dto.getCurDemand())) {
+ points.add(dto.getCurDemand());
+ }
+ if (StringUtils.isNotBlank(dto.getActivePower())) {
+ points.add(dto.getActivePower());
+ }
+
+ if (!CollectionUtils.isEmpty(points)) {
+
+ Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
+
+ if (pointsRealValue.get(dto.getCurDemand()) != null) {
+ dto.setCurDemand(pointsRealValue.get(dto.getCurDemand()).toString());
+ }
+ if (pointsRealValue.get(dto.getActivePower()) != null) {
+ dto.setActivePower(pointsRealValue.get(dto.getActivePower()).toString());
+ }
+ }
+
+ if (!StringUtils.isEmpty(dto.getMaxDemand())) {
+ 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);
+ Date start = calendar.getTime();
+ calendar.add(Calendar.MONTH, 1);
+ Date end = calendar.getTime();
+ ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
+ apiPointValueQueryDTO.setStart(start);
+ apiPointValueQueryDTO.setEnd(end);
+ 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()){
+ max = monthValues.get(i).getV();
+ }
+ }
+ dto.setMaxDemand(String.valueOf(max));
+ }
+
+
+ }
+
+ return success(result);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3