From f31db99e67cc3e4a4092b4957af1076b634e6b48 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 15 十二月 2023 17:23:55 +0800
Subject: [PATCH] 修复粮情数据转换
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1304.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1304.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1304.java
index cd1422e..5cadfc6 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1304.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1304.java
@@ -8,15 +8,13 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1304Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.Gas;
+import com.fzzy.async.fzzy35.entity.Fz35Gas;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1304Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.Date;
import java.util.List;
-
/**
* 铏妫�娴嬫暟鎹悓姝�
@@ -56,7 +54,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Gas> list = fzzySync1304Rep.findByReceiveDate(start, end);
+ List<Fz35Gas> list = fzzySync1304Rep.findByReceiveDate(start, end);
if (null == list || list.isEmpty()) {
return;
}
@@ -64,30 +62,34 @@
Date syncTime = new Date();
Api1304 api1304;
Api1105 api1105;
- // int index = 10001;
- for (Gas gas : list) {
+ List<Api1304> api1304List;
+ for (Fz35Gas fz35Gas : list) {
//鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(gas.getDepotId());
+ api1105 = commonService.getApi1105Cache(fz35Gas.getDepotId());
if (null == api1105) {
continue;
}
api1304 = new Api1304();
// api1304.setQtndjcdh(api1105.getHwdm() + DateFormatUtils.format(gas.getReceiveDate(), "yyyyMMdd") + String.valueOf(index).substring(1));
- api1304.setQtndjcdh(api1105.getHwdm() + gas.getBatchId());
- api1304.setJcsj(gas.getReceiveDate());
+ api1304.setQtndjcdh(api1105.getHwdm() + fz35Gas.getBatchId());
+ api1304.setJcsj(fz35Gas.getReceiveDate());
api1304.setHwdm(api1105.getHwdm());
- api1304 = updateGasInfo(api1304, gas.getPoints());
+ api1304 = updateGasInfo(api1304, fz35Gas.getPoints());
- api1304.setCzbz(Constant.CZBZ_I);
api1304.setZhgxsj(syncTime);
- api1304.setBizId(gas.getBatchId());
+ api1304.setBizId(fz35Gas.getBatchId());
api1304.setKqdm(api1105.getKqdm());
api1304.setSyncTime(syncTime);
+ api1304List = api1304Rep.getDataByQtndjcdh(api1304.getQtndjcdh());
+ if(null == api1304List || api1304List.isEmpty()){
+ api1304.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1304.setCzbz(api1304List.get(0).getCzbz());
+ }
api1304Rep.save(api1304);
- // index++;
}
} catch (Exception e) {
log.error("---鍚屾澶辫触----{}", e);
--
Gitblit v1.9.3