From bb553634dfca6d5df3311f89c69eacced5e01e74 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 14 十二月 2023 19:33:31 +0800
Subject: [PATCH] 更新上海粮情数据封装接口

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java |   97 +++++++++++++++++++++++++++---------------------
 1 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
index bf00ee8..085b853 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -73,45 +73,21 @@
                 log.info("-------------娌℃湁鑾峰彇鍒扮啅钂稿妗堜俊鎭�------------------");
                 return;
             }
-            List<GdApi1023Dtl> dtlList = new ArrayList<>();
-            List<GdApi1023Way> wayList = new ArrayList<>();
-            List<GdApi1023People> peopleList = new ArrayList<>();
-            for (Fz40DrugLogApply data : list) {
-                List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
-                if (apiInfoList.size() != 0) {
-                    continue;
-                }
-                //鍌ㄧ伯绮儏鏄庣粏琛�
-                List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm());
-                GdApi1023Dtl gdApi1023Dtl;
-                for (Fz40DrugLogDtl dtl : dtls) {
-                    gdApi1023Dtl = new GdApi1023Dtl();
-                    BeanUtils.copyProperties(dtl, gdApi1023Dtl);
-                    gdApi1023Dtl.setCfdm(dtl.getDepotId());
-                    gdApi1023Dtl.setLspzdm(dtl.getFoodVariety());
-                    gdApi1023Dtl.setLsxzdm(dtl.getFoodType());
-                    gdApi1023Dtl.setLsdjdm(dtl.getFoodLevel());
-                    gdApi1023Dtl.setLssl(dtl.getNumber());
-                    gdApi1023Dtl.setSf(dtl.getPerWet());
-                    gdApi1023Dtl.setZz(dtl.getPerImpurity());
-                    dtlList.add(gdApi1023Dtl);
-                }
-                List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm());
-                GdApi1023Way gdApi1023Way;
-                for (Fz40DrugLogWay way : ways) {
-                    gdApi1023Way = new GdApi1023Way();
-                    BeanUtils.copyProperties(way, gdApi1023Way);
-                    wayList.add(gdApi1023Way);
-                }
-                List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm());
-                GdApi1023People gdApi1023People;
-                for (Fz40DrugLogPeople people : peoples) {
-                    gdApi1023People = new GdApi1023People();
-                    BeanUtils.copyProperties(people, gdApi1023People);
-                    peopleList.add(gdApi1023People);
-                }
+            List<GdApi1023Dtl> dtlList;
+            List<GdApi1023Way> wayList;
+            List<GdApi1023People> peopleList;
 
-                GdApi1023 gdApi1023 = new GdApi1023();
+
+            GdApi1023 gdApi1023;
+            GdApi1023Dtl gdApi1023Dtl;
+            GdApi1023Way gdApi1023Way;
+            GdApi1023People gdApi1023People;
+
+            List<ApiInfoData> apiInfoList;
+            ApiInfoData infoData;
+            for (Fz40DrugLogApply data : list) {
+
+                gdApi1023 = new GdApi1023();
                 BeanUtils.copyProperties(data, gdApi1023);
                 gdApi1023.setXzbm(data.getXzbm().substring(8));
                 gdApi1023.setKqdm(kqdm);
@@ -120,12 +96,48 @@
                 gdApi1023.setYjlx(data.getDrugType());
                 gdApi1023.setZhgxsj(data.getUpdateTime());
 
-                gdApi1023.setDtls(dtlList);
-                gdApi1023.setWays(wayList);
-                gdApi1023.setPeoples(peopleList);
+                //鍌ㄧ伯绮儏鏄庣粏琛�
+                List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm());
+                if (null != dtls && dtls.size() > 0) {
+                    dtlList = new ArrayList<>();
+                    for (Fz40DrugLogDtl dtl : dtls) {
+                        gdApi1023Dtl = new GdApi1023Dtl();
+                        BeanUtils.copyProperties(dtl, gdApi1023Dtl);
+                        gdApi1023Dtl.setCfdm(dtl.getDepotId());
+                        gdApi1023Dtl.setLspzdm(dtl.getFoodVariety());
+                        gdApi1023Dtl.setLsxzdm(dtl.getFoodType());
+                        gdApi1023Dtl.setLsdjdm(dtl.getFoodLevel());
+                        gdApi1023Dtl.setLssl(dtl.getNumber());
+                        gdApi1023Dtl.setSf(dtl.getPerWet());
+                        gdApi1023Dtl.setZz(dtl.getPerImpurity());
+                        dtlList.add(gdApi1023Dtl);
+                    }
+                    gdApi1023.setDtls(dtlList);
+                }
 
+                List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm());
+                if (null != ways && ways.size() > 0) {
+                    wayList = new ArrayList<>();
+                    for (Fz40DrugLogWay way : ways) {
+                        gdApi1023Way = new GdApi1023Way();
+                        BeanUtils.copyProperties(way, gdApi1023Way);
+                        wayList.add(gdApi1023Way);
+                    }
+                    gdApi1023.setWays(wayList);
+                }
+
+                List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm());
+                if (null != peoples && peoples.size() > 0) {
+                    peopleList = new ArrayList<>();
+                    for (Fz40DrugLogPeople people : peoples) {
+                        gdApi1023People = new GdApi1023People();
+                        BeanUtils.copyProperties(people, gdApi1023People);
+                        peopleList.add(gdApi1023People);
+                    }
+                    gdApi1023.setPeoples(peopleList);
+                }
                 //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙h〃
-                ApiInfoData infoData = new ApiInfoData();
+                infoData = new ApiInfoData();
                 infoData.setId(ContextUtil.getUUID());
                 infoData.setKqdm(kqdm);
                 infoData.setInteType(Constant.API_CATEGORY_13);
@@ -133,6 +145,7 @@
                 infoData.setBizType(PushProtocol.SB_GD_2022.getCode());
                 infoData.setUpdateTime(new Date());
                 infoData.setDataId(data.getXzbm());
+                apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), kqdm);
 
                 if (null == apiInfoList || apiInfoList.isEmpty()) {
                     gdApi1023.setCzbz(Constant.CZBZ_I);

--
Gitblit v1.9.3