From 7ab13e3b8f4ab768dd68b1bd8e1f8bbce31fb8a6 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 08 十一月 2023 18:58:44 +0800
Subject: [PATCH] 优化调整上报信息
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java | 5 --
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java | 6 +++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 5 --
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java | 5 --
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/push/gd2022/GD2022ApiRemoteService2022.java | 15 +++++++
src/main/java/com/fzzy/api/entity/Api1209.java | 2
src/main/java/com/fzzy/api/view/Api1207.view.xml | 11 +++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 5 --
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java | 5 --
11 files changed, 38 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1209.java b/src/main/java/com/fzzy/api/entity/Api1209.java
index 6743c52..8b6e965 100644
--- a/src/main/java/com/fzzy/api/entity/Api1209.java
+++ b/src/main/java/com/fzzy/api/entity/Api1209.java
@@ -34,7 +34,7 @@
@Id
@PropertyDef(label = "鎹熸孩鍗曞彿" )
- @Column(name = "sydh", length = 41)
+ @Column(name = "sydh", length = 60)
private String sydh;
@PropertyDef(label = "璐т綅浠ｇ爜" )
diff --git a/src/main/java/com/fzzy/api/view/Api1207.view.xml b/src/main/java/com/fzzy/api/view/Api1207.view.xml
index 809ae9c..b7a9b2a 100644
--- a/src/main/java/com/fzzy/api/view/Api1207.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1207.view.xml
@@ -49,7 +49,11 @@
</PropertyDef>
<PropertyDef name="dcdw">
<Property></Property>
- <Property name="label">鍊掍粨鍗曚綅</Property>
+ <Property name="label">鍊掑嚭鍗曚綅</Property>
+ </PropertyDef>
+ <PropertyDef name="drdw">
+ <Property></Property>
+ <Property name="label">鍊掑叆鍗曚綅</Property>
</PropertyDef>
<PropertyDef name="lspzdm">
<Property></Property>
@@ -358,6 +362,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">drdw</Property>
+ <Property name="property">drdw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">lspzdm</Property>
<Property name="property">lspzdm</Property>
<Editor/>
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 37a515f..67c8ffb 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -107,10 +107,7 @@
if(StringUtils.isEmpty(sysData.getFoodVariety())){
continue;
}
- 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));
- }
+ String 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 be70db2..6144701 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -139,10 +139,7 @@
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
- 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));
- }
+ String 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 f5de8d2..f0f74c2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -132,10 +132,7 @@
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
- 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));
- }
+ String 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 e58ac14..3008cba 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
@@ -90,10 +90,7 @@
apiData.setTzdh(sysData.getNoticeId());
apiData.setDcdw(kqdm);
apiData.setDrdw(kqdm);
- 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));
- }
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
apiData.setLspzdm(mappingCode);
apiData.setDchwdm(api1105Out.getHwdm());
apiData.setDrhwdm(api1105In.getHwdm());
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 1be957c..0a032b6 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -87,10 +87,7 @@
apiData.setHwdm(api1105.getHwdm());
//绮鍝佺
- 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));
- }
+ String 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 003c130..463d0ee 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
@@ -78,10 +78,7 @@
apiData.setLssl(sysData.getNumber());
apiData.setHzsl(sysData.getChangeNumber());
apiData.setBzwh(sysData.getApprovalId());
- 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));
- }
+ String 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);
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 a72fe33..8762f94 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
@@ -93,10 +93,7 @@
api1310.setHwdm(api1105.getHwdm());
api1310.setKqdm(kqdm);
//绮鍝佺
- 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));
- }
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40Quality.getFoodVariety().substring(0, 3));
api1310.setLspzdm(mappingCode);
//绮绛夌骇
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 1411e34..aa1f79d 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -9,6 +9,8 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.*;
+import com.fzzy.api.view.repository.Api1101Rep;
+import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.push.gd2022.dto.*;
@@ -49,7 +51,10 @@
private ApiCommonService apiCommonService;
@Autowired
private Api1404Rep api1404Rep;
-
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private Api1102Rep api1102Rep;
@Autowired
private ApiLogRep apiLogRep;
@@ -346,6 +351,14 @@
if (Constant.API_CODE_1111.equals(inteId)) {
Gd2022Api1111 api1111 = new Gd2022Api1111();
BeanUtils.copyProperties(data, api1111);
+ List<Api1102> api1102List = api1102Rep.findPushData(api1111.getKqdm());
+ if(null != api1102List && api1102List.size() > 0){
+ api1111.setKqmc(api1102List.get(0).getKqmc());
+ }
+ List<Api1101> api1101List = api1101Rep.findDataByDwdm(api1111.getDwdm());
+ if(null != api1101List && api1101List.size() > 0){
+ api1111.setDwmc(api1101List.get(0).getDwmc());
+ }
return JSON.toJSONString(api1111);
}
if (Constant.API_CODE_1208.equals(inteId)) {
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java
index 5b9b1b6..e0f677c 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java
@@ -58,6 +58,12 @@
@PropertyDef(label = "寤掗棿浠ｇ爜" )
private String ajdm;
+ @PropertyDef(label = "鍗曚綅鍚嶇О" )
+ private String dwmc;
+
+ @PropertyDef(label = "搴撳尯鍚嶇О" )
+ private String kqmc;
+
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj;
--
Gitblit v1.9.3