From 6f06c861bffe6fcf5fb7cf9e2a7003fca856bac0 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 09 一月 2024 18:21:01 +0800
Subject: [PATCH] 调整上海性质转变单接口
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java | 3 +++
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 26 ++++++++++++++------------
src/main/resources/application-pro5327.yml | 4 ++--
3 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
index efe0608..62bd063 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
@@ -101,6 +101,9 @@
if(null == api1210List || api1210List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
}else {
+ if(StringUtils.isNotEmpty(api1210List.get(0).getJhmxdh())){
+ apiData.setJhmxdh(api1210List.get(0).getJhmxdh());
+ }
apiData.setCzbz(api1210List.get(0).getCzbz());
}
//淇濆瓨鏁版嵁
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 0ad22d7..f55eb6b 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -659,19 +659,21 @@
api1210.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
- //璁剧疆璁″垝鏄庣粏鍙凤紝鏍规嵁鍒掕浆鎬ц川鏌ヨ鍑哄叆搴撲俊鎭幏鍙栬鍒掑彿
- if("200".equals(api1210.getHzqlsxzdm())){
- //鑻ュ垝杞墠鎬ц川涓哄晢鍝佺伯锛屽垯鏌ヨ鍏ュ簱淇℃伅鑾峰彇璁″垝鏄庣粏鍙�
- List<Api1202> api1202List = api1202Rep.getDataByHwdmAndTime(api1210.getHwdm(), api1210.getHzrq());
- if (null != api1202List && api1202List.size() > 0) {
- api1210.setJhmxdh(api1202List.get(0).getJhmxh());
+ //鑻ヨ鍒掓槑缁嗗彿涓虹┖锛岃缃鍒掓槑缁嗗彿锛屾牴鎹垝杞�ц川鏌ヨ鍑哄叆搴撲俊鎭幏鍙栬鍒掑彿
+ if(StringUtils.isEmpty(api1210.getJhmxdh())){
+ if("200".equals(api1210.getHzqlsxzdm())){
+ //鑻ュ垝杞墠鎬ц川涓哄晢鍝佺伯锛屽垯鏌ヨ鍏ュ簱淇℃伅鑾峰彇璁″垝鏄庣粏鍙�
+ List<Api1202> api1202List = api1202Rep.getDataByHwdmAndTime(api1210.getHwdm(), api1210.getHzrq());
+ if (null != api1202List && api1202List.size() > 0) {
+ api1210.setJhmxdh(api1202List.get(0).getJhmxh());
+ }
}
- }
- if("200".equals(api1210.getHzhlsxzdm())){
- //鑻ュ垝杞悗鎬ц川涓哄晢鍝佺伯锛屽垯鏌ヨ鍑哄簱淇℃伅鑾峰彇璁″垝鏄庣粏鍙�
- List<Api1205> api1205List = api1205Rep.getDataByHwdmAndTime(api1210.getHwdm(), api1210.getHzrq());
- if (null != api1205List && api1205List.size() > 0) {
- api1210.setJhmxdh(api1205List.get(0).getJhmxh());
+ if("200".equals(api1210.getHzhlsxzdm())){
+ //鑻ュ垝杞悗鎬ц川涓哄晢鍝佺伯锛屽垯鏌ヨ鍑哄簱淇℃伅鑾峰彇璁″垝鏄庣粏鍙�
+ List<Api1205> api1205List = api1205Rep.getDataByHwdmAndTime(api1210.getHwdm(), api1210.getHzrq());
+ if (null != api1205List && api1205List.size() > 0) {
+ api1210.setJhmxdh(api1205List.get(0).getJhmxh());
+ }
}
}
diff --git a/src/main/resources/application-pro5327.yml b/src/main/resources/application-pro5327.yml
index db341d2..7e702bb 100644
--- a/src/main/resources/application-pro5327.yml
+++ b/src/main/resources/application-pro5327.yml
@@ -52,5 +52,5 @@
igds:
default:
companyId: 5327
- file-path: /usr/local/igds-api/file/
- img-path: /usr/local/igds/file/
\ No newline at end of file
+ file-path: /home/igds-api/file/
+ img-path: /home/igds/file/
\ No newline at end of file
--
Gitblit v1.9.3