From 550b14e27b9bba40e80f1141d0943d1dc62acbbc Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期一, 22 五月 2023 15:26:55 +0800
Subject: [PATCH] 优化广东粮食购销接口
---
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 292 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 233 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index 29c578d..a5817cf 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -8,6 +8,7 @@
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.RedisUtil;
import com.fzzy.api.view.repository.*;
@@ -37,6 +38,8 @@
@Autowired
private ApiCommonService apiCommonService;
@Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
private ApiLogRep apiLogRep;
@Autowired
private Api1101Rep api1101Rep;
@@ -46,6 +49,10 @@
private Api1103Rep api1103Rep;
@Autowired
private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1104Rep api1104Rep;
+ @Autowired
+ private Api1208Rep api1208Rep;
@Override
public String getProtocol() {
@@ -133,20 +140,20 @@
//鏌ヨ鍗曚綅淇℃伅
List<Api1101> listApi1101 = api1101Rep.findPushData(shjdjwApi1101.getKqdm());
Api1101 api1101 = null;
- if(null != listApi1101 && listApi1101.size() > 0){
+ if (null != listApi1101 && listApi1101.size() > 0) {
api1101 = listApi1101.get(0);
}
- if(null != api1101){
+ if (null != api1101) {
shjdjwApi1101.setDwmc(api1101.getDwmc());
shjdjwApi1101.setKqs(api1101.getKqs());
}
//鏌ヨ浠撴埧淇℃伅
List<Api1103> listApi1103 = api1103Rep.findPushData(shjdjwApi1101.getKqdm());
- if(null != listApi1103 && listApi1103.size() > 0){
- for(int i = 0; i < listApi1103.size(); i++){
- if(i == 0){
+ if (null != listApi1103 && listApi1103.size() > 0) {
+ for (int i = 0; i < listApi1103.size(); i++) {
+ if (i == 0) {
shjdjwApi1101.setCfmc(listApi1103.get(i).getCfmc());
- }else {
+ } else {
shjdjwApi1101.setCfmc(shjdjwApi1101.getCfmc() + "#" + listApi1103.get(i).getCfmc());
}
}
@@ -161,69 +168,44 @@
list.add(shjdjwApi1202);
} else if (Constant.API_CODE_1203.equals(inteId)) {
//绮鍏ュ簱妫�楠屾暟鎹皝瑁�
- ShjdjwApi1203 shjdjwApi1203 = new ShjdjwApi1203();
- Api1203 api1203 = (Api1203) data;
- BeanUtils.copyProperties(api1203, shjdjwApi1203);
-
- shjdjwApi1203.setQydbh(api1203.getRkjydh());
- shjdjwApi1203.setHwbm(api1203.getHwdm());
- shjdjwApi1203.setYpbm(api1203.getRkywdh());
- shjdjwApi1203.setJyjg(api1203.getJyz());
- shjdjwApi1203.setJyjl(api1203.getJyjg());
- shjdjwApi1203.setPzbm(api1203.getLspzdm());
- //TODO 鏍囪浣�
- shjdjwApi1203.setPch("0");
+ ShjdjwApi1203 shjdjwApi1203 = copyApi1203((Api1203) data);
list.add(shjdjwApi1203);
} else if (Constant.API_CODE_1205.equals(inteId)) {
//绮鍑哄簱鏁版嵁灏佽
- ShjdjwApi1205 shjdjwApi1205 = new ShjdjwApi1205();
- Api1205 api1205 = (Api1205) data;
-
- BeanUtils.copyProperties(api1205, shjdjwApi1205);
-
- shjdjwApi1205.setYwdh(api1205.getCkywdh());
- shjdjwApi1205.setHtbm(api1205.getHth());
- shjdjwApi1205.setPzbm(api1205.getLspzdm());
- shjdjwApi1205.setDjbm(api1205.getLsdjdm());
- shjdjwApi1205.setLqxzbm(api1205.getLsxzdm());
- shjdjwApi1205.setCzbz(api1205.getCzbz());
- shjdjwApi1205.setLrfs("0");
- shjdjwApi1205.setPzbm("0");
- //TODO 鍗曚綅鍚嶇О 浠撴埧鍚嶇О 鍗曟嵁绫诲瀷 鍝佺鍚嶇О 鍦板潃 鍒板簱鏃堕棿 绂诲簱鏃堕棿 杞崲骞村害
- shjdjwApi1205.setPch("0");
+ ShjdjwApi1205 shjdjwApi1205 = copyApi1205((Api1205) data);
list.add(shjdjwApi1205);
} else if (Constant.API_CODE_1208.equals(inteId)) {
//绮搴撳瓨鏁版嵁灏佽
- ShjdjwApi1208 shjdjwApi1208 = new ShjdjwApi1208();
- Api1208 api1208 = (Api1208) data;
-
- BeanUtils.copyProperties(api1208, shjdjwApi1208);
-
- shjdjwApi1208.setLspzbm(api1208.getLspzdm());
- shjdjwApi1208.setLsxzbm(api1208.getLsxzdm());
- shjdjwApi1208.setDjbm(api1208.getLsdjdm());
- shjdjwApi1208.setLqgsdwbm(api1208.getLqgsdwdm());
- shjdjwApi1208.setPch("0");
- //TODO 鍗曚綅鍚嶇О 浠撴埧鍚嶇О 寤掗棿鍚嶇О 搴撳瓨鐩戞祴鏃堕棿
+ ShjdjwApi1208 shjdjwApi1208 = copyApi1208((Api1208) data);
list.add(shjdjwApi1208);
} else if (Constant.API_CODE_1209.equals(inteId)) {
//鎹熺泭鍗曟暟鎹皝瑁�
- ShjdjwApi1209 shjdjwApi1209 = new ShjdjwApi1209();
- Api1209 api1209 = (Api1209) data;
-
- BeanUtils.copyProperties(api1209, shjdjwApi1209);
-
- shjdjwApi1209.setSydbh(api1209.getSydh());
- shjdjwApi1209.setHwbm(api1209.getHwdm());
- shjdjwApi1209.setRksl(api1209.getRkjz());
- shjdjwApi1209.setCksl(api1209.getCkjz());
- shjdjwApi1209.setSysl(api1209.getJzsysl());
- //TODO 鍗曚綅鍚嶇О 搴撶偣鍚嶇О 骞撮檺 杈呮崯婧㈡暟閲� 鎹熺泭绫诲瀷
+ ShjdjwApi1209 shjdjwApi1209 = copyApi1209((Api1209) data);
list.add(shjdjwApi1209);
+ } else if (Constant.API_CODE_1310.equals(inteId)) {
+ //璐ㄦ鏁版嵁灏佽
+ ShjdjwApi1310 shjdjwApi1310 = copyApi1310((Api1310) data);
+
+ list.add(shjdjwApi1310);
+ } else if (Constant.API_CODE_1403.equals(inteId)) {
+ //杞崲璁″垝鏁版嵁灏佽
+ ShjdjwApi1403 shjdjwApi1403 = new ShjdjwApi1403();
+ Api1403 api1403 = (Api1403) data;
+ BeanUtils.copyProperties(api1403, shjdjwApi1403);
+
+ shjdjwApi1403.setJhbm(api1403.getLhjhdh());
+ shjdjwApi1403.setPch("0");
+
+ list.add(shjdjwApi1403);
+ } else if (Constant.API_CODE_1404.equals(inteId)) {
+ //杞崲璁″垝瀹屾垚鎯呭喌鏁版嵁灏佽
+ ShjdjwApi1404 shjdjwApi1404 = copyApi1404((Api1404) data);
+
+ list.add(shjdjwApi1404);
} else {
list.add(data);
@@ -232,6 +214,189 @@
return JSON.toJSONString(dto);
}
+ private ShjdjwApi1404 copyApi1404(Api1404 data) {
+ ShjdjwApi1404 shjdjwApi1404 = new ShjdjwApi1404();
+ Api1404 api1404 = data;
+ BeanUtils.copyProperties(api1404, shjdjwApi1404);
+
+ //鏌ヨ鍗曚綅淇℃伅
+ List<Api1101> listApi1101 = api1101Rep.findPushData(api1404.getKqdm());
+ if (null != listApi1101 || listApi1101.size() > 0) {
+ shjdjwApi1404.setDwmc(listApi1101.get(0).getDwmc());
+ }
+
+ shjdjwApi1404.setJhnd("0");
+ shjdjwApi1404.setJhsl("0");
+ shjdjwApi1404.setYzxsl("0");
+ shjdjwApi1404.setZxbl("0");
+ shjdjwApi1404.setZbjjbl("0");
+ //TODO 璁″垝骞村害 璁″垝鏁伴噺 宸叉墽琛屾暟閲� 鎵ц姣斾緥 鎷涙爣/绔炰环姣斾緥
+ return shjdjwApi1404;
+ }
+
+ private ShjdjwApi1203 copyApi1203(Api1203 data) {
+ ShjdjwApi1203 shjdjwApi1203 = new ShjdjwApi1203();
+ Api1203 api1203 = data;
+ BeanUtils.copyProperties(api1203, shjdjwApi1203);
+
+ shjdjwApi1203.setQydbh(api1203.getRkjydh());
+ shjdjwApi1203.setHwbm(api1203.getHwdm());
+ shjdjwApi1203.setYpbm(api1203.getRkywdh());
+ shjdjwApi1203.setJyjg(api1203.getJyz());
+ shjdjwApi1203.setJyjl(api1203.getJyjg());
+ shjdjwApi1203.setPzbm(api1203.getLspzdm());
+ shjdjwApi1203.setBjw("jiading");
+ shjdjwApi1203.setPch("0");
+ return shjdjwApi1203;
+ }
+
+ private ShjdjwApi1310 copyApi1310(Api1310 data) {
+ ShjdjwApi1310 shjdjwApi1310 = new ShjdjwApi1310();
+ Api1310 api1310 = data;
+ BeanUtils.copyProperties(api1310, shjdjwApi1310);
+
+ shjdjwApi1310.setZjbgdbh(api1310.getZjbgdh());
+ shjdjwApi1310.setPznm(api1310.getLspzdm());
+ shjdjwApi1310.setSkdjbm(api1310.getLsdjdm());
+ shjdjwApi1310.setJylbbm(api1310.getJylb());
+ shjdjwApi1310.setJyjl(api1310.getJyxmz());
+ shjdjwApi1310.setZlzbjgpd(api1310.getZbjgpd());
+ //鏌ヨ鍗曚綅淇℃伅
+ List<Api1101> listApi1101 = api1101Rep.findPushData(api1310.getKqdm());
+ if (null != listApi1101 || listApi1101.size() > 0) {
+ shjdjwApi1310.setDwmc(listApi1101.get(0).getDwmc());
+ }
+
+ //鏌ヨ浠撴埧淇℃伅
+ List<Api1103> listApi1103 = api1103Rep.findPushDataByCfdm(api1310.getHwdm().substring(0, 25));
+ if (null != listApi1103 || listApi1103.size() > 0) {
+ shjdjwApi1310.setCfmc(listApi1103.get(0).getCfmc());
+ }
+
+ //鏌ヨ寤掗棿淇℃伅
+ List<Api1104> listApi1104 = api1104Rep.findDataByAjdh(api1310.getHwdm().substring(0, 28));
+ if (null != listApi1104 || listApi1104.size() > 0) {
+ shjdjwApi1310.setAjmc(listApi1104.get(0).getAjmc());
+ }
+
+ //鏌ヨ搴撳尯淇℃伅
+ List<Api1102> listApi1102 = api1102Rep.findPushData(api1310.getKqdm());
+ if (null != listApi1102 || listApi1102.size() > 0) {
+ shjdjwApi1310.setKdmc(listApi1102.get(0).getKqmc());
+ }
+ //鏌ヨ绮搴撳瓨
+ List<Api1208> listApi1208 = api1208Rep.getDataByHwdm(api1310.getHwdm());
+ if (null != listApi1208 || listApi1208.size() > 0) {
+ shjdjwApi1310.setKdmc(listApi1208.get(0).getLsxzdm());
+ }
+ shjdjwApi1310.setPch("0");
+ return shjdjwApi1310;
+ }
+
+ private ShjdjwApi1209 copyApi1209(Api1209 data) {
+ ShjdjwApi1209 shjdjwApi1209 = new ShjdjwApi1209();
+ Api1209 api1209 = data;
+
+ BeanUtils.copyProperties(api1209, shjdjwApi1209);
+
+ shjdjwApi1209.setSydbh(api1209.getSydh());
+ shjdjwApi1209.setHwbm(api1209.getHwdm());
+ shjdjwApi1209.setRksl(api1209.getRkjz());
+ shjdjwApi1209.setCksl(api1209.getCkjz());
+ shjdjwApi1209.setSysl(api1209.getJzsysl());
+ //鏌ヨ鍗曚綅淇℃伅
+ List<Api1101> listApi1101 = api1101Rep.findPushData(api1209.getKqdm());
+ if (null != listApi1101 || listApi1101.size() > 0) {
+ shjdjwApi1209.setDwmc(listApi1101.get(0).getDwmc());
+ }
+ //鏌ヨ搴撳尯淇℃伅
+ List<Api1102> listApi1102 = api1102Rep.findPushData(api1209.getKqdm());
+ if (null != listApi1102 || listApi1102.size() > 0) {
+ shjdjwApi1209.setKdmc(listApi1102.get(0).getKqmc());
+ }
+
+ shjdjwApi1209.setNx(api1209.getYwrq());
+ //杈呮崯鐩婃暟閲�
+ shjdjwApi1209.setFsysl(0.0);
+ //鎹熺泭绫诲瀷
+ shjdjwApi1209.setSylx(api1209.getJzsysl() > 0 ? "0" : "1");
+ return shjdjwApi1209;
+ }
+
+ private ShjdjwApi1208 copyApi1208(Api1208 data) {
+ ShjdjwApi1208 shjdjwApi1208 = new ShjdjwApi1208();
+ Api1208 api1208 = data;
+
+ BeanUtils.copyProperties(api1208, shjdjwApi1208);
+
+ shjdjwApi1208.setLspzbm(api1208.getLspzdm());
+ shjdjwApi1208.setLsxzbm(api1208.getLsxzdm());
+ shjdjwApi1208.setDjbm(api1208.getLsdjdm());
+ shjdjwApi1208.setLqgsdwbm(api1208.getLqgsdwdm());
+
+ //鏌ヨ鍗曚綅淇℃伅
+ List<Api1101> listApi1101 = api1101Rep.findPushData(api1208.getKqdm());
+ if (null != listApi1101 || listApi1101.size() > 0) {
+ shjdjwApi1208.setDwmc(listApi1101.get(0).getDwmc());
+ }
+
+ //鏌ヨ浠撴埧淇℃伅
+ List<Api1103> listApi1103 = api1103Rep.findPushDataByCfdm(api1208.getHwdm().substring(0, 25));
+ if (null != listApi1103 || listApi1103.size() > 0) {
+ shjdjwApi1208.setCfmc(listApi1103.get(0).getCfmc());
+ }
+
+ //鏌ヨ寤掗棿淇℃伅
+ List<Api1104> listApi1104 = api1104Rep.findDataByAjdh(api1208.getHwdm().substring(0, 28));
+ if (null != listApi1104 || listApi1104.size() > 0) {
+ shjdjwApi1208.setAjmc(listApi1104.get(0).getAjmc());
+ }
+
+ shjdjwApi1208.setKcjcsj(api1208.getZhgxsj());
+
+ shjdjwApi1208.setPch("0");
+ return shjdjwApi1208;
+ }
+
+ private ShjdjwApi1205 copyApi1205(Api1205 data) {
+ ShjdjwApi1205 shjdjwApi1205 = new ShjdjwApi1205();
+ Api1205 api1205 = data;
+
+ BeanUtils.copyProperties(api1205, shjdjwApi1205);
+
+ shjdjwApi1205.setYwdh(api1205.getCkywdh());
+ shjdjwApi1205.setHtbm(api1205.getHth());
+ shjdjwApi1205.setPzbm(api1205.getLspzdm());
+ shjdjwApi1205.setDjbm(api1205.getLsdjdm());
+ shjdjwApi1205.setLqxzbm(api1205.getLsxzdm());
+ shjdjwApi1205.setCzbz(api1205.getCzbz());
+ shjdjwApi1205.setLrfs("0");
+ shjdjwApi1205.setPzbm(api1205.getLspzdm());
+
+ //鏌ヨ鍗曚綅淇℃伅
+ List<Api1101> listApi1101 = api1101Rep.findPushData(api1205.getKqdm());
+ if (null != listApi1101 || listApi1101.size() > 0) {
+ shjdjwApi1205.setDwmc(listApi1101.get(0).getDwmc());
+ }
+
+ //鏌ヨ浠撴埧淇℃伅
+ List<Api1103> listApi1103 = api1103Rep.findPushDataByCfdm(api1205.getHwdm().substring(0, 25));
+ if (null != listApi1103 || listApi1103.size() > 0) {
+ shjdjwApi1205.setCfmc(listApi1103.get(0).getCfmc());
+ }
+
+ shjdjwApi1205.setDjlx("0");
+
+ //鏌ヨ瀛楀吀鏁版嵁
+ ApiTrigger apiTrigger = apiTriggerService.findNameByCode(api1205.getLspzdm(), Constant.TRIGGER_P_LSPZ);
+ shjdjwApi1205.setWlmc(null == apiTrigger ? api1205.getLspzdm() : apiTrigger.getName());
+ shjdjwApi1205.setDz(StringUtils.isNotEmpty(api1205.getXldd()) ? api1205.getXldd() : "搴撳唴");
+
+ shjdjwApi1205.setDksj(api1205.getDjsj());
+ shjdjwApi1205.setLksj(api1205.getCmsj());
+ shjdjwApi1205.setPch("0");
+ return shjdjwApi1205;
+ }
/**
@@ -260,6 +425,15 @@
case "1209":
//鎹熺泭鍗曟帴鍙ｇ紪鐮�
return ShjdjwApiCodeConstant.API_CODE_LS1311;
+ case "1310":
+ //璐ㄦ鎺ュ彛缂栫爜
+ return ShjdjwApiCodeConstant.API_CODE_LS1201;
+ case "1403":
+ //杞崲璁″垝鎺ュ彛缂栫爜
+ return ShjdjwApiCodeConstant.API_CODE_LS1501;
+ case "1404":
+ //杞崲璁″垝瀹屾垚鎯呭喌鎺ュ彛缂栫爜
+ return ShjdjwApiCodeConstant.API_CODE_LS1502;
default:
return inteId;
}
@@ -268,7 +442,7 @@
//瑁呮崲灏佽
private void copyApi1202(Api1202 api1202, ShjdjwApi1202 shjdjwApi1202) {
- BeanUtils.copyProperties(api1202,shjdjwApi1202);
+ BeanUtils.copyProperties(api1202, shjdjwApi1202);
String ywdh = api1202.getRkywdh();
shjdjwApi1202.setYwdh(ywdh);
shjdjwApi1202.setHwbm(api1202.getHwdm());
@@ -276,14 +450,14 @@
shjdjwApi1202.setLqxzbm(api1202.getLsxzdm());
shjdjwApi1202.setZjkl(api1202.getZjklxj());
//杞崲璁″垝鍗曞彿
- shjdjwApi1202.setJhbh(null);
+ shjdjwApi1202.setJhbh(api1202.getJhmxh());
//椤哄簭鍙�
shjdjwApi1202.setSxh(ywdh.substring(ywdh.length() - 4));
shjdjwApi1202.setDjzt("2");
//涓氬姟鍗曞彿
- shjdjwApi1202.setJydbh(null);
+ shjdjwApi1202.setJydbh(api1202.getRkywdh());
//杞崲骞村害
- shjdjwApi1202.setLhnd(null);
+ shjdjwApi1202.setLhnd(api1202.getShnd());
//鎵规鍙�
shjdjwApi1202.setPch("0");
}
--
Gitblit v1.9.3