From 111f952ebe91c261fa418be96226e1fa01865e3b Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 11 十一月 2023 20:37:52 +0800
Subject: [PATCH] 优化上海接口信息
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 87 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index b007083..4b2c9dc 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -43,6 +43,8 @@
@Autowired
private ApiLogRep apiLogRep;
@Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
private Api1102Rep api1102Rep;
@Autowired
private Api1104Rep api1104Rep;
@@ -54,6 +56,8 @@
private Api1202Rep api1202Rep;
@Autowired
private Api1205Rep api1205Rep;
+ @Autowired
+ private Api1404Rep api1404Rep;
@Override
public String getProtocol() {
@@ -138,7 +142,7 @@
reqData.setData(ShRSAUtils.encryptByPubKey(jsonData, conf.getPublicKey()));
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigst(MyMD5Util.encrypt(jsonData));
-
+ log.info("涓婃姤鏁版嵁淇℃伅=" + JSON.toJSONString(reqData));
SH2023RespDto responseDto = SH2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData), conf);
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
@@ -270,10 +274,7 @@
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]);
- }
+ api1109.setWjmc(getWjmc(api1109.getWjlx(), api1109.getWjmc()));
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1109);
return api1109;
@@ -341,7 +342,6 @@
Api1202 apiData = (Api1202) data;
BeanUtils.copyProperties(apiData, api1202);
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));
@@ -355,6 +355,15 @@
if (StringUtils.isEmpty(api1202.getRkjsdh())) {
api1202.setRkjsdh("0");
}
+
+ //璁剧疆绮杞崲骞村害
+ List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
+ if(null != api1404List && api1404List.size() >0){
+ api1202.setLhnd(api1404List.get(0).getShnd());
+ }
+
+ //璁剧疆鎵规鍙�
+ api1202.setPch(apiData.getHwdm() + apiData.getShnd());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1202);
return api1202;
@@ -364,9 +373,6 @@
Api1203 apiData = (Api1203) data;
BeanUtils.copyProperties(apiData, api1203);
api1203.setBjw(ShAreaBjw.getBjw(code));
- //鏌ヨ鏀惰幏骞翠唤
- List<Api1202> api1202List = api1202Rep.getDataById(apiData.getRkywdh());
- api1203.setPch(apiData.getHwdm() + api1202List.get(0).getShnd());
if (StringUtils.isEmpty(api1203.getJyxm())) {
api1203.setJyxm("0");
}
@@ -379,6 +385,10 @@
if (StringUtils.isEmpty(api1203.getZkl())) {
api1203.setZkl("0");
}
+ //璁剧疆鎵规鍙�
+ List<Api1202> api1202List = api1202Rep.getDataById(apiData.getRkywdh());
+ api1203.setPch(apiData.getHwdm() + api1202List.get(0).getShnd());
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1203);
return api1203;
@@ -388,6 +398,9 @@
Api1204 apiData = (Api1204) data;
BeanUtils.copyProperties(apiData, api1204);
api1204.setBjw(ShAreaBjw.getBjw(code));
+
+ //TODO 鏌ヨ鍚堝悓鑾峰彇鎵规鍙�
+ //璁剧疆鎵规鍙�
api1204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJssj(), "yyyy"));
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -400,7 +413,7 @@
Api1205 apiData = (Api1205) data;
BeanUtils.copyProperties(apiData, api1205);
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));
@@ -414,6 +427,16 @@
if (StringUtils.isEmpty(api1205.getCkjsdh())) {
api1205.setCkjsdh("0");
}
+
+ //璁剧疆绮杞崲骞村害
+ List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
+ if(null != api1404List && api1404List.size() >0){
+ api1205.setLhnd(api1404List.get(0).getShnd());
+ }
+
+ //璁剧疆鎵规鍙�
+ api1205.setPch(apiData.getHwdm() + apiData.getShnd());
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1205);
return api1205;
@@ -423,8 +446,9 @@
Api1206 apiData = (Api1206) data;
BeanUtils.copyProperties(apiData, api1206);
api1206.setBjw(ShAreaBjw.getBjw(code));
- List<Api1205> api1205List = api1205Rep.getDataById(apiData.getCkjsdh());
- api1206.setPch(api1205List.get(0).getHwdm() + DateFormatUtils.format(api1205List.get(0).getCmsj(), "yyyy"));
+// List<Api1205> api1205List = api1205Rep.getDataById(apiData.getCkjsdh());
+ //璁剧疆鎵规鍙�
+// api1206.setPch(api1205List.get(0).getHwdm() + DateFormatUtils.format(api1205List.get(0).getCmsj(), "yyyy"));
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1206);
@@ -452,6 +476,7 @@
api1208.setZglkdm(api1208.getHwdm().substring(0, 21));
api1208.setBjw(ShAreaBjw.getBjw(code));
+ //璁剧疆鎵规鍙�
api1208.setPch(apiData.getHwdm() + apiData.getShnd());
if (StringUtils.isEmpty(api1208.getCd())) {
api1208.setCd(api1208.getHwdm().substring(2, 8));
@@ -597,8 +622,6 @@
BeanUtils.copyProperties(apiData, api1307);
api1307.setBjw(ShAreaBjw.getBjw(code));
api1307.setAjdm(apiData.getHwdm().substring(0, 28));
- List<Api1109> api1109List = api1109Rep.getDataByFileId(apiData.getFileStorageId());
- api1307.setTxbh(api1109List.get(0).getWjmc());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1307);
@@ -610,9 +633,6 @@
BeanUtils.copyProperties(apiData, api1308);
api1308.setBjw(ShAreaBjw.getBjw(code));
- List<Api1109> api1109List = api1109Rep.getDataByFileId(apiData.getFileStorageId());
- api1308.setTxbh(api1109List.get(0).getWjmc());
- api1308.setSpbh(api1109List.get(0).getWjmc());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1308);
@@ -632,6 +652,7 @@
BeanUtils.copyProperties(apiData, api1310);
api1310.setBjw(ShAreaBjw.getBjw(code));
api1310.setJyrq(apiData.getJysj());
+
if (StringUtils.isEmpty(api1310.getJyxm())) {
api1310.setJyxm("0");
}
@@ -639,12 +660,16 @@
api1310.setJyxmz("0");
}
String lsxzdm = "122";
+ String pch = apiData.getHwdm() + DateFormatUtils.format(new Date(), "yyyy");
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();
+ pch = apiData.getHwdm() + api1208List.get(0).getShnd();
}
}
+ //璁剧疆鎵规鍙�
+ api1310.setPch(pch);
api1310.setLsxzdm(lsxzdm);
if (api1310.getYpsl() == 0.0){
api1310.setYpsl(5.0);
@@ -658,9 +683,19 @@
if(StringUtils.isEmpty(api1310.getShrxm())){
api1310.setShrxm("瀹℃牳浜�");
}
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1310);
return api1310;
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1311.equals(inteId)) {
+ SH2023Api1311 api1311 = new SH2023Api1311();
+ BeanUtils.copyProperties(data, api1311);
+ api1311.setBjw(ShAreaBjw.getBjw(code));
+
+ //璁剧疆绌哄睘鎬т负榛樿鍊�
+ changeObject(api1311);
+ return api1311;
}
if (SH2023Constant.SH_2023_API_CODE_1401.equals(inteId)) {
SH2023Api1401 api1401 = new SH2023Api1401();
@@ -684,8 +719,10 @@
SH2023Api1403 api1403 = new SH2023Api1403();
Api1403 apiData = (Api1403) data;
BeanUtils.copyProperties(apiData, api1403);
- api1403.setJhzxdw(apiData.getJhxddw());
- api1403.setJhzxdwmc(apiData.getJhxddwmc());
+ List<Api1101> api1101List = api1101Rep.findDataByDwdm(apiData.getLhjhdh().substring(0, 18));
+
+ api1403.setJhzxdw(api1101List.get(0).getDwdm());
+ api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
api1403.setBjw(ShAreaBjw.getBjw(code));
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -740,6 +777,18 @@
return data;
}
+ private String getWjmc(String wjlx, String wjmc){
+ if("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)){
+ if(wjmc.endsWith(".jpg")) {
+ wjmc = wjmc.replaceAll(".jpg", "_00.jpg");
+ }
+ if(wjmc.endsWith(".png")) {
+ wjmc = wjmc.replaceAll(".png", "_00.png");
+ }
+ }
+ return wjmc;
+ }
+
/**
* 鑾峰彇璐㈠姟鏁版嵁json
*
--
Gitblit v1.9.3