From 789bacf67ee22c7fd2c214ac5014507d2df1e1b9 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期五, 23 五月 2025 10:24:44 +0800
Subject: [PATCH] row按workshop聚合统计时添加processName的参数的补充
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 101 insertions(+), 19 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 0fa2422..247add4 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
@@ -6,10 +6,12 @@
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.*;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireError;
import com.aps.core.mapper.*;
import com.aps.core.service.IApsGasMaterialUsageService;
import com.aps.core.service.IApsGasPipingRouteStatService;
import com.aps.core.service.IApsStandardProcessService;
+import com.aps.core.mapper.ApsPlateStandardRequireErrorMapper;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.*;
@@ -58,6 +60,9 @@
@Autowired
private IApsStandardProcessService apsStandardProcessService;
+
+ @Autowired
+ private ApsPlateStandardRequireErrorMapper apsPlateStandardRequireErrorMapper;
/**
* 鏌ヨ姘斾綋绠¤矾浜ц兘璐熻浇缁熻
@@ -1117,6 +1122,12 @@
// 澶勭悊鎵嬪伐姘斾綋宸ュ崟鏁版嵁 - 浣跨敤鑱斿悎鏌ヨ鑾峰彇鎵�鏈夌浉鍏虫暟鎹�
List<Map<String, Object>> moDataList = apsGasPipingRouteStatMapper.selectMoRouteData();
+ // 鑾峰彇鎵�鏈夌殑MO鏁版嵁锛岀敤浜庢鏌ュ摢浜汳O娌℃湁鍏宠仈鍒板伐鑹鸿矾绾�
+ List<Map<String, Object>> allMoData = apsGasPipingRouteStatMapper.selectAllMoData();
+
+ // 璁板綍宸插叧鑱斿伐鑹鸿矾绾跨殑MO缂栧彿
+ Set<String> processedMoSet = new HashSet<>();
+
// 鎸夊伐鍗曞彿鍒嗙粍锛屼究浜庡鐞嗗悓涓�宸ュ崟鐨勪笉鍚屽伐搴�
Map<String, List<Map<String, Object>>> moGroups = moDataList.stream()
.collect(Collectors.groupingBy(data -> data.get("work_order_no").toString()));
@@ -1124,6 +1135,9 @@
// 澶勭悊姣忎釜宸ュ崟鐨勫伐鑹鸿矾绾�
for (String workOrderNo : moGroups.keySet()) {
List<Map<String, Object>> workOrderData = moGroups.get(workOrderNo);
+
+ // 鏍囪璇ュ伐鍗曞凡澶勭悊
+ processedMoSet.add(workOrderNo);
// 鎸夊伐搴忓彿鎺掑簭
workOrderData.sort((a, b) -> {
@@ -1202,6 +1216,36 @@
statList.addAll(processList);
}
+ }
+
+ // 澶勭悊娌℃湁鍏宠仈鍒板伐鑹鸿矾绾跨殑MO鏁版嵁
+ List<ApsPlateStandardRequireError> errorList = new ArrayList<>();
+ for (Map<String, Object> moData : allMoData) {
+ String workOrderNo = moData.get("mo").toString();
+ // 濡傛灉璇ュ伐鍗曟病鏈夎澶勭悊杩囷紝璇存槑娌℃湁鍏宠仈鍒板伐鑹鸿矾绾�
+ if (!processedMoSet.contains(workOrderNo)) {
+ ApsPlateStandardRequireError error = ApsPlateStandardRequireError.builder()
+ .id(Long.valueOf(IdUtils.fastSimpleUUID().hashCode()))
+ .batchNumber(batchNumber)
+ .requireId(IdUtil.getSnowflakeNextId())
+ .docNum(workOrderNo)
+ .itemNum(moData.get("material_code").toString())
+ .orgCode(moData.get("factory").toString())
+ .message("鏍囧噯宸ヨ壓璺嚎涓嶅瓨鍦�")
+ .delFlag("0")
+ .build();
+
+ // 璁剧疆鍩虹被灞炴��
+ error.setCreateBy(SecurityUtils.getUsername());
+ error.setCreateTime(truncateToSeconds(DateUtils.getNowDate()));
+
+ errorList.add(error);
+ }
+ }
+
+ // 鎵归噺鎻掑叆寮傚父鏁版嵁
+ if (!errorList.isEmpty()) {
+ apsPlateStandardRequireErrorMapper.batchInsert(errorList);
}
// 鎵归噺鎻掑叆鏁版嵁
@@ -1316,10 +1360,18 @@
String timeGranularity = params.containsKey("timeGranularity") ?
(String) params.get("timeGranularity") : "day"; // 榛樿涓�"鏃�"绮掑害
+ // 鑾峰彇row缁村害鐨勮仛鍚堝瓧娈� - 榛樿涓哄伐搴忓悕绉�(processName)
+ String rowGroupBy = params.containsKey("rowGroupBy") ?
+ (String) params.get("rowGroupBy") : "processName";
+
// 纭畾鍒嗙粍缁村害 - 宸ュ巶銆佷笓涓氥�佽溅闂�
boolean groupByPlant = params.containsKey("groupByPlant") && Boolean.TRUE.equals(params.get("groupByPlant"));
boolean groupByMajor = params.containsKey("groupByMajor") && Boolean.TRUE.equals(params.get("groupByMajor"));
boolean groupByWorkshop = params.containsKey("groupByWorkshop") && Boolean.TRUE.equals(params.get("groupByWorkshop"));
+ // 濡傛灉rowGroupBy宸茬粡鏄煇涓淮搴︼紝鍒欒缁村害涓嶉渶瑕佸啀娆″垎缁�
+ if ("plant".equals(rowGroupBy)) groupByPlant = false;
+ if ("major".equals(rowGroupBy)) groupByMajor = false;
+ if ("workshop".equals(rowGroupBy)) groupByWorkshop = false;
// 鏋勫缓鏌ヨ鏉′欢
Map<String, Object> queryParams = new HashMap<>();
@@ -1444,31 +1496,37 @@
}
// 鍦⊿ervice灞傚畬鎴愯仛鍚�
- // 浣跨敤缁勫悎key鏉ュ疄鐜板缁村害鍒嗙粍锛堝伐搴忓悕 + 鍙�夌殑宸ュ巶/涓撲笟/杞﹂棿锛�
+ // 浣跨敤缁勫悎key鏉ュ疄鐜板缁村害鍒嗙粍锛堝姩鎬乺owGroupBy瀛楁 + 鍙�夌殑宸ュ巶/涓撲笟/杞﹂棿锛�
Map<String, Map<String, Object>> groupInfoMap = new HashMap<>();
Map<String, Map<String, BigDecimal>> groupTimeDataMap = new HashMap<>();
+ // 瀛樺偍姣忎釜groupKey瀵瑰簲鐨刾rocessName闆嗗悎
+ Map<String, Set<String>> groupProcessNamesMap = new HashMap<>();
// 閬嶅巻鍘熷鏁版嵁锛屾寜澶氱淮搴﹀垎缁勮繘琛岃仛鍚�
for (Map<String, Object> data : rawData) {
- String processName = getStringValue(data, "processName");
- if (processName == null) {
- log.warn("璺宠繃澶勭悊锛氬伐搴忓悕绉颁负null");
+ // 鑾峰彇琛屽垎缁勫瓧娈靛��
+ String rowGroupValue = getStringValue(data, rowGroupBy);
+ if (rowGroupValue == null || rowGroupValue.trim().isEmpty()) {
+ log.warn("璺宠繃澶勭悊锛歿} 瀛楁鍊间负绌�", rowGroupBy);
continue;
}
+
+ // 鑾峰彇宸ュ簭鍚嶇О锛堢敤浜庢棩蹇楀拰鍚庣画澶勭悊锛�
+ String processName = getStringValue(data, "processName");
// 澶勭悊寮�宸ユ棩鏈�
Date processPlanStartDay = (Date) data.get("processPlanStartDay");
if (processPlanStartDay == null) {
- log.warn("璺宠繃澶勭悊锛氳鍒掑紑宸ユ棩涓簄ull, processName={}", processName);
+ log.warn("璺宠繃澶勭悊锛氳鍒掑紑宸ユ棩涓簄ull, {}={}", rowGroupBy, rowGroupValue);
continue;
}
- // 鏋勫缓鍒嗙粍閿� - 鍩轰簬宸ュ簭鍚嶅拰鍙�夌殑鍏朵粬缁村害
+ // 鏋勫缓鍒嗙粍閿� - 鍩轰簬row鍒嗙粍瀛楁鍜屽彲閫夌殑鍏朵粬缁村害
String plant = getStringValue(data, "plant");
String major = getStringValue(data, "major");
String workshop = getStringValue(data, "workshop");
- StringBuilder groupKeyBuilder = new StringBuilder(processName);
+ StringBuilder groupKeyBuilder = new StringBuilder(rowGroupValue);
// 鏍规嵁鐢ㄦ埛閫夋嫨鐨勫垎缁勭淮搴︽坊鍔犲埌鍒嗙粍閿�
if (groupByPlant && plant != null) {
@@ -1486,11 +1544,20 @@
// 璁板綍鍒嗙粍鐨勫熀鏈俊鎭紙鍙褰曚竴娆★級
if (!groupInfoMap.containsKey(groupKey)) {
Map<String, Object> groupInfo = new HashMap<>();
- groupInfo.put("processName", processName);
+ groupInfo.put(rowGroupBy, rowGroupValue);
groupInfo.put("plant", plant);
groupInfo.put("major", major);
groupInfo.put("workshop", workshop);
+ groupInfo.put("processName", processName);
groupInfoMap.put(groupKey, groupInfo);
+ }
+
+ // 鏀堕泦processName
+ if (processName != null && !processName.trim().isEmpty()) {
+ if (!groupProcessNamesMap.containsKey(groupKey)) {
+ groupProcessNamesMap.put(groupKey, new HashSet<>());
+ }
+ groupProcessNamesMap.get(groupKey).add(processName);
}
// 璁＄畻鏃堕棿鐐筀ey
@@ -1521,22 +1588,36 @@
// 鏋勫缓鏈�缁堣繑鍥炵殑鏁版嵁缁撴瀯
for (String groupKey : groupInfoMap.keySet()) {
- Map<String, Object> processEntry = new HashMap<>();
- Map<String, Object> processDetail = new HashMap<>();
+ Map<String, Object> rowEntry = new HashMap<>();
+ Map<String, Object> rowDetail = new HashMap<>();
// 鑾峰彇璇ュ垎缁勭殑鍩烘湰淇℃伅
Map<String, Object> groupInfo = groupInfoMap.get(groupKey);
- String processName = (String) groupInfo.get("processName");
+ String rowGroupValue = (String) groupInfo.get(rowGroupBy);
- // 娣诲姞宸ュ簭鍩烘湰淇℃伅
+ // 娣诲姞鍒嗙粍鍩烘湰淇℃伅
if (groupByPlant) {
- processDetail.put("plant", groupInfo.get("plant"));
+ rowDetail.put("plant", groupInfo.get("plant"));
}
if (groupByMajor) {
- processDetail.put("major", groupInfo.get("major"));
+ rowDetail.put("major", groupInfo.get("major"));
}
if (groupByWorkshop) {
- processDetail.put("workshop", groupInfo.get("workshop"));
+ rowDetail.put("workshop", groupInfo.get("workshop"));
+ }
+
+ // 澶勭悊processName - 濡傛灉rowGroupBy涓簑orkshop锛屽垯灏嗘墍鏈塸rocessName鐢ㄥ垎鍙疯繛鎺�
+ if ("workshop".equals(rowGroupBy)) {
+ Set<String> processNames = groupProcessNamesMap.getOrDefault(groupKey, new HashSet<>());
+ if (!processNames.isEmpty()) {
+ String joinedProcessNames = String.join(";", processNames);
+ rowDetail.put("processName", joinedProcessNames);
+ } else {
+ rowDetail.put("processName", groupInfo.get("processName"));
+ }
+ } else if (!"processName".equals(rowGroupBy)) {
+ // 淇濈暀宸ュ簭鍚嶇О淇℃伅锛屼互渚垮墠绔睍绀�
+ rowDetail.put("processName", groupInfo.get("processName"));
}
// 娣诲姞鏃堕棿鏁版嵁
@@ -1558,13 +1639,14 @@
timeDataList.add(pointData);
}
- processDetail.put("timeData", timeDataList);
- processEntry.put(processName, processDetail);
- plantTable.add(processEntry);
+ rowDetail.put("timeData", timeDataList);
+ rowEntry.put(rowGroupValue, rowDetail);
+ plantTable.add(rowEntry);
}
-
+
result.put("plantTable", plantTable);
result.put("timePoints", timePoints);
+ result.put("rowGroupBy", rowGroupBy);
return result;
}
--
Gitblit v1.9.3