From b950596667b4b9400e38233941153bcfc21c88c4 Mon Sep 17 00:00:00 2001
From: 6c <420680616@qq.com>
Date: 星期五, 26 九月 2025 09:27:08 +0800
Subject: [PATCH] 请求历史特殊处理-兼容历史core，采用setTable方法设置表名
---
product-server-data-center/src/main/java/com/product/data/center/service/MesExternalService.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/product-server-data-center/src/main/java/com/product/data/center/service/MesExternalService.java b/product-server-data-center/src/main/java/com/product/data/center/service/MesExternalService.java
index 58a3f4e..723630a 100644
--- a/product-server-data-center/src/main/java/com/product/data/center/service/MesExternalService.java
+++ b/product-server-data-center/src/main/java/com/product/data/center/service/MesExternalService.java
@@ -182,17 +182,19 @@
// 璇锋眰鍘嗗彶杩斿洖鏁版嵁鏃ュ織鎵撳嵃
List<HistoryEntity> historyEntityList = Lists.newArrayList(trackingData, keypData, detailData);
historyEntityList.forEach(historyEntity -> {
- String primaryField = historyEntity.getPrimaryField();;
- SpringMVCContextHolder.getSystemLogger().info(String.format("銆愬綋鍓嶈〃锛�%s銆�", historyEntity.getTableName()));
- SpringMVCContextHolder.getSystemLogger().info("銆愪富搴撴暟鎹��");
- for (int i = 0; i < historyEntity.getMasterDataTable().getRows(); i++) {
- FieldSetEntity tempFse = historyEntity.getMasterDataTable().getFieldSetEntity(i);
- SpringMVCContextHolder.getSystemLogger().info(String.format("%s", tempFse.getString(primaryField)));
- }
- SpringMVCContextHolder.getSystemLogger().info("銆愬瓙搴撴暟鎹��");
- for (int i = 0; i < historyEntity.getSubDataTable().getRows(); i++) {
- FieldSetEntity tempFse = historyEntity.getSubDataTable().getFieldSetEntity(i);
- SpringMVCContextHolder.getSystemLogger().info(String.format("%s", tempFse.getString(primaryField)));
+ if (historyEntity != null) {
+ String primaryField = historyEntity.getPrimaryField();;
+ SpringMVCContextHolder.getSystemLogger().info(String.format("銆愬綋鍓嶈〃锛�%s銆�", historyEntity.getTableName()));
+ SpringMVCContextHolder.getSystemLogger().info("銆愪富搴撴暟鎹��");
+ for (int i = 0; i < historyEntity.getMasterDataTable().getRows(); i++) {
+ FieldSetEntity tempFse = historyEntity.getMasterDataTable().getFieldSetEntity(i);
+ SpringMVCContextHolder.getSystemLogger().info(String.format("%s", tempFse.getString(primaryField)));
+ }
+ SpringMVCContextHolder.getSystemLogger().info("銆愬瓙搴撴暟鎹��");
+ for (int i = 0; i < historyEntity.getSubDataTable().getRows(); i++) {
+ FieldSetEntity tempFse = historyEntity.getSubDataTable().getFieldSetEntity(i);
+ SpringMVCContextHolder.getSystemLogger().info(String.format("%s", tempFse.getString(primaryField)));
+ }
}
});
@@ -518,7 +520,8 @@
// DataTableEntity dataTableEntity = objectCompletionService.take().get();
// BaseUtil.dataTableMerge(data, dataTableEntity);
// }
- if (DataTableEntity.isEmpty(data) && !"product_sn".equals(filterFieldName)) {
+ // 鏈夊彲鑳藉彧鏈塼rack琛ㄦ湁鏁版嵁 6c 2025骞�9鏈�23鏃� 10:24:55
+ if (DataTableEntity.isEmpty(data) && tableArray[0].toLowerCase(Locale.ROOT).contains("da_t_wip_tracking")) {
throw new BaseException(errorCodes[1]);
}
return data;
--
Gitblit v1.9.2