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 |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 1ada75e..4b2c9dc 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -56,6 +56,8 @@
     private Api1202Rep api1202Rep;
     @Autowired
     private Api1205Rep api1205Rep;
+    @Autowired
+    private Api1404Rep api1404Rep;
 
     @Override
     public String getProtocol() {
@@ -354,6 +356,12 @@
                 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());
             //璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -391,6 +399,7 @@
             BeanUtils.copyProperties(apiData, api1204);
             api1204.setBjw(ShAreaBjw.getBjw(code));
 
+            //TODO 鏌ヨ鍚堝悓鑾峰彇鎵规鍙�
             //璁剧疆鎵规鍙�
             api1204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJssj(), "yyyy"));
 
@@ -418,8 +427,15 @@
             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() + DateFormatUtils.format(apiData.getCmsj(), "yyyy"));
+            api1205.setPch(apiData.getHwdm() + apiData.getShnd());
 
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1205);
@@ -430,9 +446,9 @@
             Api1206 apiData = (Api1206) data;
             BeanUtils.copyProperties(apiData, api1206);
             api1206.setBjw(ShAreaBjw.getBjw(code));
-            List<Api1205> api1205List = api1205Rep.getDataById(apiData.getCkjsdh());
+//            List<Api1205> api1205List = api1205Rep.getDataById(apiData.getCkjsdh());
             //璁剧疆鎵规鍙�
-            api1206.setPch(api1205List.get(0).getHwdm() + DateFormatUtils.format(api1205List.get(0).getCmsj(), "yyyy"));
+//            api1206.setPch(api1205List.get(0).getHwdm() + DateFormatUtils.format(api1205List.get(0).getCmsj(), "yyyy"));
 
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1206);

--
Gitblit v1.9.3