From b51b4406e1d0d0ab897a8a874e1f7e0f5e900236 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 20 十月 2023 17:50:01 +0800
Subject: [PATCH] 调整上海接口-船运分车上传时的照片同步
---
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java | 4 +
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java | 147 +++++++++++++++++++++---------------
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java | 4 -
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java | 50 ++++++------
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1109Rep.java | 3
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 6
6 files changed, 122 insertions(+), 92 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index e90c117..94ce819 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -70,7 +70,7 @@
// fzzySync1202.syncData(kqdm, deptId, start, end);
//
// //绮鍏ュ簱璐ㄦ
- fzzySync1203.syncData(kqdm, deptId, start, end);
+// fzzySync1203.syncData(kqdm, deptId, start, end);
//
// //绮鍏ュ簱缁撶畻
// fzzySync1204.syncData(kqdm, deptId, start, end);
@@ -85,10 +85,10 @@
// fzzySync1207.syncData(kqdm, deptId, start, end);
//
// //鍑哄叆搴撴枃浠朵俊鎭悓姝�
-// fzzySync1109.syncData(kqdm, deptId, start, end);
+ fzzySync1109.syncData(kqdm, deptId, start, end);
//绮搴撳瓨鍚屾
- fzzySync1208.syncData(kqdm, deptId, start, end);
+// fzzySync1208.syncData(kqdm, deptId, start, end);
//绮鎬ц川杞彉淇℃伅鍚屾
// fzzySync1210.syncData(kqdm, deptId, start, end);
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
index 5325c26..05cb5f6 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
@@ -51,31 +51,31 @@
//鐔忚捀澶囨鏁版嵁鍚屾
fzzySync1023.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
}
-// if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
-// //涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ョ伯鎯呰澶囬厤缃俊鎭�
-//
-// //鍚屾绮儏璁惧閰嶇疆淇℃伅
-// fzzy40Sync2103.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-// //瑙嗛鐩戞帶淇℃伅鍚屾
-// fzzySync1311.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-// }
-//
-// /*-----鍏叡鎺ュ彛-----*/
-//
-// //娓╂箍搴︽娴嬫暟鎹悓姝�
-// fzzySync1302.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-//
-// //铏妫�娴嬪悓姝�
-// fzzySync1303.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-//
-// //姘斾綋妫�娴嬪悓姝�
-// fzzySync1304.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-//
-// //璐ㄦ鍚屾
-// fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-//
-// //閫氶浣滀笟淇℃伅鍚屾
-// fzzySync1305.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
+ //涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ョ伯鎯呰澶囬厤缃俊鎭�
+
+ //鍚屾绮儏璁惧閰嶇疆淇℃伅
+ fzzy40Sync2103.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ //瑙嗛鐩戞帶淇℃伅鍚屾
+ fzzySync1311.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ }
+
+ /*-----鍏叡鎺ュ彛-----*/
+
+ //娓╂箍搴︽娴嬫暟鎹悓姝�
+ fzzySync1302.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //铏妫�娴嬪悓姝�
+ fzzySync1303.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //姘斾綋妫�娴嬪悓姝�
+ fzzySync1304.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //璐ㄦ鍚屾
+ fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //閫氶浣滀笟淇℃伅鍚屾
+ fzzySync1305.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
//鐔忚捀浣滀笟淇℃伅鍚屾
fzzySync1306.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
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 8dfe38f..f326938 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
@@ -12,13 +12,16 @@
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;
import org.springframework.stereotype.Component;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 鏂囦欢淇℃伅
@@ -46,9 +49,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 Fzzy40Sync1109Rep fzzySync1109Rep;
+ @Autowired
+ private Fzzy40Sync1202Rep fzzySync1202Rep;
@Autowired
private Api1109Rep api1109Rep;
@Autowired
@@ -80,7 +90,8 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40FileInfo> list = fzzySync1109Rep.listFileInfo(start, end);
+ //鑾峰彇鍑哄叆搴撴暟鎹�
+ List<Fz40InoutRecord> list = fzzySync1202Rep.listInAndOutRecord(deptId, INOUT_TYPE_IN, INOUT_TYPE_OUT, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒版枃浠朵俊鎭�------------------");
@@ -94,77 +105,93 @@
List<Api1109> api1109List;
List<Api1202> api1202List;
List<Api1205> api1205List;
- String str = "";
- for (Fz40FileInfo sysData : list) {
- if (StringUtils.isEmpty(sysData.getBizId())) {
+ String str = ""; //鍑哄叆搴撲笟鍔″崟鍙�
+ List<Fz40FileInfo> fileList; //鏂囦欢淇℃伅
+ List<String> ids;
+ for (Fz40InoutRecord inoutData : list) {
+ if (inoutData.getRecordStatus().equals("DEL") || inoutData.getRecordStatus().equals("ERROR")) {
continue;
}
- //鏍规嵁鍥剧墖id鏌ヨ瀵瑰簲鍑哄叆搴撲俊鎭�
- if(sysData.getBizId().startsWith(IMG_START_R)){
- api1202List = api1202Rep.getDataByBizId(sysData.getBizId());
+ ids = new ArrayList<>();
+ wjlx = "";
+ //鑾峰彇鍑哄叆搴撲笟鍔″崟鍙蜂俊鎭�
+ if (inoutData.getType().equals(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 (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);
+ //鑻ユ枃浠剁被鍨嬩负绌猴紝鍒欒烦杩�
+ if (StringUtils.isEmpty(wjlx)) {
+ continue;
+ }
+
+ //鏍规嵁鍑哄叆搴撳崟鍙疯幏鍙栧搴旀枃浠朵俊鎭�
+ fileList = fzzySync1109Rep.listFileInfoByBizId(inoutData.getId());
+ if (null == fileList || fileList.isEmpty()) {
+ continue;
+ }
+ int num = 1;
+ int idsNum = 0;
+ for (Fz40FileInfo 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);
+
+ 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(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);
+ 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) {
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
index 03c7f7d..e5bb2b7 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
@@ -4,18 +4,14 @@
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.view.repository.Api1305Rep;
import com.fzzy.api.view.repository.Api1306Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy40.entity.Fz40AreationData;
import com.fzzy.async.fzzy40.entity.Fz40DrugLog;
-import com.fzzy.async.fzzy40.repository.Fzzy40Sync1305Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1306Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.Date;
import java.util.List;
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1109Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1109Rep.java
index f6cce6c..2f3c81f 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1109Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1109Rep.java
@@ -22,4 +22,7 @@
*/
@Query("from Fz40FileInfo where createTime >=:start and createTime <:end order by createTime ")
List<Fz40FileInfo> listFileInfo(@Param("start") Date start, @Param("end") Date end);
+
+ @Query("from Fz40FileInfo where bizId =:bizId order by createTime ")
+ List<Fz40FileInfo> listFileInfoByBizId(@Param("bizId") String bizId);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java
index 95446b6..1c579e2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java
@@ -50,4 +50,8 @@
List<Fz40InoutRecord> listInoutRecord(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+ @Query("from Fz40InoutRecord where deptId=:deptId and (type=:type1 or type=:type2) and updateTime >=:start and updateTime <=:end order by id ")
+ List<Fz40InoutRecord> listInAndOutRecord(@Param("deptId") String deptId, @Param("type1") String type1, @Param("type2") String type2, @Param("start") Date start, @Param("end") Date end);
+
+
}
--
Gitblit v1.9.3