From 561bbb85896810c8a2595d3d58fa32325dcdfdf9 Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期三, 10 五月 2023 18:25:30 +0800
Subject: [PATCH] 粮食购销模块数据上传
---
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 156 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index 7fe842e..29c578d 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -5,18 +5,17 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
-import com.fzzy.api.entity.ApiConfs;
-import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.RedisUtil;
-import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.push.gd2022.dto.*;
-import com.fzzy.push.shjdjw2023.dto.ShjdjwReqDto;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.push.shjdjw2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -35,13 +34,18 @@
@Autowired
private RedisUtil redisUtil;
-
@Autowired
private ApiCommonService apiCommonService;
-
@Autowired
private ApiLogRep apiLogRep;
-
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private Api1103Rep api1103Rep;
+ @Autowired
+ private Api1202Rep api1202Rep;
@Override
public String getProtocol() {
@@ -93,16 +97,15 @@
return responseDto;
}
- Map<String, Object> map = new HashMap<>();
- GD2022ResponseDto responseDto = Shjdjw2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, jsonData, conf);
+ ShjdjwRespDto responseDto = Shjdjw2023HttpClientUtil.postPushData(conf.getApiUrl(), jsonData, conf);
responseDto.setBizId(bizId);
- apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
- apiLog.setResult(responseDto.getMsg());
+ apiLog.setStatus(responseDto.getCode() == 1 ? 0 : responseDto.getCode());
+ apiLog.setResult(responseDto.getDescription());
apiLogRep.save(apiLog);
ResponseDto resd = new ResponseDto();
- resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
- resd.setMsg(responseDto.getMsg());
- //updateGD2022AuthToken(responseDto,conf, token);
+ resd.setSuccess(responseDto.getCode() == 1 ? 0 : responseDto.getCode());
+ resd.setMsg(responseDto.getDescription());
+
return resd;
} catch (Exception e) {
log.error(e.getMessage(), e);
@@ -121,19 +124,115 @@
private String getJsonData(String inteId, Object data, String interfaceId) {
ShjdjwReqDto<Object> dto = new ShjdjwReqDto<>();
dto.setId(getDataId(interfaceId));
+ List<Object> list = new ArrayList<>();
//杞崲灏佽
- if (Constant.API_CODE_1101.equals(inteId)) {
- dto.setData(data);
+ if (Constant.API_CODE_1102.equals(inteId)) {
+ //鍗曚綅鎺ュ彛鏁版嵁灏佽
+ ShjdjwApi1101 shjdjwApi1101 = new ShjdjwApi1101();
+ BeanUtils.copyProperties(data, shjdjwApi1101);
+ //鏌ヨ鍗曚綅淇℃伅
+ List<Api1101> listApi1101 = api1101Rep.findPushData(shjdjwApi1101.getKqdm());
+ Api1101 api1101 = null;
+ if(null != listApi1101 && listApi1101.size() > 0){
+ api1101 = listApi1101.get(0);
+ }
+ 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){
+ shjdjwApi1101.setCfmc(listApi1103.get(i).getCfmc());
+ }else {
+ shjdjwApi1101.setCfmc(shjdjwApi1101.getCfmc() + "#" + listApi1103.get(i).getCfmc());
+ }
+ }
+ }
+ //鍗曚綅淇℃伅灏佽
+ list.add(shjdjwApi1101);
} else if (Constant.API_CODE_1202.equals(inteId)) {
+ //绮鍏ュ簱鏁版嵁灏佽
+ ShjdjwApi1202 shjdjwApi1202 = new ShjdjwApi1202();
+ Api1202 api1202 = (Api1202) data;
+ copyApi1202(api1202, shjdjwApi1202);
+ 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");
- dto.setData(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");
+
+ 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 鍗曚綅鍚嶇О 浠撴埧鍚嶇О 寤掗棿鍚嶇О 搴撳瓨鐩戞祴鏃堕棿
+
+ 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 鍗曚綅鍚嶇О 搴撶偣鍚嶇О 骞撮檺 杈呮崯婧㈡暟閲� 鎹熺泭绫诲瀷
+
+ list.add(shjdjwApi1209);
} else {
- dto.setData(data);
- }
+ list.add(data);
+ }
+ dto.setData(list);
return JSON.toJSONString(dto);
}
+
+
/**
* 鑾峰彇鎺ュ彛缂栫爜
@@ -143,13 +242,49 @@
*/
private String getDataId(String inteId) {
switch (inteId) {
- case "1101":
+ case "1102":
+ //鍗曚綅鎺ュ彛缂栫爜
return ShjdjwApiCodeConstant.API_CODE_LS1101;
case "1202":
+ //绮鍏ュ簱鎺ュ彛缂栫爜
return ShjdjwApiCodeConstant.API_CODE_LS1302;
+ case "1203":
+ //绮鍏ュ簱妫�楠屾帴鍙ｇ紪鐮�
+ return ShjdjwApiCodeConstant.API_CODE_LS1303;
+ case "1205":
+ //绮鍑哄簱鎺ュ彛缂栫爜
+ return ShjdjwApiCodeConstant.API_CODE_LS1306;
+ case "1208":
+ //绮搴撳瓨鎺ュ彛缂栫爜
+ return ShjdjwApiCodeConstant.API_CODE_LS1310;
+ case "1209":
+ //鎹熺泭鍗曟帴鍙ｇ紪鐮�
+ return ShjdjwApiCodeConstant.API_CODE_LS1311;
default:
return inteId;
}
}
+
+ //瑁呮崲灏佽
+ private void copyApi1202(Api1202 api1202, ShjdjwApi1202 shjdjwApi1202) {
+ BeanUtils.copyProperties(api1202,shjdjwApi1202);
+ String ywdh = api1202.getRkywdh();
+ shjdjwApi1202.setYwdh(ywdh);
+ shjdjwApi1202.setHwbm(api1202.getHwdm());
+ shjdjwApi1202.setPzbm(api1202.getLspzdm());
+ shjdjwApi1202.setLqxzbm(api1202.getLsxzdm());
+ shjdjwApi1202.setZjkl(api1202.getZjklxj());
+ //杞崲璁″垝鍗曞彿
+ shjdjwApi1202.setJhbh(null);
+ //椤哄簭鍙�
+ shjdjwApi1202.setSxh(ywdh.substring(ywdh.length() - 4));
+ shjdjwApi1202.setDjzt("2");
+ //涓氬姟鍗曞彿
+ shjdjwApi1202.setJydbh(null);
+ //杞崲骞村害
+ shjdjwApi1202.setLhnd(null);
+ //鎵规鍙�
+ shjdjwApi1202.setPch("0");
+ }
}
--
Gitblit v1.9.3