From 46ee5aac0c31c352f19344eb3cfd762817f2559e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 10 十月 2025 19:25:30 +0800
Subject: [PATCH] 优化上海接口日志打印

---
 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java
index 33f9bde..0b8d618 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java
@@ -13,6 +13,7 @@
 import com.fzzy.async.fzzy35.repository.Fzzy35Sync1310Rep;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -22,7 +23,7 @@
 /**
  * 璐ㄦ鍚屾
  *
- * @author chen
+ * @author czt
  * @date 2023-05-14 19:51
  */
 @Slf4j
@@ -69,15 +70,17 @@
             Api1105 api1105;
             List<Fz35CheckItem> fz35CheckItems;
             List<GbCheckItem> gbCheckList;
-            String jyxm;
-            String jyxmz;
+            StringBuilder jyxm;
+            StringBuilder jyxmz;
+            List<Api1310> api1310List;
+            int index = 10001;
             for (Fz35Quality fz35Quality : list) {
                 api1105 = commonService.getApi1105Cache(fz35Quality.getDepotId());
                 if (null == api1105) {
                     continue;
                 }
                 api1310 = new Api1310();
-                api1310.setZjbgdh(fz35Quality.getId());
+                api1310.setZjbgdh(fz35Quality.getType() + DateFormatUtils.format(fz35Quality.getTime(), "yyyyMMdd") + String.valueOf(index).substring(1));
                 api1310.setHwdm(api1105.getHwdm());
                 api1310.setKqdm(kqdm);
                 api1310.setLspzdm(fz35Quality.getFoodVariety());
@@ -90,23 +93,25 @@
                 api1310.setJyyj(fz35Quality.getStandard());
                 api1310.setZblb("2");
                 //妫�娴嬮」锛屾娴嬪��
-                jyxm = "";
-                jyxmz = "";
-                fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(fz35Quality.getId());
+                jyxm = new StringBuilder();
+                jyxmz = new StringBuilder();
+                fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(fz35Quality.getId(), deptId.substring(0, 4));
                 if (null != fz35CheckItems && fz35CheckItems.size() > 0) {
 
                     for (Fz35CheckItem fz35CheckItem : fz35CheckItems) {
+                        if(StringUtils.isEmpty(fz35CheckItem.getValue())){
+                            continue;
+                        }
                         gbCheckList = gbCheckItemRep.findByBizCode(fz35CheckItem.getStandardId());
-
                         if (gbCheckList == null || gbCheckList.isEmpty()) {
                             continue;
                         }
-                        jyxm += gbCheckList.get(0).getCode() + ",";
-                        jyxmz += fz35CheckItem.getValue() + ",";
+                        jyxm.append(",").append(gbCheckList.get(0).getCode());
+                        jyxmz.append(",").append(fz35CheckItem.getValue());
                     }
                 }
-                api1310.setJyxm(jyxm);
-                api1310.setJyxmz(jyxmz);
+                api1310.setJyxm(jyxm.toString().substring(1));
+                api1310.setJyxmz(jyxmz.toString().substring(1));
 
                 api1310.setZbjgpd(fz35Quality.getResult());
                 api1310.setQfrq(fz35Quality.getTime());
@@ -122,10 +127,17 @@
                 api1310.setYpdj(StringUtils.isEmpty(fz35Quality.getCheckLevel())?"0": fz35Quality.getCheckLevel());
                 api1310.setSfzcccnx(StringUtils.isEmpty(fz35Quality.getNormalYear())?"0": fz35Quality.getNormalYear());
                 api1310.setBz(fz35Quality.getRemark());
-                api1310.setCzbz(Constant.CZBZ_I);
                 api1310.setZhgxsj(new Date());
 
+                api1310List = api1310Rep.getDataByZjbgdh(api1310.getZjbgdh());
+                if(null == api1310List || api1310List.isEmpty()){
+                    api1310.setCzbz(Constant.CZBZ_I);
+                }else {
+                    api1310.setCzbz(api1310List.get(0).getCzbz());
+                }
+
                 api1310Rep.save(api1310);
+                index ++;
             }
         } catch (Exception e) {
             log.error("---鍚屾澶辫触----{}", e);

--
Gitblit v1.9.3