From ab8b3af2bc6460dba2a807d27004e128d772ab24 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 12 七月 2024 09:30:09 +0800
Subject: [PATCH] 增城配置

---
 src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java |   45 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 482be71..423a3c8 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -520,6 +520,7 @@
         }
         if (Constant.API_CODE_1208.equals(inteId)) {
             Gd2022Api1208 api1208 = new Gd2022Api1208();
+            BeanUtils.copyProperties(data, api1208);
             //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
             if(null == api1208.getBclbs()){
                 api1208.setBclbs(0);
@@ -537,7 +538,6 @@
                 String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
                 api1208.setTyhwbm(tyhwbm);
             }
-            BeanUtils.copyProperties(data, api1208);
             return JSON.toJSONString(api1208);
         }
         if (Constant.API_CODE_1209.equals(inteId)) {
@@ -704,9 +704,9 @@
         if (Constant.API_CODE_1309.equals(inteId)) {
             Api1309 apiData = (Api1309) data;
             //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
-            if(StringUtils.isEmpty(apiData.getTydwbm())){
+            if(StringUtils.isEmpty(apiData.getWgdwtybm())){
                 String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
-                apiData.setTydwbm(tydwbm);
+                apiData.setWgdwtybm(tydwbm);
             }
             apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
             return JSON.toJSONString(apiData);
@@ -751,14 +751,15 @@
                         lcsl += gd2022Api1404.getLhsl();
                     }
                     //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
-                    if(StringUtils.isEmpty(gd2022Api1404.getTyhwbm())){
+                    if(StringUtils.isEmpty(gd2022Api1404.getLhhwtybm())){
                         String tyhwbm = apiCommonService.getTyhwbm(gd2022Api1404.getLhhwdm());
-                        gd2022Api1404.setTyhwbm(tyhwbm);
+                        gd2022Api1404.setLhhwtybm(tyhwbm);
                     }
                     gd2022Api1404.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
                     dtls.add(gd2022Api1404);
                 }
             }
+
             api1403.setRotationInQty(lrsl);
             api1403.setRotationOutQty(lcsl);
             api1403.setDtls(dtls);
@@ -767,9 +768,9 @@
             //璁剧疆涓婁紶鏂囦欢id
             api1403.setFileStorageId((String) responseDto.getData());
             //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
-            if(StringUtils.isEmpty(api1403.getTydwbm())){
+            if(StringUtils.isEmpty(api1403.getJhxddwtybm())){
                 String tydwbm = apiCommonService.getTydwbm(api1403.getJhxddw());
-                api1403.setTydwbm(tydwbm);
+                api1403.setJhxddwtybm(tydwbm);
             }
             api1403.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
             return JSON.toJSONString(api1403);
@@ -788,6 +789,36 @@
             apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
             return JSON.toJSONString(apiData);
         }
+        if (ApiCodeConstant.API_2001.equals(inteId)) {
+            Gd2022Api2001 apiData = (Gd2022Api2001) data;
+            //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+            if(StringUtils.isEmpty(apiData.getTycfbm())){
+                String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+                apiData.setTycfbm(tycfbm);
+            }
+            //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+            if(StringUtils.isEmpty(apiData.getTyajbm())){
+                String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
+                apiData.setTyajbm(tyajbm);
+            }
+            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+            return JSON.toJSONString(apiData);
+        }
+        if (ApiCodeConstant.API_2002.equals(inteId)) {
+            Gd2022Api2002 apiData = (Gd2022Api2002) data;
+            //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+            if(StringUtils.isEmpty(apiData.getTycfbm())){
+                String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+                apiData.setTycfbm(tycfbm);
+            }
+            //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+            if(StringUtils.isEmpty(apiData.getTyajbm())){
+                String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
+                apiData.setTyajbm(tyajbm);
+            }
+            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+            return JSON.toJSONString(apiData);
+        }
         return JSON.toJSONString(data);
     }
 

--
Gitblit v1.9.3