From a01eec9f761ffcc11d42da0a82595e720427dd68 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 24 六月 2025 23:15:52 +0800
Subject: [PATCH] 望铁关口触发边界
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 56 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 35 insertions(+), 21 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 5e147ac..5211007 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
@@ -747,20 +747,18 @@
}
// 所有关口进线的二级界面（表格/曲线）均增加（CCPP/135/CDQ/TRT/余热）的选项。
- if(entity.getSort() <= 14) {
- 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> 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);
- }
+ 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 -> {
@@ -1217,19 +1215,36 @@
String[] pointNoArr = new String[2];
switch (queryType.toUpperCase()) {
case "P":
+ if (StringUtils.isBlank(powerNetFactorQuery.getCurP())) {
+ continue;
+ }
pointNo = powerNetFactorQuery.getCurP();
break;
case "Q":
+ if (StringUtils.isBlank(powerNetFactorQuery.getCurQ())) {
+ continue;
+ }
pointNo = powerNetFactorQuery.getCurQ();
break;
case "COS":
+ if (StringUtils.isBlank(powerNetFactorQuery.getCurCos())) {
+ continue;
+ }
pointNo = powerNetFactorQuery.getCurCos();
break;
case "DAYCOS":
+ if (powerNetFactorEntity == null ||
+ StringUtils.isBlank(powerNetFactorEntity.getPDay()) || StringUtils.isBlank(powerNetFactorEntity.getQDay())) {
+ continue;
+ }
pointNoArr[0] = powerNetFactorEntity.getPDay();
pointNoArr[1] = powerNetFactorEntity.getQDay();
break;
case "MONTHCOS":
+ if (powerNetFactorEntity == null ||
+ StringUtils.isBlank(powerNetFactorEntity.getPMon()) || StringUtils.isBlank(powerNetFactorEntity.getQMon())) {
+ continue;
+ }
pointNoArr[0] = powerNetFactorEntity.getPMon();
pointNoArr[1] = powerNetFactorEntity.getQMon();
break;
@@ -1342,32 +1357,34 @@
String[] pointNoArr = new String[2];
switch (queryType.toUpperCase()) {
case "P":
- if (StringUtils.isBlank(powerNetFactorEntity.getCurP())) {
+ if (StringUtils.isBlank(powerNetFactorQuery.getCurP())) {
continue;
}
pointNo = powerNetFactorQuery.getCurP();
break;
case "Q":
- if (StringUtils.isBlank(powerNetFactorEntity.getCurQ())) {
+ if (StringUtils.isBlank(powerNetFactorQuery.getCurQ())) {
continue;
}
pointNo = powerNetFactorQuery.getCurQ();
break;
case "COS":
- if (StringUtils.isBlank(powerNetFactorEntity.getCurCos())) {
+ if (StringUtils.isBlank(powerNetFactorQuery.getCurCos())) {
continue;
}
pointNo = powerNetFactorQuery.getCurCos();
break;
case "DAYCOS":
- if (StringUtils.isBlank(powerNetFactorEntity.getPDay()) || StringUtils.isBlank(powerNetFactorEntity.getPDay())) {
+ if (powerNetFactorEntity == null ||
+ 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())) {
+ if (powerNetFactorEntity == null ||
+ StringUtils.isBlank(powerNetFactorEntity.getPMon()) || StringUtils.isBlank(powerNetFactorEntity.getQMon())) {
continue;
}
pointNoArr[0] = powerNetFactorEntity.getPMon();
@@ -1824,9 +1841,6 @@
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MINUTE, 0);
- if (!CollectionUtils.isEmpty(powerFactorReqVO.getContentList())) {
-
- }
MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
dto.setScheduleTime(calendar.getTime());
dto.setScheduleCode("AnsteelOffPowerAC");
--
Gitblit v1.9.3