From ac9b4c99b2534e31a8ce9948b376feb514c2ec20 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 01 三月 2024 11:31:52 +0800
Subject: [PATCH] 优化损益数据同步

---
 src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java |  150 +++++++++++++++++++-------------------------------
 1 files changed, 57 insertions(+), 93 deletions(-)

diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
index 94d6033..5716ceb 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -167,6 +167,12 @@
         } else {
             List<Object> list = new ArrayList<>();
             Object object = getJsonApiData(inteId, data);
+
+            //闄ゅ簱瀛樻帴鍙e锛屽叾浠栨帴鍙d笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂�
+            if(!NX2023Constant.NX_2023_API_CODE_1208.equals(inteId)){
+                setZhgxsjValue(data);
+            }
+
             list.add(object);
             return JSON.toJSONString(list);
         }
@@ -253,7 +259,10 @@
             Api1307 apiData = (Api1307) data;
             Nx2023Api1307 api1307 = new Nx2023Api1307();
             BeanUtils.copyProperties(apiData, api1307);
-            api1307.setCntxwjl(FileUtils.fileToByteString(apiData.getWjdz()));
+
+            Map<String, String> map = new HashMap<>();
+            map.put(apiData.getId() + "." + apiData.getTxwjhzm(), FileUtils.fileToByteString(apiData.getWjdz()));
+            api1307.setCntxwjl(JSON.toJSONString(map));
             return api1307;
         }
         if (NX2023Constant.NX_2023_API_CODE_1308.equals(inteId)) {
@@ -269,16 +278,21 @@
         return data;
     }
 
