From ce9d44e48aa77ebf2537f22ff8bf4a70089d0474 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 22 八月 2023 18:17:29 +0800
Subject: [PATCH] 优化3.5和4.0版本的出入库信息同步
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
index 358b420..bef4291 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
@@ -2,18 +2,21 @@
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.fzzy35.entity.FileInfo;
+import com.fzzy.async.fzzy35.entity.Fz35FileInfo;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1109Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.*;
/**
@@ -48,6 +51,10 @@
@Autowired
private Api1109Rep api1109Rep;
@Autowired
+ private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1205Rep api1205Rep;
+ @Autowired
private ApiLogRep apiLogRep;
@Autowired
private FileUtil fileUtil;
@@ -72,7 +79,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<FileInfo> list = fzzySync1109Rep.listFileInfo(start, end);
+ List<Fz35FileInfo> list = fzzySync1109Rep.listFileInfo(start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒版枃浠朵俊鎭�------------------");
@@ -83,10 +90,30 @@
Api1109 apiData;
String wjlx;
String wjmc;
- for (FileInfo sysData : list) {
+ List<Api1109> api1109List;
+ List<Api1202> api1202List;
+ List<Api1205> api1205List;
+ String str = "";
+ for (Fz35FileInfo sysData : list) {
if (StringUtils.isEmpty(sysData.getBizId())) {
continue;
}
+ //鏍规嵁鍥剧墖id鏌ヨ瀵瑰簲鍑哄叆搴撲俊鎭�
+ if(sysData.getBizId().startsWith(IMG_START_R)){
+ api1202List = api1202Rep.getDataByBizId(sysData.getBizId());
+ if (null == api1202List || api1202List.isEmpty()) {
+ continue;
+ }
+ str = api1202List.get(0).getRkywdh();
+ }
+ if(sysData.getBizId().startsWith(IMG_START_C)){
+ api1205List = api1205Rep.getDataByBizId(sysData.getBizId());
+ if (null == api1205List || api1205List.isEmpty()) {
+ continue;
+ }
+ str = api1205List.get(0).getCkywdh();
+ }
+
//鍙悓姝ョО閲�
if(BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())){
wjlx = "";
@@ -114,13 +141,12 @@
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);
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setCzbz(Constant.CZBZ_I);
apiData.setZhgxsj(new Date());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
@@ -128,6 +154,13 @@
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
+ api1109List = api1109Rep.getDataByBizId(apiData.getBizId());
+ if(null == api1109List || api1109List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1109List.get(0).getCzbz());
+ }
+
//淇濆瓨鏁版嵁
api1109Rep.save(apiData);
log.info("1109---鍚屾鏁版嵁锛歿}", apiData.toString());
--
Gitblit v1.9.3