From 32d81c4489b3fb27aeae1a16af0c400d0d215991 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 22 五月 2025 19:54:59 +0800
Subject: [PATCH] 管路&气柜产能负载决动态row聚合时数据过滤问题
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
index 99c75aa..eb9f304 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
@@ -1458,26 +1458,15 @@
// 閬嶅巻鍘熷鏁版嵁锛屾寜澶氱淮搴﹀垎缁勮繘琛岃仛鍚�
for (Map<String, Object> data : rawData) {
- // 杩囨护宸ュ簭鍚嶇О涓虹┖鐨勬暟鎹�
- String processName = getStringValue(data, "processName");
- if (processName == null || processName.trim().isEmpty()) {
- log.warn("璺宠繃澶勭悊锛氬伐搴忓悕绉颁负绌�");
- continue;
- }
-
- // 杩囨护杞﹂棿涓虹┖鐨勬暟鎹�
- String workshop = getStringValue(data, "workshop");
- if (workshop == null || workshop.trim().isEmpty()) {
- log.warn("璺宠繃澶勭悊锛氳溅闂翠负绌猴紝宸ュ簭鍚嶇О={}", processName);
- continue;
- }
-
// 鑾峰彇琛屽垎缁勫瓧娈靛��
String rowGroupValue = getStringValue(data, rowGroupBy);
- if (rowGroupValue == null) {
- log.warn("璺宠繃澶勭悊锛歿} 瀛楁鍊间负null", rowGroupBy);
+ if (rowGroupValue == null || rowGroupValue.trim().isEmpty()) {
+ log.warn("璺宠繃澶勭悊锛歿} 瀛楁鍊间负绌�", rowGroupBy);
continue;
}
+
+ // 鑾峰彇宸ュ簭鍚嶇О锛堢敤浜庢棩蹇楀拰鍚庣画澶勭悊锛�
+ String processName = getStringValue(data, "processName");
// 澶勭悊寮�宸ユ棩鏈�
Date processPlanStartDay = (Date) data.get("processPlanStartDay");
@@ -1489,6 +1478,7 @@
// 鏋勫缓鍒嗙粍閿� - 鍩轰簬row鍒嗙粍瀛楁鍜屽彲閫夌殑鍏朵粬缁村害
String plant = getStringValue(data, "plant");
String major = getStringValue(data, "major");
+ String workshop = getStringValue(data, "workshop");
StringBuilder groupKeyBuilder = new StringBuilder(rowGroupValue);
--
Gitblit v1.9.3