-    private String getWjmc(String wjlx, String wjmc){
-        if("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)){
-            if(wjmc.endsWith(".jpg")) {
-                wjmc = wjmc.replaceAll(".jpg", "_00.jpg");
-            }
-            if(wjmc.endsWith(".png")) {
-                wjmc = wjmc.replaceAll(".png", "_00.png");
-            }
+    /**
+     * 璧嬪�兼渶鍚庢洿鏂版椂闂�
+     * @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 wjmc;
+        return object;
     }
 
     /**
@@ -299,26 +313,6 @@
         }
     }
 
-    /**
-     * Object绫诲瀷杞彉涓篖ist
-     *
-     * @param obj
-     * @param clazz
-     * @param <T>
-     * @return
-     */
-    public static <T> List<T> castList(Object obj, Class<T> clazz) {
-        List<T> result = new ArrayList<T>();
-        if (obj instanceof List<?>) {
-            for (Object o : (List<?>) obj) {
-                result.add(clazz.cast(o));
-            }
-            return result;
-        }
-        return null;
-    }
-
-
     private List<NxFinanceDto> copyApi1503(Api1503 data) {
         Api1503 api1503 = data;
         List<NxFinanceDto> list = new ArrayList<>();
@@ -328,18 +322,18 @@
         nxFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
         nxFinanceDto.setBbm("03");
         nxFinanceDto.setCzbz(api1503.getCzbz());
-        nxFinanceDto.setZhgxsj(DateFormatUtils.format(api1503.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+        nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
 
-        paddingData(nxFinanceDto, list, "0","椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
-        paddingData(nxFinanceDto, list, "1","涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
-        paddingData(nxFinanceDto, list, "2","鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
-        paddingData(nxFinanceDto, list, "3","绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
-        paddingData(nxFinanceDto, list, "4","閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
-        paddingData(nxFinanceDto, list, "5","绠$悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
-        paddingData(nxFinanceDto, list, "6","鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
-        paddingData(nxFinanceDto, list, "7","璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
-        paddingData(nxFinanceDto, list, "8","鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
-        paddingData(nxFinanceDto, list, "9","鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
+        paddingData(nxFinanceDto, list, "0", "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
+        paddingData(nxFinanceDto, list, "1", "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
+        paddingData(nxFinanceDto, list, "2", "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
+        paddingData(nxFinanceDto, list, "3", "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
+        paddingData(nxFinanceDto, list, "4", "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
+        paddingData(nxFinanceDto, list, "5", "绠$悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
+        paddingData(nxFinanceDto, list, "6", "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
+        paddingData(nxFinanceDto, list, "7", "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
+        paddingData(nxFinanceDto, list, "8", "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
+        paddingData(nxFinanceDto, list, "9", "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
         paddingData(nxFinanceDto, list, "10","鍔狅細鍏朵粬鏀剁泭", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
         paddingData(nxFinanceDto, list, "11","鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
         paddingData(nxFinanceDto, list, "12","鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
@@ -380,18 +374,18 @@
         nxFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
         nxFinanceDto.setBbm("02");
         nxFinanceDto.setCzbz(api1502.getCzbz());
-        nxFinanceDto.setZhgxsj(DateFormatUtils.format(api1502.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+        nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
 
-        paddingData(nxFinanceDto, list, "0","椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
-        paddingData(nxFinanceDto, list, "1","涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
-        paddingData(nxFinanceDto, list, "2","閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
-        paddingData(nxFinanceDto, list, "3","鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
-        paddingData(nxFinanceDto, list, "4","鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
-        paddingData(nxFinanceDto, list, "5","缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
-        paddingData(nxFinanceDto, list, "6","璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
-        paddingData(nxFinanceDto, list, "7","鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
-        paddingData(nxFinanceDto, list, "8","鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
-        paddingData(nxFinanceDto, list, "9","鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
+        paddingData(nxFinanceDto, list, "0", "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
+        paddingData(nxFinanceDto, list, "1", "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
+        paddingData(nxFinanceDto, list, "2", "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
+        paddingData(nxFinanceDto, list, "3", "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
+        paddingData(nxFinanceDto, list, "4", "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
+        paddingData(nxFinanceDto, list, "5", "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
+        paddingData(nxFinanceDto, list, "6", "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
+        paddingData(nxFinanceDto, list, "7", "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
+        paddingData(nxFinanceDto, list, "8", "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
+        paddingData(nxFinanceDto, list, "9", "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
         paddingData(nxFinanceDto, list, "10","缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
         paddingData(nxFinanceDto, list, "11","缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
         paddingData(nxFinanceDto, list, "12","浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
@@ -434,18 +428,18 @@
         nxFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
         nxFinanceDto.setBbm("01");
         nxFinanceDto.setCzbz(api1501.getCzbz());
-        nxFinanceDto.setZhgxsj(DateFormatUtils.format(api1501.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+        nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
 
-        paddingData(nxFinanceDto, list, "0", "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
-        paddingData(nxFinanceDto, list, "1", "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
-        paddingData(nxFinanceDto, list, "2", "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
-        paddingData(nxFinanceDto, list, "3", "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
-        paddingData(nxFinanceDto, list, "4", "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
-        paddingData(nxFinanceDto, list, "5", "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
-        paddingData(nxFinanceDto, list, "6", "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
-        paddingData(nxFinanceDto, list, "7", "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
-        paddingData(nxFinanceDto, list, "8", "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
-        paddingData(nxFinanceDto, list, "9", "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + "");
+        paddingData(nxFinanceDto, list, "0",  "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+        paddingData(nxFinanceDto, list, "1",  "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+        paddingData(nxFinanceDto, list, "2",  "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
+        paddingData(nxFinanceDto, list, "3",  "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
+        paddingData(nxFinanceDto, list, "4",  "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
+        paddingData(nxFinanceDto, list, "5",  "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
+        paddingData(nxFinanceDto, list, "6",  "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
+        paddingData(nxFinanceDto, list, "7",  "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
+        paddingData(nxFinanceDto, list, "8",  "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
+        paddingData(nxFinanceDto, list, "9",  "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + "");
         paddingData(nxFinanceDto, list, "10", "鍚堝悓璧勪骇", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
         paddingData(nxFinanceDto, list, "11", "鎸佹湁寰呭敭璧勪骇", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
         paddingData(nxFinanceDto, list, "12", "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
@@ -525,39 +519,9 @@
         list.add(nxFinanceDto);
     }
 
-    private Object changeObject(Object object) {
-        // 浣跨敤鍙嶅皠鑾峰彇灞炴�у垪琛� vo涓哄疄浣撳璞″悕
-        Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field : fields) {
-            field.setAccessible(true);
-            try {
-                // 鍒ゆ柇灞炴�у�兼槸鍚︿负null
-                if (field.get(object) == null || field.get(object) == "") {
-                    //鏍规嵁绫诲瀷璁剧疆榛樿鍊�
-                    if (field.getType() == String.class) {
-                        field.set(object, "鏃�");
-                    }
-                    if (field.getType() == Integer.class) {
-                        field.set(object, 0);
-                    }
-                    if (field.getType() == Double.class) {
-                        field.set(object, 0.0);
-                    }
-                    if (field.getType() == Date.class) {
-                        field.set(object, new Date());
-                    }
-                }
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-        return object;
-    }
-
     @Override
     public ResponseDto pullData(ApiParam param, ApiConfs conf) {
         //璇ュ崗璁棤姝ゅ疄鐜�
         return null;
     }
-
 }
\ No newline at end of file

--
Gitblit v1.9.3