From a1d6638c3dad0a2c42aa3f35b0c080738f69bd9b Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 15 一月 2024 19:05:39 +0800
Subject: [PATCH] 调整上海接口数据实时性

---
 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java |   64 ++++++++++++++++++++++++++++---
 1 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index f4820d2..a4607a9 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -239,6 +239,12 @@
         } else {
             List<Object> list = new ArrayList<>();
             Object object = getJsonApiData(inteId, data, code);
+
+            //闄ゅ簱瀛樻帴鍙e锛屽叾浠栨帴鍙d笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂�
+            if(!SH2023Constant.SH_2023_API_CODE_1208.equals(inteId)){
+                setZhgxsjValue(object);
+            }
+
             list.add(object);
             return JSON.toJSONString(list);
         }
@@ -441,6 +447,7 @@
             //璁剧疆绮杞崲骞村害,鏍规嵁璁″垝鏄庣粏鍙锋煡璇㈣鍒掓槑缁嗭紝鍐嶆牴鎹鍒掓槑缁嗘煡璇㈣疆鎹㈣鍒�
             List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
             if (null != api1404List && api1404List.size() > 0) {
+                api1202.setShnd(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())){
@@ -558,8 +565,6 @@
                 api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
             }
 
-            //绮鎬ц川
-            api1205.setLsxzdm("200");
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1205);
             return api1205;
@@ -613,6 +618,13 @@
             if (StringUtils.isEmpty(api1208.getCd())) {
                 api1208.setCd(api1208.getHwdm().substring(2, 8));
             }
+            //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
+            if(null == apiData.getBclbs()){
+                apiData.setBclbs(0);
+            }
+            if("2".equals(apiData.getClfs()) && apiData.getBclbs() == 0){
+                apiData.setBclbs((int)(apiData.getSjsl()/25));
+            }
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1208);
             return api1208;
@@ -649,6 +661,24 @@
             List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1210.getHwdm());
             if (null != api1208List && api1208List.size() > 0) {
                 api1210.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+            }
+
+            //鑻ヨ鍒掓槑缁嗗彿涓虹┖锛岃缃鍒掓槑缁嗗彿锛屾牴鎹垝杞�ц川鏌ヨ鍑哄叆搴撲俊鎭幏鍙栬鍒掑彿
+            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());
+                    }
+                }
             }
 
             //璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -835,6 +865,9 @@
             if (StringUtils.isEmpty(api1310.getShrxm())) {
                 api1310.setShrxm("瀹℃牳浜�");
             }
+            if (StringUtils.isEmpty(api1310.getBglx())) {
+                api1310.setBglx("1");
+            }
 
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1310);
@@ -890,8 +923,8 @@
                     }
                 }
             }
-            api1403.setLrsl(lrsl/1000 + "");
-            api1403.setLcsl(lcsl/1000 + "");
+            api1403.setLrsl(lrsl + "");
+            api1403.setLcsl(lcsl + "");
 
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1403);
@@ -949,6 +982,23 @@
         //璁剧疆绌哄睘鎬т负榛樿鍊�
         changeObject(data);
         return data;
+    }
+
+    /**
+     * 璧嬪�兼渶鍚庢洿鏂版椂闂�
+     * @param object
+     * @return
+     */
+    private Object setZhgxsjValue(Object object) {
+        // 浣跨敤鍙嶅皠鑾峰彇灞炴�у垪琛� vo涓哄疄浣撳璞″悕
+        try {
+            Field zhgxsj = object.getClass().getDeclaredField("zhgxsj");
+            zhgxsj.setAccessible(true);
+            zhgxsj.set(object, new Date());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return object;
     }
 
     /**
@@ -1096,7 +1146,7 @@
         shFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
         shFinanceDto.setBbm("03");
         shFinanceDto.setCzbz(api1503.getCzbz());
-        shFinanceDto.setZhgxsj(DateFormatUtils.format(api1503.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+        shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
 
         paddingData(shFinanceDto, list, "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
         paddingData(shFinanceDto, list, "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
@@ -1146,7 +1196,7 @@
         shFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
         shFinanceDto.setBbm("02");
         shFinanceDto.setCzbz(api1502.getCzbz());
-        shFinanceDto.setZhgxsj(DateFormatUtils.format(api1502.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+        shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
 
         paddingData(shFinanceDto, list, "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
         paddingData(shFinanceDto, list, "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
@@ -1198,7 +1248,7 @@
         shFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
         shFinanceDto.setBbm("01");
         shFinanceDto.setCzbz(api1501.getCzbz());
-        shFinanceDto.setZhgxsj(DateFormatUtils.format(api1501.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+        shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
 
         paddingData(shFinanceDto, list, "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
         paddingData(shFinanceDto, list, "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");

--
Gitblit v1.9.3