From 86d368337175a7d7eed5e9330bd80a838ab4f396 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 09 十一月 2023 17:25:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 100 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 90 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 3a84775..b007083 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -19,6 +19,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.lang.reflect.Field;
import java.util.*;
@@ -45,6 +46,8 @@
private Api1102Rep api1102Rep;
@Autowired
private Api1104Rep api1104Rep;
+ @Autowired
+ private Api1208Rep api1208Rep;
@Autowired
private Api1109Rep api1109Rep;
@Autowired
@@ -110,7 +113,7 @@
//鑾峰彇鎸囦护id
String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
OrderData orderData = (OrderData) redisUtil.get(key);
- if (StringUtils.isEmpty(orderData.getOrderid())) {
+ if (null == orderData || StringUtils.isEmpty(orderData.getOrderid())) {
log.error("鎸囦护id澶辨晥=" + jsonData);
ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
apiLog.setStatus(99);
@@ -154,6 +157,7 @@
/**
* 杞负JSON
+ *
* @param inteId
* @param data
* @param code
@@ -177,6 +181,7 @@
/**
* 甯歌鎺ュ彛灏佽
+ *
* @param inteId
* @param data
* @param code
@@ -264,7 +269,11 @@
Map<String, String> map = new HashMap<>();
map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
api1109.setWjl(JSON.toJSONString(map));
-
+ //涓婃捣甯傚钩鍙版枃浠跺悕绉拌鍒欙細搴撳尯缂栫爜_涓氬姟娴佹按鍙穇鍒嗙被鐮乢椤哄簭鐮�.jpg锛屼緥濡傦細91310114703439394M001_142211080101_GL_00.jpg
+ String[] split = api1109.getWjmc().split(".");
+ if (split.length == 2) {
+ api1109.setWjmc(split[0] + "_00" + split[1]);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1109);
return api1109;
@@ -315,7 +324,14 @@
BeanUtils.copyProperties(data, api1201);
api1201.setBjw(ShAreaBjw.getBjw(code));
api1201.setHtsfzz("0");
-
+ //鍚堝悓绛捐鍦扮偣涓嶈兘涓虹┖鎴栧～鏃�
+ if (StringUtils.isEmpty(api1201.getQddd())) {
+ api1201.setQddd("绛捐鍦扮偣");
+ }
+ //鍚堝悓瀹℃牳浜轰笉鑳戒负绌烘垨濉棤
+ if (StringUtils.isEmpty(api1201.getShr())) {
+ api1201.setShr("瀹℃壒浜�");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1201);
return api1201;
@@ -327,7 +343,18 @@
api1202.setBjw(ShAreaBjw.getBjw(code));
api1202.setPch(apiData.getHwdm() + apiData.getShnd());
api1202.setJzrq(apiData.getCmsj());
-
+ if (StringUtils.isEmpty(api1202.getCddm())) {
+ api1202.setCddm(api1202.getHwdm().substring(2, 8));
+ }
+ if (StringUtils.isEmpty(api1202.getHth())) {
+ api1202.setHth("鏃�");
+ }
+ if (StringUtils.isEmpty(api1202.getJhmxh())) {
+ api1202.setJhmxh("璁″垝鏄庣粏鍙�");
+ }
+ if (StringUtils.isEmpty(api1202.getRkjsdh())) {
+ api1202.setRkjsdh("0");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1202);
return api1202;
@@ -340,6 +367,18 @@
//鏌ヨ鏀惰幏骞翠唤
List<Api1202> api1202List = api1202Rep.getDataById(apiData.getRkywdh());
api1203.setPch(apiData.getHwdm() + api1202List.get(0).getShnd());
+ if (StringUtils.isEmpty(api1203.getJyxm())) {
+ api1203.setJyxm("0");
+ }
+ if (StringUtils.isEmpty(api1203.getJyz())) {
+ api1203.setJyz("0");
+ }
+ if (StringUtils.isEmpty(api1203.getZkj())) {
+ api1203.setZkj("0");
+ }
+ if (StringUtils.isEmpty(api1203.getZkl())) {
+ api1203.setZkl("0");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1203);
return api1203;
@@ -363,7 +402,18 @@
api1205.setBjw(ShAreaBjw.getBjw(code));
api1205.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getCmsj(), "yyyy"));
api1205.setJzrq(apiData.getCmsj());
-
+ if (StringUtils.isEmpty(api1205.getCddm())) {
+ api1205.setCddm(api1205.getHwdm().substring(2, 8));
+ }
+ if (StringUtils.isEmpty(api1205.getHth())) {
+ api1205.setHth("鏃�");
+ }
+ if (StringUtils.isEmpty(api1205.getJhmxh())) {
+ api1205.setJhmxh("璁″垝鏄庣粏鍙�");
+ }
+ if (StringUtils.isEmpty(api1205.getCkjsdh())) {
+ api1205.setCkjsdh("0");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1205);
return api1205;
@@ -403,7 +453,9 @@
api1208.setBjw(ShAreaBjw.getBjw(code));
api1208.setPch(apiData.getHwdm() + apiData.getShnd());
-
+ if (StringUtils.isEmpty(api1208.getCd())) {
+ api1208.setCd(api1208.getHwdm().substring(2, 8));
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1208);
return api1208;
@@ -516,7 +568,9 @@
//涓婃捣閫氶浣滀笟鍗曞彿锛氬粧闂翠唬鐮�+yyyyMMdd+3浣嶉『搴忓彿
api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
api1305.setTfzydh(apiData.getTfzydh().substring(0, 28) + apiData.getTfzydh().substring(30));
-
+ if (StringUtils.isEmpty(api1305.getTfmd())) {
+ api1305.setTfmd("1"); //闄嶆俯閫氶
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1305);
return api1305;
@@ -530,7 +584,9 @@
api1306.setAjdm(apiData.getHwdm().substring(0, 28));
//涓婃捣鐔忚捀浣滀笟鍗曞彿锛氳揣浣嶄唬鐮�+yyyyMMdd + 3浣嶉『搴忓彿
api1306.setXzzydh(apiData.getHwdm() + apiData.getBizId());
-
+ if (StringUtils.isEmpty(api1306.getSyff())) {
+ api1306.setSyff("0"); //娼В娉�
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1306);
return api1306;
@@ -576,8 +632,32 @@
BeanUtils.copyProperties(apiData, api1310);
api1310.setBjw(ShAreaBjw.getBjw(code));
api1310.setJyrq(apiData.getJysj());
- api1310.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));
-
+ if (StringUtils.isEmpty(api1310.getJyxm())) {
+ api1310.setJyxm("0");
+ }
+ if (StringUtils.isEmpty(api1310.getJyxmz())) {
+ api1310.setJyxmz("0");
+ }
+ String lsxzdm = "122";
+ List<Api1208> api1208List = api1208Rep.getDataByHwdm(api1310.getHwdm());
+ if(null != api1208List && api1208List.size() > 0){
+ if(StringUtils.isNotEmpty(api1208List.get(0).getLsxzdm())){
+ lsxzdm = api1208List.get(0).getLsxzdm();
+ }
+ }
+ api1310.setLsxzdm(lsxzdm);
+ if (api1310.getYpsl() == 0.0){
+ api1310.setYpsl(5.0);
+ }
+ if(StringUtils.isEmpty(api1310.getQyrxm())){
+ api1310.setQyrxm("鎵︽牱浜�");
+ }
+ if(StringUtils.isEmpty(api1310.getJdrxm())){
+ api1310.setJdrxm("鐩戠潱浜�");
+ }
+ if(StringUtils.isEmpty(api1310.getShrxm())){
+ api1310.setShrxm("瀹℃牳浜�");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1310);
return api1310;
--
Gitblit v1.9.3