From 4be521d7e3135ac0a8e4a15e395f44448e23e09e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 22 八月 2023 18:40:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
index 1507f49..243c1e7 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
@@ -2,15 +2,17 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1109;
+import com.fzzy.api.entity.Api1202;
+import com.fzzy.api.entity.Api1205;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.FileUtil;
import com.fzzy.api.view.repository.Api1109Rep;
+import com.fzzy.api.view.repository.Api1202Rep;
+import com.fzzy.api.view.repository.Api1205Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40FileInfo;
-import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1109Rep;
-import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,9 +50,11 @@
@Autowired
private Fzzy40Sync1109Rep fzzySync1109Rep;
@Autowired
- private Fzzy40Sync1202Rep fzzySync1202Rep;
- @Autowired
private Api1109Rep api1109Rep;
+ @Autowired
+ private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1205Rep api1205Rep;
@Autowired
private ApiLogRep apiLogRep;
@Autowired
@@ -88,24 +92,29 @@
String wjlx;
String wjmc;
List<Api1109> api1109List;
- List<Fz40InoutRecord> listInout;
+ List<Api1202> api1202List;
+ List<Api1205> api1205List;
+ String str = "";
for (Fz40FileInfo sysData : list) {
if (StringUtils.isEmpty(sysData.getBizId())) {
continue;
}
//鏍规嵁鍥剧墖id鏌ヨ瀵瑰簲鍑哄叆搴撲俊鎭�
- listInout = fzzySync1202Rep.listInoutRecordById(sysData.getBizId());
- if (null == listInout || listInout.isEmpty()) {
- continue;
+ if(sysData.getBizId().startsWith(IMG_START_R)){
+ api1202List = api1202Rep.getDataByBizId(sysData.getBizId());
+ if (null == api1202List || api1202List.isEmpty()) {
+ continue;
+ }
+ str = api1202List.get(0).getRkywdh();
}
- //鑻ュ嚭鍏ュ簱淇℃伅涓哄垹闄ゆ垨鑰呴敊璇姸鎬侊紝鍒欎笉鍚屾
- if ("DEL".equals(listInout.get(0).getRecordStatus()) || "ERROR".equals(listInout.get(0).getRecordStatus())) {
- continue;
+ if(sysData.getBizId().startsWith(IMG_START_C)){
+ api1205List = api1205Rep.getDataByBizId(sysData.getBizId());
+ if (null == api1205List || api1205List.isEmpty()) {
+ continue;
+ }
+ str = api1205List.get(0).getCkywdh();
}
- //鑻ュ嚭鍏ュ簱淇℃伅涓叆搴撻噸閲忎负绌烘垨涓�0锛屽垯涓嶅悓姝�
- if (null == listInout.get(0).getRecordWeight() || listInout.get(0).getRecordWeight() == 0) {
- continue;
- }
+
//鍙悓姝ョО閲�
if (BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())) {
wjlx = "";
@@ -133,7 +142,7 @@
apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());
//鏂囦欢鍚嶇О
- wjmc = getImgNameType(wjmc, sysData.getBizTag(), sysData.getBizId(), sysData.getFileName(), map);
+ wjmc = getImgNameType(wjmc, sysData.getBizTag(), str, sysData.getFileName(), map);
apiData.setWjmc(wjmc);
//鏂囦欢绫诲瀷
apiData.setWjlx(wjlx);
--
Gitblit v1.9.3