From a82631013be641db3979e11013b2cf6e937a3e7b Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 12 十二月 2023 14:24:51 +0800
Subject: [PATCH] 武汉省平台-共享接口实现1

---
 src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index bba2223..7ec8b14 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -17,6 +17,7 @@
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -333,15 +334,16 @@
         shjdjwApi1310.setPznm(api1310.getLspzdm());
         shjdjwApi1310.setSkdjbm(api1310.getLsdjdm());
         shjdjwApi1310.setJylbbm(api1310.getJylb());
-        if (StringUtils.isNotEmpty(shjdjwApi1310.getJyxm())) {
-            String[] split = shjdjwApi1310.getJyxm().split(",");
-            StringBuilder jyjl = new StringBuilder();
-            for (String s : split) {
-                jyjl.append(",鍚堟牸");
-            }
-            shjdjwApi1310.setJyjl(jyjl.toString().substring(1));
-        }
-
+//        if (StringUtils.isNotEmpty(shjdjwApi1310.getJyxm())) {
+//            String[] split = shjdjwApi1310.getJyxm().split(",");
+//            StringBuilder jyjl = new StringBuilder();
+//            for (String s : split) {
+//                jyjl.append(",鍚堟牸");
+//            }
+//            shjdjwApi1310.setJyjl(jyjl.toString().substring(1));
+//        }
+        //璋冩暣涓轰紶閫掓楠屽��
+        shjdjwApi1310.setJyjl(api1310.getJyxmz());
         shjdjwApi1310.setZlzbjgpd(api1310.getZbjgpd());
         //鏌ヨ鍗曚綅淇℃伅
         List<Api1101> listApi1101 = api1101Rep.findPushData(api1310.getKqdm());
@@ -464,10 +466,10 @@
             shjdjwApi1205.setDwmc(listApi1101.get(0).getDwmc());
         }
 
-        //鏌ヨ浠撴埧淇℃伅
-        List<Api1103> listApi1103 = api1103Rep.findPushDataByCfdm(api1205.getHwdm().substring(0, 25));
-        if (null != listApi1103 && listApi1103.size() > 0) {
-            shjdjwApi1205.setCfmc(listApi1103.get(0).getCfmc());
+        //鏌ヨ璐т綅淇℃伅
+        List<Api1105> listApi1105 = api1105Rep.findPushDataByHwdm(api1205.getHwdm());
+        if (null != listApi1105 && listApi1105.size() > 0) {
+            shjdjwApi1205.setCfmc(listApi1105.get(0).getHwmc());
         }
 
         shjdjwApi1205.setDjlx("0");
@@ -479,6 +481,7 @@
 
         shjdjwApi1205.setDksj(api1205.getDjsj());
         shjdjwApi1205.setLksj(api1205.getCmsj());
+        shjdjwApi1205.setLhnd(DateFormatUtils.format(api1205.getCmsj(), "yyyy"));
         shjdjwApi1205.setPch("0");
         return shjdjwApi1205;
     }
@@ -550,4 +553,11 @@
         //鎵规鍙�
         shjdjwApi1202.setPch("0");
     }
+
+
+    @Override
+    public ResponseDto pullData(ApiParam param, ApiConfs conf) {
+        //璇ュ崗璁棤姝ゅ疄鐜�
+        return null;
+    }
 }

--
Gitblit v1.9.3