From 13391e649a65a374e390066a35b52c61a6feaa3f Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 14 十一月 2023 21:19:40 +0800
Subject: [PATCH] 调整心跳指令返回
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 208 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 158 insertions(+), 50 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..52c60e7 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -43,7 +43,11 @@
@Autowired
private ApiLogRep apiLogRep;
@Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
private Api1102Rep api1102Rep;
+ @Autowired
+ private Api1103Rep api1103Rep;
@Autowired
private Api1104Rep api1104Rep;
@Autowired
@@ -54,6 +58,8 @@
private Api1202Rep api1202Rep;
@Autowired
private Api1205Rep api1205Rep;
+ @Autowired
+ private Api1404Rep api1404Rep;
@Override
public String getProtocol() {
@@ -138,7 +144,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());
@@ -217,6 +223,21 @@
if (SH2023Constant.SH_2023_API_CODE_1104.equals(inteId)) {
SH2023Api1104 api1104 = new SH2023Api1104();
Api1104 apiData = (Api1104) data;
+
+ //鏌ヨ浠撴埧淇℃伅
+ List<Api1103> api1103List = api1103Rep.findPushDataByCfdm(apiData.getCfbh());
+ List<Api1104> api1104List = api1104Rep.findDataByCfbh(apiData.getCfbh());
+ int num = 2;
+ if (null != api1104List && api1104List.size() > 0) {
+ num = api1104List.size();
+ }
+ if (null != api1103List && api1103List.size() > 0) {
+ Api1103 api1103 = api1103List.get(0);
+ BeanUtils.copyProperties(api1103, api1104);
+ api1104.setCwc(api1103.getCwc() / num);
+ api1104.setCnc(api1103.getCnc() / num);
+ api1104.setSjcr(api1103.getSjcr() / num);
+ }
BeanUtils.copyProperties(apiData, api1104);
api1104.setAjdm(apiData.getAjdh());
api1104.setCfdm(apiData.getCfbh());
@@ -270,10 +291,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,19 +359,24 @@
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));
}
- if (StringUtils.isEmpty(api1202.getHth())) {
- api1202.setHth("鏃�");
- }
- if (StringUtils.isEmpty(api1202.getJhmxh())) {
- api1202.setJhmxh("璁″垝鏄庣粏鍙�");
- }
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());
+ }
+
+ //璁剧疆鎵规鍙�
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1202.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1202.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1202);
@@ -364,9 +387,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 +399,12 @@
if (StringUtils.isEmpty(api1203.getZkl())) {
api1203.setZkl("0");
}
+ //璁剧疆鎵规鍙�
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1203.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1203.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1203);
return api1203;
@@ -388,7 +414,23 @@
Api1204 apiData = (Api1204) data;
BeanUtils.copyProperties(apiData, api1204);
api1204.setBjw(ShAreaBjw.getBjw(code));
- api1204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJssj(), "yyyy"));
+
+ //璁剧疆鎵规鍙�
+ if (StringUtils.isNotEmpty(api1204.getHth())) {
+ List<Api1202> api1202List = api1202Rep.getDataByRkjsdh(api1204.getRkjsdh());
+ if (null != api1202List && api1202List.size() > 0) {
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1202List.get(0).getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1204.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
+ }
+ }
+ }
+ if (StringUtils.isNotEmpty(api1204.getHwdm())) {
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1204.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1204.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
+ }
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1204);
@@ -400,20 +442,27 @@
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));
}
- if (StringUtils.isEmpty(api1205.getHth())) {
- api1205.setHth("鏃�");
- }
- if (StringUtils.isEmpty(api1205.getJhmxh())) {
- api1205.setJhmxh("璁″垝鏄庣粏鍙�");
- }
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());
+ }
+
+ //璁剧疆鎵规鍙�
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1205.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1205);
return api1205;
@@ -423,14 +472,22 @@
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"));
-
+ //鎵规鍙�
+ if (StringUtils.isNotEmpty(api1206.getHth())) {
+ List<Api1205> api1205List = api1205Rep.getDataByCkjsdh(api1206.getCkjsdh());
+ if (null != api1205List && api1205List.size() > 0) {
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1205List.get(0).getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1206.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
+ }
+ }
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1206);
return api1206;
}
if (SH2023Constant.SH_2023_API_CODE_1207.equals(inteId)) {
+ //鍊掍粨鍊掑嚭
SH2023Api1207 api1207 = new SH2023Api1207();
Api1207 apiData = (Api1207) data;
BeanUtils.copyProperties(apiData, api1207);
@@ -438,8 +495,10 @@
api1207.setDcrq(apiData.getDcrq());
api1207.setBjw(ShAreaBjw.getBjw(code));
- api1207.setPch(apiData.getDchwdm() + DateFormatUtils.format(apiData.getDcrq(), "yyyy"));
- api1207.setKddh(apiData.getDcdh().substring(21, 33));
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1207.getDchwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1207.setPch(api1207.getDchwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1207);
@@ -452,6 +511,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));
@@ -471,7 +531,10 @@
api1209.setZrshde(apiData.getQzzrshde());
api1209.setBjw(ShAreaBjw.getBjw(code));
api1209.setJzrq(apiData.getYwrq());
- api1209.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyy"));
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1209.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1209);
@@ -483,7 +546,10 @@
BeanUtils.copyProperties(apiData, api1210);
api1210.setBjw(ShAreaBjw.getBjw(code));
- api1210.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getHzrq(), "yyyy"));
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1210.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1210.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1210);
@@ -497,7 +563,10 @@
api1211.setZglkdm(api1211.getKqdm());
api1211.setBjw(ShAreaBjw.getBjw(code));
api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM"));
- api1211.setZglkdm(apiData.getKqdm());
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1211.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1211.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1211);
@@ -526,12 +595,16 @@
Api1302 apiData = (Api1302) data;
BeanUtils.copyProperties(apiData, api1302);
api1302.setBjw(ShAreaBjw.getBjw(code));
- api1302.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJcsj(), "yyyy"));
api1302.setCpjw(String.valueOf(apiData.getLspjw()));
api1302.setCzgw(String.valueOf(apiData.getLspjw()));
api1302.setCzdw(String.valueOf(apiData.getLspjw()));
api1302.setGfwjw(String.valueOf(apiData.getLspjw()));
api1302.setLwmx(apiData.getLswdzjh());
+
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1302.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1302.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1302);
@@ -542,8 +615,10 @@
Api1303 apiData = (Api1303) data;
BeanUtils.copyProperties(apiData, api1303);
api1303.setBjw(ShAreaBjw.getBjw(code));
- api1303.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJcsj(), "yyyy"));
-
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1303.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1303.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1303);
return api1303;
@@ -553,7 +628,10 @@
Api1304 apiData = (Api1304) data;
BeanUtils.copyProperties(apiData, api1304);
api1304.setBjw(ShAreaBjw.getBjw(code));
- api1304.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJcsj(), "yyyy"));
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1304.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1304.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1304);
@@ -597,8 +675,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 +686,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 +705,7 @@
BeanUtils.copyProperties(apiData, api1310);
api1310.setBjw(ShAreaBjw.getBjw(code));
api1310.setJyrq(apiData.getJysj());
+
if (StringUtils.isEmpty(api1310.getJyxm())) {
api1310.setJyxm("0");
}
@@ -639,28 +713,42 @@
api1310.setJyxmz("0");
}
String lsxzdm = "122";
+ String pch = "";
List<Api1208> api1208List = api1208Rep.getDataByHwdm(api1310.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
- if(StringUtils.isNotEmpty(api1208List.get(0).getLsxzdm())){
+ 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){
+ if (api1310.getYpsl() == 0.0) {
api1310.setYpsl(5.0);
}
- if(StringUtils.isEmpty(api1310.getQyrxm())){
+ if (StringUtils.isEmpty(api1310.getQyrxm())) {
api1310.setQyrxm("鎵︽牱浜�");
}
- if(StringUtils.isEmpty(api1310.getJdrxm())){
+ if (StringUtils.isEmpty(api1310.getJdrxm())) {
api1310.setJdrxm("鐩戠潱浜�");
}
- if(StringUtils.isEmpty(api1310.getShrxm())){
+ 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 +772,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));
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -708,9 +798,15 @@
return data;
}
if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
+ SH2023Api2102 apiData = new SH2023Api2102();
+ BeanUtils.copyProperties(data, apiData);
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getDrhwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ apiData.setPch(apiData.getDrhwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
- changeObject(data);
- return data;
+ changeObject(apiData);
+ return apiData;
}
if (SH2023Constant.SH_2023_API_CODE_2103.equals(inteId)) {
SH2023Api2103 apiData = new SH2023Api2103();
@@ -740,6 +836,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