From 9075639de65743f310d63a65700ce9a3b79247fe Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 07 十一月 2023 10:52:34 +0800
Subject: [PATCH] 调整品种信息
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java | 16 +++++++++++++---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 5 ++++-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java | 9 ++++++++-
src/main/java/com/fzzy/api/view/Api1310.view.xml | 10 ++++++++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 5 ++++-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java | 5 ++++-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 5 ++++-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java | 5 ++++-
8 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/Api1310.view.xml b/src/main/java/com/fzzy/api/view/Api1310.view.xml
index 98dea09..fe67c9a 100644
--- a/src/main/java/com/fzzy/api/view/Api1310.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1310.view.xml
@@ -16,9 +16,19 @@
<PropertyDef name="lspzdm">
<Property></Property>
<Property name="label">绮鍝佺浠ｇ爜</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("LSPZ")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="lsdjdm">
<Property name="label">绮绛夌骇浠ｇ爜</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("LSDJ")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="rkrq">
<Property name="dataType">Date</Property>
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
index 7e08640..37a515f 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -107,7 +107,10 @@
if(StringUtils.isEmpty(sysData.getFoodVariety())){
continue;
}
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ if(StringUtils.isEmpty(mappingCode)){
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+ }
apiData.setLspzdm(mappingCode);
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 6144701..be70db2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -139,7 +139,10 @@
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ if(StringUtils.isEmpty(mappingCode)){
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+ }
apiData.setLspzdm(mappingCode);
//绮鎬ц川
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index 27f300c..f5de8d2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -132,7 +132,10 @@
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ if(StringUtils.isEmpty(mappingCode)){
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+ }
apiData.setLspzdm(mappingCode);
//绮绛夌骇
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
index 1561e8b..e58ac14 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
@@ -15,6 +15,7 @@
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1207Rep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -36,6 +37,8 @@
private ApiCommonService commonService;
@Autowired
private Api1207Rep api1207Rep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
@Autowired
private ApiLogRep apiLogRep;
@@ -87,7 +90,11 @@
apiData.setTzdh(sysData.getNoticeId());
apiData.setDcdw(kqdm);
apiData.setDrdw(kqdm);
- apiData.setLspzdm(sysData.getFoodVariety());
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ if(StringUtils.isEmpty(mappingCode)){
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+ }
+ apiData.setLspzdm(mappingCode);
apiData.setDchwdm(api1105Out.getHwdm());
apiData.setDrhwdm(api1105In.getHwdm());
apiData.setDcrq(sysData.getChangeDate());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index be7a4b5..0f26f6b 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -87,7 +87,10 @@
apiData.setHwdm(api1105.getHwdm());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0, 3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety());
+ if(StringUtils.isEmpty(mappingCode)){
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0, 3));
+ }
apiData.setLspzdm(mappingCode);
//绮鎬ц川
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
index b124a0f..003c130 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
@@ -6,6 +6,7 @@
import com.fzzy.api.entity.Api1210;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1209Rep;
import com.fzzy.api.view.repository.Api1210Rep;
@@ -15,6 +16,7 @@
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1209Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1210Rep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -36,6 +38,8 @@
private Api1210Rep api1210Rep;
@Autowired
private ApiCommonService commonService;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
@Autowired
private ApiLogRep apiLogRep;
@@ -74,9 +78,15 @@
apiData.setLssl(sysData.getNumber());
apiData.setHzsl(sysData.getChangeNumber());
apiData.setBzwh(sysData.getApprovalId());
- apiData.setLspzdm(sysData.getFoodVariety());
- apiData.setHzqlsxzdm(sysData.getFoodType());
- apiData.setHzhlsxzdm(sysData.getNewFoodType());
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ if(StringUtils.isEmpty(mappingCode)){
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+ }
+ apiData.setLspzdm(mappingCode);
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
+ apiData.setHzqlsxzdm(mappingCode);
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
+ apiData.setHzhlsxzdm(mappingCode);
apiData.setHzrq(sysData.getChangeTime());
apiData.setCcshr(sysData.getCcshr());
apiData.setZjshr(sysData.getZjshr());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
index 8762f94..a72fe33 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
@@ -93,7 +93,10 @@
api1310.setHwdm(api1105.getHwdm());
api1310.setKqdm(kqdm);
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40Quality.getFoodVariety().substring(0, 3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40Quality.getFoodVariety());
+ if(StringUtils.isEmpty(mappingCode)){
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40Quality.getFoodVariety().substring(0, 3));
+ }
api1310.setLspzdm(mappingCode);
//绮绛夌骇
--
Gitblit v1.9.3