From 7594c1e78092208fb07acecbf4d9d57ba12af7d3 Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期四, 25 五月 2023 12:02:30 +0800
Subject: [PATCH] 优化非正常状态的出入库数据下的文件信息不同步
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java | 20 +++++++++-
src/main/resources/application-pro.yml | 10 ++--
src/main/resources/application.yml | 2
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java | 44 +++++++++++-----------
4 files changed, 46 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
index fadc527..15a0549 100644
--- a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
@@ -50,32 +50,32 @@
Date end = param.getEnd();
-// //鍚堝悓鍚屾
-// fzzySync1201.syncData(kqdm, deptId, start, end);
-//
-// //绮鍏ュ簱鍚屾
-// fzzySync1202.syncData(kqdm, deptId, start, end);
+ //鍚堝悓鍚屾
+ fzzySync1201.syncData(kqdm, deptId, start, end);
+
+ //绮鍏ュ簱鍚屾
+ fzzySync1202.syncData(kqdm, deptId, start, end);
//绮鍏ュ簱璐ㄦ鍚屾
fzzySync1203.syncData(kqdm, deptId, start, end);
-// //绮鍏ュ簱缁撶畻鍚屾
-// fzzySync1204.syncData(kqdm, deptId, start, end);
-//
-// //绮鍑哄簱鍚屾
-// fzzySync1205.syncData(kqdm, deptId, start, end);
-//
-// //绮鍑哄簱缁撶畻鍚屾
-// fzzySync1206.syncData(kqdm, deptId, start, end);
-//
-// //绮鎹熸孩鍚屾
-// fzzySync1209.syncData(kqdm, deptId, start, end);
-//
-// //鏂囦欢淇℃伅鍚屾
-// fzzy35Sync1109.syncData(kqdm, deptId, start, end);
-//
-// //绮搴撳瓨鍚屾
-// fzzySync1208.syncData(kqdm, deptId, start, end);
+ //绮鍏ュ簱缁撶畻鍚屾
+ fzzySync1204.syncData(kqdm, deptId, start, end);
+
+ //绮鍑哄簱鍚屾
+ fzzySync1205.syncData(kqdm, deptId, start, end);
+
+ //绮鍑哄簱缁撶畻鍚屾
+ fzzySync1206.syncData(kqdm, deptId, start, end);
+
+ //绮鎹熸孩鍚屾
+ fzzySync1209.syncData(kqdm, deptId, start, end);
+
+ //鏂囦欢淇℃伅鍚屾
+ fzzy35Sync1109.syncData(kqdm, deptId, start, end);
+
+ //绮搴撳瓨鍚屾
+ fzzySync1208.syncData(kqdm, deptId, start, end);
}
}
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 a7a0cd0..20589bd 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
@@ -2,19 +2,19 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1109;
-import com.fzzy.api.entity.Api1201;
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.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.*;
/**
@@ -46,6 +46,8 @@
@Autowired
private Fzzy35Sync1109Rep fzzySync1109Rep;
+ @Autowired
+ private Fzzy35Sync1202Rep fzzySync1202Rep;
@Autowired
private Api1109Rep api1109Rep;
@Autowired
@@ -85,10 +87,24 @@
String wjlx;
String wjmc;
List<Api1109> api1109List;
+ List<Fz35InoutRecord> listInout;
for (Fz35FileInfo sysData : list) {
if (StringUtils.isEmpty(sysData.getBizId())) {
continue;
}
+ //鏍规嵁鍥剧墖id鏌ヨ瀵瑰簲鍑哄叆搴撲俊鎭�
+ listInout = fzzySync1202Rep.listInoutRecordById(sysData.getBizId());
+ if(null == listInout || listInout.isEmpty()){
+ continue;
+ }
+ //鑻ュ嚭鍏ュ簱淇℃伅涓哄垹闄ゆ垨鑰呴敊璇姸鎬侊紝鍒欎笉鍚屾
+ if("DEL".equals(listInout.get(0).getRecordStatus()) || "ERROR".equals(listInout.get(0).getRecordStatus())){
+ continue;
+ }
+ //鑻ュ嚭鍏ュ簱淇℃伅涓叆搴撻噸閲忎负绌烘垨涓�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 = "";
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index f027b84..249c112 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 涓婃捣鍢夊畾 ##########################
+########################## 骞夸笢娼槼 ##########################
server:
port: 8090
jetty:
@@ -11,13 +11,13 @@
primary:
url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
username: root
- password: root
+ password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
username: root
- password: root
+ password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
jpa:
#涓籮pa閰嶇疆
@@ -38,7 +38,7 @@
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
# Redis鐩稿叧閰嶇疆
redis:
- database: 1
+ database: 0
host: 127.0.0.1
port: 6379
password: Abc123..
@@ -51,7 +51,7 @@
timeout: 6000
igds:
default:
- companyId: 5303
+ companyId: 5317
file-path: D:/IGDS-API/FILE/
img-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0e225ad..bf2561d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,7 @@
########################## Server ##########################
spring:
profiles:
- active: dev
+ active: pro
application:
name: igds-api
main:
--
Gitblit v1.9.3