From 96363546fc3e108c9f8e05eae6b03522356e2788 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 19 六月 2025 18:51:20 +0800
Subject: [PATCH] 多code
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 92a10c4..1215dfa 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
@@ -1215,32 +1215,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.getQDay())) {
+ 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();
@@ -1355,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.getQDay())) {
+ 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();
--
Gitblit v1.9.3