From b19a8901f4060dcfd4cc2477374da2a7da267336 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 20 十一月 2023 22:02:03 +0800
Subject: [PATCH] 优化3.5版本同步数据
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java | 140 +++++++++++++++++++++++++++-------------------
1 files changed, 82 insertions(+), 58 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 12fb26d..1aec675 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
@@ -12,12 +12,15 @@
import com.fzzy.api.view.repository.Api1205Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy35.entity.Fz35FileInfo;
+import com.fzzy.async.fzzy35.entity.Fz35InoutRecord;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1109Rep;
+import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
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.*;
+import java.util.stream.Collectors;
/**
* 鏂囦欢淇℃伅
@@ -45,9 +48,16 @@
private final static String BIZ_TAG_WEIGHT_EMPTY = "WEIGHT_EMPTY";
private final static String BIZ_TAG_REGISTER = "REGISTER";
private final static String BIZ_TAG_HANDLE = "HANDLE";
+ /**
+ * 鍑哄叆搴撶被鍨�
+ */
+ private final static String INOUT_TYPE_IN = "IN";
+ private final static String INOUT_TYPE_OUT = "OUT";
@Autowired
private Fzzy35Sync1109Rep fzzySync1109Rep;
+ @Autowired
+ private Fzzy35Sync1202Rep fzzySync1202Rep;
@Autowired
private Api1109Rep api1109Rep;
@Autowired
@@ -79,7 +89,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz35FileInfo> list = fzzySync1109Rep.listFileInfo(start, end);
+ List<Fz35InoutRecord> list = fzzySync1202Rep.listInAndOutRecord(deptId, INOUT_TYPE_IN, INOUT_TYPE_OUT, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒版枃浠朵俊鎭�------------------");
@@ -94,76 +104,90 @@
List<Api1202> api1202List;
List<Api1205> api1205List;
String str = "";
- for (Fz35FileInfo sysData : list) {
- if (StringUtils.isEmpty(sysData.getBizId())) {
+ List<Fz35FileInfo> fileList; //鏂囦欢淇℃伅
+ List<String> ids;
+ for (Fz35InoutRecord inoutData : list) {
+ if (inoutData.getRecordStatus().equals("DEL") || inoutData.getRecordStatus().equals("ERROR")) {
continue;
}
+ ids = new ArrayList<>();
+ wjlx = "";
+
//鏍规嵁鍥剧墖id鏌ヨ瀵瑰簲鍑哄叆搴撲俊鎭�
- if(sysData.getBizId().startsWith(IMG_START_R)){
- api1202List = api1202Rep.getDataByBizId(sysData.getBizId());
+ if(inoutData.getType().startsWith(INOUT_TYPE_IN)){
+ wjlx = IMG_TYPE_2;
+ api1202List = api1202Rep.getDataByBizId(inoutData.getId());
if (null == api1202List || api1202List.isEmpty()) {
continue;
}
- str = api1202List.get(0).getRkywdh();
+ ids = api1202List.stream().map(Api1202::getRkywdh).collect(Collectors.toList());
}
- if(sysData.getBizId().startsWith(IMG_START_C)){
- api1205List = api1205Rep.getDataByBizId(sysData.getBizId());
+ if (inoutData.getType().equals(INOUT_TYPE_OUT)) {
+ wjlx = IMG_TYPE_3;
+ api1205List = api1205Rep.getDataByBizId(inoutData.getId());
if (null == api1205List || api1205List.isEmpty()) {
continue;
}
- str = api1205List.get(0).getCkywdh();
+ ids = api1205List.stream().map(Api1205::getCkywdh).collect(Collectors.toList());
}
+ //鑻ユ枃浠剁被鍨嬩负绌猴紝鍒欒烦杩�
+ if (StringUtils.isEmpty(wjlx)) {
+ continue;
+ }
+ //鏍规嵁鍑哄叆搴撳崟鍙疯幏鍙栧搴旀枃浠朵俊鎭�
+ fileList = fzzySync1109Rep.listFileInfoByBizId(inoutData.getId());
+ if (null == fileList || fileList.isEmpty()) {
+ continue;
+ }
+ int num = 1;
+ int idsNum = 0;
+ for (Fz35FileInfo sysData : fileList) {
+ //鍙悓姝ョО閲�
+ if(BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())){
+ if(num > 6){
+ num = 1;
+ idsNum ++;
+ }
+ if(idsNum == ids.size()){
+ break;
+ }
+ str = ids.get(idsNum);
- //鍙悓姝ョО閲�
- if(BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())){
- wjlx = "";
- wjmc = kqdm;
- //鍏ュ簱鎶撴媿鍥�
- if (sysData.getBizId().startsWith(IMG_START_R)) {
- wjlx = IMG_TYPE_2;
- wjmc += "_" + Constant.INOUT_TYPE_14 + sysData.getBizId().substring(4);
+ wjmc = kqdm + "_" + str;
+
+ apiData = new Api1109();
+
+ //涓婚敭id
+ apiData.setId(UUID.randomUUID().toString());
+ //鏂囦欢璺緞
+ apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());
+
+ //鏂囦欢鍚嶇О
+ wjmc = getImgNameType(wjmc, sysData.getBizTag(), str, sysData.getFileName(), map);
+ apiData.setWjmc(wjmc);
+ //鏂囦欢绫诲瀷
+ apiData.setWjlx(wjlx);
+
+ //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+ apiData.setZhgxsj(new Date());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setBizId(sysData.getFileId());
+ 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);
+ num ++;
+ log.info("1109---鍚屾鏁版嵁锛歿}", apiData.toString());
}
- //鍑哄簱鎶撴媿鍥�
- if (sysData.getBizId().startsWith(IMG_START_C)) {
- wjlx = IMG_TYPE_3;
- wjmc += "_" + Constant.INOUT_TYPE_15 + sysData.getBizId().substring(4);
- }
- //鑻ユ枃浠剁被鍨嬩负绌猴紝鍒欒烦杩�
- if(StringUtils.isEmpty(wjlx)){
- continue;
- }
-
- apiData = new Api1109();
-
- //涓婚敭id
- apiData.setId(UUID.randomUUID().toString());
- //鏂囦欢璺緞
- apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());
-
- //鏂囦欢鍚嶇О
- wjmc = getImgNameType(wjmc, sysData.getBizTag(), str, sysData.getFileName(), map);
- apiData.setWjmc(wjmc);
- //鏂囦欢绫诲瀷
- apiData.setWjlx(wjlx);
-
- //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setZhgxsj(sysData.getCreateTime());
-
- //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
- apiData.setBizId(sysData.getFileId());
- 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());
}
}
} catch (Exception e) {
--
Gitblit v1.9.3