From bef2222506d481b418a93625ec0030b177f0eab2 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 25 二月 2025 11:59:56 +0800
Subject: [PATCH] 油罐上传修改

---
 src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index 5775db7..ca72499 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -356,7 +356,8 @@
             return JSON.toJSONString(api1105);
         }
         if (Constant.API_CODE_1106.equals(inteId)) {
-            Gd2023Api1106 api1106 = (Gd2023Api1106) data;
+            Gd2023Api1106 api1106 = new Gd2023Api1106();
+            BeanUtils.copyProperties(data, api1106);
             api1106.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
             //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
             if (StringUtils.isEmpty(api1106.getTykqbm())) {
@@ -374,8 +375,7 @@
                 api1107.setTykqbm(tykqbm);
             }
             if (StringUtils.isEmpty(api1107.getTydwbm())) {
-                String tydwbm = apiCommonService.getTydwbm(api1107.getDwdm());
-                api1107.setTydwbm(tydwbm);
+                api1107.setTydwbm(api1107.getTykqbm().substring(0, 20));
             }
             api1107.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
             return JSON.toJSONString(api1107);
@@ -389,8 +389,7 @@
                 api1108.setTykqbm(tykqbm);
             }
             if (StringUtils.isEmpty(api1108.getTydwbm())) {
-                String tydwbm = apiCommonService.getTydwbm(api1108.getDwdm());
-                api1108.setTydwbm(tydwbm);
+                api1108.setTydwbm(api1108.getTykqbm().substring(0, 20));
             }
             api1108.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
             return JSON.toJSONString(api1108);
@@ -429,8 +428,7 @@
                 api1110.setTykqbm(tyhwbm.substring(0, 22));
             }
             if ("0".equals(api1110.getTydwbm()) || StringUtils.isEmpty(api1110.getTydwbm())) {
-                String tydwbm = apiCommonService.getTydwbm(api1110.getDwdm());
-                api1110.setTydwbm(tydwbm);
+                api1110.setTydwbm(api1110.getTykqbm().substring(0 ,20));
             }
             api1110.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
             return JSON.toJSONString(api1110);
@@ -445,7 +443,7 @@
                     api1111.setTykqbm(api1102List.getTykqbm());
                 }
                 if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
-                    api1111.setTydwbm(apiCommonService.getTydwbm(api1111.getDwdm()));
+                    api1111.setTydwbm(api1111.getTykqbm().substring(0,20));
                 }
             }
             Api1101 api1101List = api1101Rep.findData(api1111.getDwdm());
@@ -458,8 +456,7 @@
                 api1111.setTykqbm(tykqbm);
             }
             if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
-                String tydwbm = apiCommonService.getTydwbm(api1111.getDwdm());
-                api1111.setTydwbm(tydwbm);
+                api1111.setTydwbm(api1111.getTykqbm().substring(0,20));
             }
             api1111.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
             return JSON.toJSONString(api1111);
@@ -550,6 +547,9 @@
                 String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                 apiData.setTyhwbm(tyhwbm);
             }
+            if (StringUtils.isEmpty(apiData.getBzw())) {
+                apiData.setBzw("3");
+            }
             apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
             return JSON.toJSONString(apiData);
         }

--
Gitblit v1.9.3