From 3e8e2bfdfbcf06659d7734d3e1cb63fd0f46c35d Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 03 一月 2025 15:30:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 480 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 456 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index aa1f79d..950582c 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -19,11 +19,11 @@
import com.fzzy.push.gd2022.dto.Gd2022Api1208;
import com.fzzy.push.gd2022.dto.Gd2022Api1307;
import com.fzzy.push.gd2022.dto.Gd2022Api1308;
-import com.fzzy.push.sh2023.SH2023Constant;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -244,7 +244,6 @@
//浠庢柊鑾峰彇TOKEN
Map<String, Object> map = new HashMap<>();
map.put("appid", conf.getUserName());
-// map.put("appkey", EncryptUtil.encryptHex(conf.getPassword(),conf.getPublicKey()));
map.put("appkey", AESUtils.encrypt(conf.getPassword(), conf.getPublicKey()));
GD2022ResponseDto<GD2022AuthToken> responseDto = GD2022HttpClientUtil.postGetToken(conf.getApiUrl() + "sfrz", map);
token = new GD2022AuthToken();
@@ -272,7 +271,7 @@
GD2022AuthToken token1 = dto.getData();
token.setAccess_token(token1.getAccess_token());
token.setAppid(token1.getAppid());
- redisUtil.set(key, token, 60 * 119);
+ redisUtil.set(key, token, 60 * 29);
}
}
@@ -309,29 +308,59 @@
if (Constant.API_CODE_1101.equals(inteId)) {
Gd2022Api1101 api1101 = new Gd2022Api1101();
BeanUtils.copyProperties(data, api1101);
+ api1101.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1101);
}
if (Constant.API_CODE_1102.equals(inteId)) {
Gd2022Api1102 api1102 = new Gd2022Api1102();
BeanUtils.copyProperties(data, api1102);
+ api1102.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1102);
}
if (Constant.API_CODE_1103.equals(inteId)) {
Gd2022Api1103 api1103 = new Gd2022Api1103();
BeanUtils.copyProperties(data, api1103);
changeObject(api1103);
+ api1103.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1103);
}
if (Constant.API_CODE_1104.equals(inteId)) {
Gd2022Api1104 api1104 = new Gd2022Api1104();
BeanUtils.copyProperties(data, api1104);
changeObject(api1104);
+ api1104.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1104);
}
if (Constant.API_CODE_1105.equals(inteId)) {
Gd2022Api1105 api1105 = new Gd2022Api1105();
BeanUtils.copyProperties(data, api1105);
+ api1105.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1105);
+ }
+ if (Constant.API_CODE_1106.equals(inteId)) {
+ Api1106 api1106 = (Api1106) data;
+ api1106.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1106);
+ }
+ if (Constant.API_CODE_1107.equals(inteId)) {
+ Api1107 api1107 = (Api1107) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1107.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
+ api1107.setTykqbm(tykqbm);
+ }
+ api1107.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1107);
+ }
+ if (Constant.API_CODE_1108.equals(inteId)) {
+ Api1108 api1108 = (Api1108) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1108.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
+ api1108.setTykqbm(tykqbm);
+ }
+ api1108.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1108);
}
if (Constant.API_CODE_1109.equals(inteId)) {
//灏佽鏁版嵁
@@ -346,25 +375,281 @@
System.out.println((String) responseDto.getData());
//璁剧疆涓婁紶鏂囦欢id
api1109.setFileStorageId((String) responseDto.getData());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1109.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
+ api1109.setTykqbm(tykqbm);
+ }
+ api1109.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1109);
+ }
+ if (Constant.API_CODE_1110.equals(inteId)) {
+ Api1110 api1110 = (Api1110) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1110.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
+ api1110.setTyhwbm(tyhwbm);
+ }
+ api1110.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1110);
}
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());
+ Api1102 api1102List = api1102Rep.findDataByKqdm(api1111.getKqdm());
+ if (null != api1102List) {
+ api1111.setKqmc(api1102List.getKqmc());
+ if (StringUtils.isEmpty(api1111.getTykqbm())) {
+ api1111.setTykqbm(api1102List.getTykqbm());
+ }
}
- List<Api1101> api1101List = api1101Rep.findDataByDwdm(api1111.getDwdm());
- if(null != api1101List && api1101List.size() > 0){
- api1111.setDwmc(api1101List.get(0).getDwmc());
+ Api1101 api1101List = api1101Rep.findData(api1111.getDwdm());
+ if (null != api1101List) {
+ api1111.setDwmc(api1101List.getDwmc());
}
+ api1111.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1111);
+ }
+ if (Constant.API_CODE_1112.equals(inteId)) {
+ Api1112 api1112 = (Api1112) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1112.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1112.getDwdm());
+ api1112.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1112.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1112.getKqdm());
+ api1112.setTykqbm(tykqbm);
+ }
+ api1112.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1112);
+ }
+ if (Constant.API_CODE_1113.equals(inteId)) {
+ Api1113 api1113 = (Api1113) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1113.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
+ api1113.setTydwbm(tydwbm);
+ }
+ api1113.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1113);
+ }
+ if (Constant.API_CODE_1201.equals(inteId)) {
+ Api1201 apiData = (Api1201) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1202.equals(inteId)) {
+ Api1202 apiData = (Api1202) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1203.equals(inteId)) {
+ Api1203 apiData = (Api1203) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1204.equals(inteId)) {
+ Api1204 apiData = (Api1204) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1205.equals(inteId)) {
+ Api1205 apiData = (Api1205) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1206.equals(inteId)) {
+ Api1206 apiData = (Api1206) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18));
+ apiData.setTydwbm(tydwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1207.equals(inteId)) {
+ Api1207 apiData = (Api1207) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getDckqtybm())) {
+ String dckqtybm = apiCommonService.getTykqbm(apiData.getDcdw());
+ apiData.setDckqtybm(dckqtybm);
+ }
+ if (StringUtils.isEmpty(apiData.getDrkqtybm())) {
+ String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
+ apiData.setDrkqtybm(drkqtybm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getDchwtybm())) {
+ String dchwtybm = apiCommonService.getTyhwbm(apiData.getDchwdm());
+ apiData.setDchwtybm(dchwtybm);
+ }
+ if (StringUtils.isEmpty(apiData.getDrhwtybm())) {
+ String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
+ apiData.setDrhwtybm(drhwtybm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1208.equals(inteId)) {
Gd2022Api1208 api1208 = new Gd2022Api1208();
BeanUtils.copyProperties(data, api1208);
+ //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
+ if (null == api1208.getBclbs()) {
+ api1208.setBclbs(0);
+ }
+ if ("2".equals(api1208.getClfs()) && api1208.getBclbs() == 0) {
+ api1208.setBclbs((int) (api1208.getSjsl() / 25));
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1208.getLqgstydwbm())) {
+ String lqgstydwbm = apiCommonService.getTydwbm(api1208.getLqgsdwdm());
+ api1208.setLqgstydwbm(lqgstydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1208.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
+ api1208.setTyhwbm(tyhwbm);
+ }
return JSON.toJSONString(api1208);
+ }
+ if (Constant.API_CODE_1209.equals(inteId)) {
+ Api1209 apiData = (Api1209) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1210.equals(inteId)) {
+ Gd2022Api1210 api1210 = new Gd2022Api1210();
+ BeanUtils.copyProperties(data, api1210);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1210.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
+ api1210.setTyhwbm(tyhwbm);
+ }
+ api1210.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1210);
+ }
+ if (Constant.API_CODE_1211.equals(inteId)) {
+ Api1211 apiData = (Api1211) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1212.equals(inteId)) {
+ Api1212 apiData = (Api1212) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1301.equals(inteId)) {
+ Api1301 apiData = (Api1301) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1302.equals(inteId)) {
+ Api1302 apiData = (Api1302) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1303.equals(inteId)) {
+ Api1303 apiData = (Api1303) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1304.equals(inteId)) {
+ Api1304 apiData = (Api1304) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1305.equals(inteId)) {
+ Api1305 apiData = (Api1305) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1306.equals(inteId)) {
+ Api1306 apiData = (Api1306) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1307.equals(inteId)) {
//灏佽鏁版嵁
@@ -378,6 +663,22 @@
GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1307.getWjdz());
//璁剧疆涓婁紶鏂囦欢id
api1307.setFileStorageId((String) responseDto.getData());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1307.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
+ api1307.setTykqbm(tykqbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1307.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(api1307.getCfdm());
+ api1307.setTycfbm(tycfbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1307.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
+ api1307.setTyhwbm(tyhwbm);
+ }
+ api1307.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1307);
}
if (Constant.API_CODE_1308.equals(inteId)) {
@@ -392,7 +693,44 @@
GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1308.getWjdz());
//璁剧疆涓婁紶鏂囦欢id
api1308.setFileStorageId((String) responseDto.getData());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1308.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
+ api1308.setTykqbm(tykqbm);
+ }
+ api1308.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1308);
+ }
+ if (Constant.API_CODE_1309.equals(inteId)) {
+ Api1309 apiData = (Api1309) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getWgdwtybm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
+ apiData.setWgdwtybm(tydwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1310.equals(inteId)) {
+ Gd2022Api1310 api1310 = new Gd2022Api1310();
+ BeanUtils.copyProperties(data, api1310);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1310.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
+ api1310.setTyhwbm(tyhwbm);
+ }
+ api1310.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1310);
+ }
+ if (Constant.API_CODE_1401.equals(inteId)) {
+ Api1401 apiData = (Api1401) data;
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1402.equals(inteId)) {
+ Api1402 apiData = (Api1402) data;
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1403.equals(inteId)) {
//杞崲璁″垝锛屽崟鐙煡璇㈣疆鎹㈣鍒掓槑缁嗕俊鎭紝缁熶竴灏佽鍚庝笂浼�
@@ -402,30 +740,90 @@
Gd2022Api1404 gd2022Api1404;
List<Gd2022Api1404> dtls = new ArrayList<>();
Double lrsl = 0.0, lcsl = 0.0; //鐢ㄤ簬缁熻杞叆鏁伴噺鍜岃疆鍑烘暟閲�
- if(null != list && list.size() > 0){
+ if (null != list && list.size() > 0) {
for (Api1404 api1404 : list) {
gd2022Api1404 = new Gd2022Api1404();
BeanUtils.copyProperties(api1404, gd2022Api1404);
- if(null!= gd2022Api1404.getLhlx() && "2".equals(gd2022Api1404.getLhlx())){
+ if (null != gd2022Api1404.getLhlx() && "2".equals(gd2022Api1404.getLhlx())) {
lrsl += gd2022Api1404.getLhsl();
}
- if(null!= gd2022Api1404.getLhlx() && "1".equals(gd2022Api1404.getLhlx())){
+ if (null != gd2022Api1404.getLhlx() && "1".equals(gd2022Api1404.getLhlx())) {
lcsl += gd2022Api1404.getLhsl();
}
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(gd2022Api1404.getLhhwtybm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(gd2022Api1404.getLhhwdm());
+ gd2022Api1404.setLhhwtybm(tyhwbm);
+ }
+ gd2022Api1404.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
dtls.add(gd2022Api1404);
}
}
+
api1403.setRotationInQty(lrsl);
api1403.setRotationOutQty(lcsl);
api1403.setDtls(dtls);
+ //鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
+ GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1403.getWjdz());
+ //璁剧疆涓婁紶鏂囦欢id
+ api1403.setFileStorageId((String) responseDto.getData());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1403.getJhxddwtybm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1403.getJhxddw());
+ api1403.setJhxddwtybm(tydwbm);
+ }
+ api1403.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1403);
}
if (Constant.API_CODE_1404.equals(inteId)) {
//杞崲璁″垝鏄庣粏锛屼笉鍗曠嫭涓婁紶锛屽湪杞崲璁″垝涓粺涓�涓婁紶
return null;
}
-
-// changeObject(data);
+ if (Constant.API_CODE_1405.equals(inteId)) {
+ Api1405 apiData = (Api1405) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getXmdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_9201.equals(inteId)) {
+ Api9201 apiData = (Api9201) data;
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (ApiCodeConstant.API_2001.equals(inteId)) {
+ Gd2022Api2001 apiData = (Gd2022Api2001) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
+ apiData.setTyajbm(tyajbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (ApiCodeConstant.API_2002.equals(inteId)) {
+ Gd2022Api2002 apiData = (Gd2022Api2002) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
+ apiData.setTyajbm(tyajbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
return JSON.toJSONString(data);
}
@@ -436,10 +834,20 @@
GDFinanceDto gdFinanceDto = new GDFinanceDto();
gdFinanceDto.setDwdm(api1503.getDwdm());
gdFinanceDto.setKqdm(api1503.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(gdFinanceDto.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(gdFinanceDto.getDwdm());
+ gdFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(gdFinanceDto.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(gdFinanceDto.getKqdm());
+ gdFinanceDto.setTykqbm(tykqbm);
+ }
gdFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
gdFinanceDto.setBbm("03");
gdFinanceDto.setCzbz(api1503.getCzbz());
- gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1503.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+ gdFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
paddingData(gdFinanceDto, list, 1, "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
paddingData(gdFinanceDto, list, 2, "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
@@ -488,10 +896,20 @@
GDFinanceDto gdFinanceDto = new GDFinanceDto();
gdFinanceDto.setDwdm(api1502.getDwdm());
gdFinanceDto.setKqdm(api1502.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(gdFinanceDto.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(gdFinanceDto.getDwdm());
+ gdFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(gdFinanceDto.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(gdFinanceDto.getKqdm());
+ gdFinanceDto.setTykqbm(tykqbm);
+ }
gdFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
gdFinanceDto.setBbm("02");
gdFinanceDto.setCzbz(api1502.getCzbz());
- gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1502.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+ gdFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
paddingData(gdFinanceDto, list, 1, "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
paddingData(gdFinanceDto, list, 2, "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
@@ -541,10 +959,20 @@
GDFinanceDto gdFinanceDto = new GDFinanceDto();
gdFinanceDto.setDwdm(api1501.getDwdm());
gdFinanceDto.setKqdm(api1501.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(gdFinanceDto.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(gdFinanceDto.getDwdm());
+ gdFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(gdFinanceDto.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(gdFinanceDto.getKqdm());
+ gdFinanceDto.setTykqbm(tykqbm);
+ }
gdFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
gdFinanceDto.setBbm("01");
gdFinanceDto.setCzbz(api1501.getCzbz());
- gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1501.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+ gdFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
paddingData(gdFinanceDto, list, 1, "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
paddingData(gdFinanceDto, list, 2, "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
@@ -625,12 +1053,7 @@
return list;
}
- private void paddingData(GDFinanceDto common,
- List<GDFinanceDto> list,
- Integer zbxh,
- String zbmc,
- String zbz1,
- String zbz2) {
+ private void paddingData(GDFinanceDto common, List<GDFinanceDto> list, Integer zbxh, String zbmc, String zbz1, String zbz2) {
GDFinanceDto gdFinanceDto = new GDFinanceDto();
BeanUtils.copyProperties(common, gdFinanceDto);
gdFinanceDto.setZbxh(zbxh);
@@ -668,7 +1091,7 @@
case "1112":
return ApiCodeConstant.API_CODE_RYXX;
case "1113":
- return "";
+ return ApiCodeConstant.API_CODE_QYXYXX;
case "1201":
return ApiCodeConstant.API_CODE_HTXX;
case "1202":
@@ -729,8 +1152,17 @@
return ApiCodeConstant.API_CODE_CWBBXX;
case "1503":
return ApiCodeConstant.API_CODE_CWBBXX;
+ case "9201":
+ return ApiCodeConstant.API_CODE_XZBA;
default:
return inteId;
}
}
+
+
+ @Override
+ public ResponseDto pullData(ApiParam param, ApiConfs conf) {
+ //璇ュ崗璁棤姝ゅ疄鐜�
+ return null;
+ }
}
--
Gitblit v1.9.3