From bb553634dfca6d5df3311f89c69eacced5e01e74 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 14 十二月 2023 19:33:31 +0800
Subject: [PATCH] 更新上海粮情数据封装接口

---
 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java |   18 +++++++++++++++---
 1 files changed, 15 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 6d59bdd..1499170 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -60,6 +60,8 @@
     @Autowired
     private Api1205Rep api1205Rep;
     @Autowired
+    private Api1403Rep api1403Rep;
+    @Autowired
     private Api1404Rep api1404Rep;
 
     @Override
@@ -437,7 +439,12 @@
             //璁剧疆绮杞崲骞村害
             List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
             if (null != api1404List && api1404List.size() > 0) {
-                api1202.setLhnd(api1404List.get(0).getShnd());
+                List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
+                if(null != api1403List && api1403List.size() > 0){
+                    if(StringUtils.isNotEmpty(api1403List.get(0).getJhnd())){
+                        api1202.setLhnd(api1403List.get(0).getJhnd());
+                    }
+                }
             }
 
             //璁剧疆鎵规鍙�
@@ -521,7 +528,12 @@
             //璁剧疆绮杞崲骞村害
             List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
             if (null != api1404List && api1404List.size() > 0) {
-                api1205.setLhnd(api1404List.get(0).getShnd());
+                List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
+                if(null != api1403List && api1403List.size() > 0){
+                    if(StringUtils.isNotEmpty(api1403List.get(0).getJhnd())){
+                        api1205.setLhnd(api1403List.get(0).getJhnd());
+                    }
+                }
             }
 
             //璁剧疆鎵规鍙�
@@ -933,7 +945,7 @@
                 map.put(ceng, new ArrayList<>());
             }
             map.get(ceng).add(Double.valueOf(grain[0]));
-            lwmx += grain[1] + ":" + grain[2] + ":" + grain[3] + "$" + grain[0];
+            lwmx += grain[3] + ":" + grain[2] + ":" + grain[1] + "$" + grain[0];
             if (Double.valueOf(grain[0]) <= -100) {
                 lwmx += "$" + "1" + "#";
                 errorNum++;

--
Gitblit v1.9.3