From d1b7f2eb67cd87edc4b5eb11def5acba07c75698 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 21 十二月 2023 15:09:27 +0800
Subject: [PATCH] 根据上海新接口规则进行调整
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index eb1dd66..5671e74 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -54,6 +54,8 @@
@Autowired
private Api1208Rep api1208Rep;
@Autowired
+ private Api1210Rep api1210Rep;
+ @Autowired
private Api1109Rep api1109Rep;
@Autowired
private Api1202Rep api1202Rep;
@@ -195,14 +197,11 @@
return responseDto;
}
- //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
- List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
//灏佽鏁版嵁
SH2023PullReqDto reqData = new SH2023PullReqDto();;
reqData.setName(conf.getUserName());
reqData.setPwd(conf.getAppCode());
-
log.info("鎷夊彇鍏变韩鏁版嵁璇锋眰淇℃伅=" + JSON.toJSONString(reqData));
String url = conf.getApiUrl().replace("UPLOAD", "Shared");
@@ -243,7 +242,6 @@
list.add(object);
return JSON.toJSONString(list);
}
-
}
/**
@@ -255,7 +253,6 @@
* @return
*/
private Object getJsonApiData(String inteId, Object data, String code) {
- List<Object> list = new ArrayList<>();
//鍏蜂綋鏍规嵁鎺ュ彛杩涜灏佽
if (SH2023Constant.SH_2023_API_CODE_1101.equals(inteId)) {
SH2023Api1101 api1101 = new SH2023Api1101();
@@ -302,7 +299,12 @@
BeanUtils.copyProperties(apiData, api1104);
api1104.setAjdm(apiData.getAjdh());
api1104.setCfdm(apiData.getCfbh());
- api1104.setLsxzdm("122");
+
+ //璁剧疆绮鎬ц川浠ｇ爜(鏌ョ湅寤掗棿瀵瑰簲鐨勬渶鏂板簱瀛樿繘琛岃祴鍊�)
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1104.getAjdm() + "01");
+ if (null != api1208List && api1208List.size() > 0) {
+ api1104.setLsxzdm(api1208List.get(0).getLsxzdm());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1104);
@@ -355,7 +357,7 @@
//涓婃捣甯傚钩鍙版枃浠跺悕绉拌鍒欙細搴撳尯缂栫爜_涓氬姟娴佹按鍙穇鍒嗙被鐮乢椤哄簭鐮�.jpg锛屼緥濡傦細91310114703439394M001_142211080101_GL_00.jpg
api1109.setWjmc(getWjmc(api1109.getWjlx(), api1109.getWjmc()));
//涓氬姟绫诲瀷
- api1109.setYwdh(getYwdh(api1109.getWjlx(), api1109.getWjmc()));
+ api1109.setYwdh(getYwdh(api1109.getWjlx(), api1109.getWjmc(), api1109.getYwdh()));
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1109);
return api1109;
@@ -387,6 +389,7 @@
BeanUtils.copyProperties(data, api1112);
api1112.setHdrychsj(api1112.getQdzgzchzyzgsj());
api1112.setBjw(ShAreaBjw.getBjw(code));
+ api1112.setZy("01");
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1112);
@@ -435,8 +438,7 @@
if (StringUtils.isEmpty(api1202.getRkjsdh())) {
api1202.setRkjsdh("0");
}
-
- //璁剧疆绮杞崲骞村害
+ //璁剧疆绮杞崲骞村害,鏍规嵁璁″垝鏄庣粏鍙锋煡璇㈣鍒掓槑缁嗭紝鍐嶆牴鎹鍒掓槑缁嗘煡璇㈣疆鎹㈣鍒�
List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
if (null != api1404List && api1404List.size() > 0) {
List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
@@ -446,12 +448,19 @@
}
}
}
-
+ //鏌ヨ绮鎬ц川杞彉鍗曞彿(鏍规嵁鍏ュ簱鏃堕棿鍜岃揣浣嶄唬鐮佹煡璇㈢伯椋熸�ц川杞彉鍗�)
+ List<Api1210> api1210List = api1210Rep.findDataByHwdmAndTime(api1202.getHwdm(), api1202.getCmsj());
+ if (null != api1210List && api1210List.size() > 0) {
+ api1202.setLsxzzbdh(api1210List.get(0).getLsxzzbdh());
+ }
//璁剧疆鎵规鍙�
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1202.getHwdm());
if (null != api1208List && api1208List.size() > 0) {
api1202.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
+ //绮鎬ц川
+ api1202.setLsxzdm("200");
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1202);
return api1202;
@@ -478,6 +487,8 @@
if (null != api1208List && api1208List.size() > 0) {
api1203.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
+ //璁剧疆璐ㄦ缂栫爜(榛樿绛夊悓浜庡叆搴撹川妫�鍗曞彿)
+ api1203.setZjbh(api1203.getRkjydh());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1203);
@@ -542,6 +553,8 @@
api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
+ //绮鎬ц川
+ api1205.setLsxzdm("200");
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1205);
return api1205;
@@ -615,6 +628,9 @@
api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
}
+ //绮鎬ц川,鏆傛椂榛樿鍖虹骇鍌ㄥ
+ api1209.setLsxzdm("122");
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1209);
return api1209;
@@ -646,7 +662,8 @@
if (null != api1208List && api1208List.size() > 0) {
api1211.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
-
+ //涓荤绮簱浠ｇ爜
+ api1211.setZglkdm(apiData.getKqdm());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1211);
return api1211;
@@ -854,6 +871,22 @@
api1403.setJhzxdw(api1101List.get(0).getDwdm());
api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
api1403.setBjw(ShAreaBjw.getBjw(code));
+
+ //鏌ヨ杞崲璁″垝鐨勮疆鍏ユ暟閲忓拰杞嚭鏁伴噺
+ List<Api1404> list = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh());
+ Double lrsl = 0.0, lcsl = 0.0; //鐢ㄤ簬缁熻杞叆鏁伴噺鍜岃疆鍑烘暟閲�
+ if(null != list && list.size() > 0){
+ for (Api1404 api1404 : list) {
+ if(null!= api1404.getLhlx() && "2".equals(api1404.getLhlx())){
+ lrsl += api1404.getLhsl();
+ }
+ if(null!= api1404.getLhlx() && "1".equals(api1404.getLhlx())){
+ lcsl += api1404.getLhsl();
+ }
+ }
+ }
+ api1403.setLrsl(lrsl);
+ api1403.setLcsl(lcsl);
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1403);
@@ -1261,8 +1294,7 @@
}
return wjmc;
}
- private String getYwdh(String wjlx, String wjmc) {
- String ywdh = "";
+ private String getYwdh(String wjlx, String wjmc, String ywdh) {
String[] s = wjmc.split("_");
if ("2".equals(wjlx) || "3".equals(wjlx)) {
ywdh = s[1];
--
Gitblit v1.9.3