From c77ae42d52bb1359fe0d067087796a0ea930e881 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期四, 19 六月 2025 18:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 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 7508701..92a10c4 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
@@ -714,6 +714,8 @@
if (maxdemandMainEntity != null) {
demandDTO.setMaxDemand(maxdemandMainEntity.getMaxDemand());
demandDTO.setOccurTime(maxdemandMainEntity.getOccurTime());
+ } else {
+ demandDTO.setMaxDemand(BigDecimal.ZERO);
}
}
result.add(demandDTO);
@@ -743,11 +745,20 @@
if (!CollectionUtils.isEmpty(list0)) {
list.addAll(list0);
}
+
+ // 所有关口进线的二级界面（表格/曲线）均增加（CCPP/135/CDQ/TRT/余热）的选项。
Map<String, Object> params1 = new HashMap<>();
params1.put("groupName", "COMMON1");
List<PowerNetDropdownEntity> list1 = powerNetDropdownService.list(params1);
if (!CollectionUtils.isEmpty(list1)) {
list.addAll(list1);
+ }
+
+ Map<String, Object> params2 = new HashMap<>();
+ params2.put("groupName", "COMMON2");
+ List<PowerNetDropdownEntity> list2 = powerNetDropdownService.list(params2);
+ if (!CollectionUtils.isEmpty(list2)) {
+ list.addAll(list2);
}
List<String> points = list.stream().map(item -> {
@@ -1204,19 +1215,34 @@
String[] pointNoArr = new String[2];
switch (queryType.toUpperCase()) {
case "P":
+ if (StringUtils.isBlank(powerNetFactorEntity.getCurP())) {
+ continue;
+ }
pointNo = powerNetFactorQuery.getCurP();
break;
case "Q":
+ if (StringUtils.isBlank(powerNetFactorEntity.getCurQ())) {
+ continue;
+ }
pointNo = powerNetFactorQuery.getCurQ();
break;
case "COS":
+ if (StringUtils.isBlank(powerNetFactorEntity.getCurCos())) {
+ continue;
+ }
pointNo = powerNetFactorQuery.getCurCos();
break;
case "DAYCOS":
+ if (StringUtils.isBlank(powerNetFactorEntity.getPDay()) || StringUtils.isBlank(powerNetFactorEntity.getQDay())) {
+ continue;
+ }
pointNoArr[0] = powerNetFactorEntity.getPDay();
pointNoArr[1] = powerNetFactorEntity.getQDay();
break;
case "MONTHCOS":
+ if (StringUtils.isBlank(powerNetFactorEntity.getPMon()) || StringUtils.isBlank(powerNetFactorEntity.getQMon())) {
+ continue;
+ }
pointNoArr[0] = powerNetFactorEntity.getPMon();
pointNoArr[1] = powerNetFactorEntity.getQMon();
break;
@@ -1329,19 +1355,34 @@
String[] pointNoArr = new String[2];
switch (queryType.toUpperCase()) {
case "P":
+ if (StringUtils.isBlank(powerNetFactorEntity.getCurP())) {
+ continue;
+ }
pointNo = powerNetFactorQuery.getCurP();
break;
case "Q":
+ if (StringUtils.isBlank(powerNetFactorEntity.getCurQ())) {
+ continue;
+ }
pointNo = powerNetFactorQuery.getCurQ();
break;
case "COS":
+ if (StringUtils.isBlank(powerNetFactorEntity.getCurCos())) {
+ continue;
+ }
pointNo = powerNetFactorQuery.getCurCos();
break;
case "DAYCOS":
+ if (StringUtils.isBlank(powerNetFactorEntity.getPDay()) || StringUtils.isBlank(powerNetFactorEntity.getQDay())) {
+ continue;
+ }
pointNoArr[0] = powerNetFactorEntity.getPDay();
pointNoArr[1] = powerNetFactorEntity.getQDay();
break;
case "MONTHCOS":
+ if (StringUtils.isBlank(powerNetFactorEntity.getPMon()) || StringUtils.isBlank(powerNetFactorEntity.getQMon())) {
+ continue;
+ }
pointNoArr[0] = powerNetFactorEntity.getPMon();
pointNoArr[1] = powerNetFactorEntity.getQMon();
break;
--
Gitblit v1.9.3