From abd0a1d82cbfedcc826007f808800a4a3db58902 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 15 九月 2023 18:22:02 +0800
Subject: [PATCH] 优化报文接口查询

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
index 6d50dcb..4afc291 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
@@ -23,6 +23,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -80,7 +81,7 @@
 
             List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
             String bjw = "";
-            if(null != api1102List && api1102List.size() > 0){
+            if (null != api1102List && api1102List.size() > 0) {
                 bjw = ShAreaBjw.getBjw(api1102List.get(0).getXzqhdm());
             }
 
@@ -95,7 +96,7 @@
             for (Fz40Depot fz40Depot : list) {
                 //鏍规嵁浠撳簱缂栫爜鑾峰彇閰嶇疆淇℃伅
                 depotConfList = fzzy40SyncDepotConfRep.findDataByDepotId(fz40Depot.getId());
-                if(null == depotConfList || depotConfList.isEmpty()){
+                if (null == depotConfList || depotConfList.isEmpty()) {
                     continue;
                 }
                 //鑾峰彇璐т綅淇℃伅
@@ -115,7 +116,7 @@
                 // 1-3-5
                 // 8-8-8
                 //绛掍粨瑙勫垯
-                if(StringUtils.isNotEmpty(depotConf.getCableCir())){
+                if (StringUtils.isNotEmpty(depotConf.getCableCir())) {
                     sh2023Api2103.setDlqs(String.valueOf(strs.length));
                     sh2023Api2103.setDlhs(null);
                     sh2023Api2103.setDlls(null);
@@ -125,21 +126,21 @@
                     String[] cableCir = depotConf.getCableCir().split("-");
                     int num1 = 0;  //璧峰鏍�
                     int num2 = 0;  //鎴鏍�
-                    for(int i = 0; i < cableCir.length; i ++){
+                    for (int i = 0; i < cableCir.length; i++) {
                         sh2023Api2103.setDlcs(cableCir[i]);
 
                         sh2023Api2103Item = new SH2023Api2103Item();
                         sh2023Api2103Item.setQh(i + 1 + "");
-                        if(i == 0){
+                        if (i == 0) {
                             num1 += 1;
-                        }else {
+                        } else {
                             num1 = num2 + 1;
                         }
                         num2 += Integer.valueOf(strs[i]);
                         sh2023Api2103Item.setQsdlbh(num1 + "");
                         sh2023Api2103Item.setJsdlbh(num2 + "");
                         sh2023Api2103Item.setCs(cableCir[i]);
-                        sh2023Api2103Item.setYbj((i + 1)*4 + "");
+                        sh2023Api2103Item.setYbj((i + 1) * 4 + "");
                         sh2023Api2103Item.setRowId(i + "");
                         listItem.add(sh2023Api2103Item);
                     }
@@ -147,13 +148,13 @@
                 }
 
                 sh2023Api2103.setScqd("1");
-                sh2023Api2103.setSczd(Integer.valueOf(strs[1])*Integer.valueOf(strs[2]) + "");
+                sh2023Api2103.setSczd(Integer.valueOf(strs[1]) * Integer.valueOf(strs[2]) + "");
 
                 sh2023Api2103.setZcqd("1");
-                sh2023Api2103.setZczd(Integer.valueOf(strs[1])*Integer.valueOf(strs[2]) + "");
+                sh2023Api2103.setZczd(Integer.valueOf(strs[1]) * Integer.valueOf(strs[2]) + "");
 
                 sh2023Api2103.setXcqd("1");
-                sh2023Api2103.setXczd(Integer.valueOf(strs[1])*Integer.valueOf(strs[2]) + "");
+                sh2023Api2103.setXczd(Integer.valueOf(strs[1]) * Integer.valueOf(strs[2]) + "");
 
                 sh2023Api2103.setYxfwqsc("1");
                 sh2023Api2103.setYxfwjsc(strs[0]);
@@ -172,7 +173,7 @@
                 infoData.setRemarks("绮儏璁惧閰嶇疆淇℃伅");
 
                 //璁剧疆鎿嶄綔鏍囧織
-                apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
+                apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2103, infoData.getDataId(),kqdm);
                 if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
                     infoData.setCzbz(Constant.CZBZ_I);
                 } else {

--
Gitblit v1.9.3