From 7494eb35eb0e6a3f33dff907133e59f677800003 Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期四, 25 五月 2023 11:29:27 +0800
Subject: [PATCH] 优化3.5版本同步时，操作标志的状态
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java | 3
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 4
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java | 13 ++
src/main/java/com/fzzy/api/view/repository/Api1303Rep.java | 3
src/main/java/com/fzzy/api/view/pr/Api1109PR.java | 2
src/main/resources/application-pro.yml | 3
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 4
src/main/java/com/fzzy/api/view/repository/Api1209Rep.java | 3
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java | 11 +-
src/main/java/com/fzzy/api/view/repository/Api1302Rep.java | 3
src/main/java/com/fzzy/api/view/repository/Api1404Rep.java | 3
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java | 18 +++-
src/main/resources/application-pro5303.yml | 2
src/main/java/com/fzzy/api/view/repository/Api1403Rep.java | 3
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java | 2
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1209.java | 9 ++
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java | 10 ++
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1303.java | 9 +
src/main/java/com/fzzy/api/view/repository/Api1310Rep.java | 2
src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItem.java | 8 +-
src/main/java/com/fzzy/api/view/repository/Api1304Rep.java | 3
src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItemKey.java | 18 ++++
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1404.java | 8 +
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java | 4
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1304.java | 12 +-
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java | 2
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java | 44 +++++-----
27 files changed, 148 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1109PR.java b/src/main/java/com/fzzy/api/view/pr/Api1109PR.java
index f1b99db..f3bd298 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1109PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1109PR.java
@@ -135,7 +135,7 @@
result += responseDto.toString();
if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(d.getCzbz())) {
- api1109Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U);
+ api1109Rep.updateStatus(data.getId(), Constant.CZBZ_U);
}
}
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1209Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1209Rep.java
index 7ed6f13..2beaeb9 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1209Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1209Rep.java
@@ -21,4 +21,7 @@
@Modifying
@Query("update Api1209 set czbz =:czbz where sydh=:sydh")
void updateStatus(@Param("sydh") String sydh, @Param("czbz") String czbz);
+
+ @Query("from Api1209 where sydh=:sydh ")
+ List<Api1209> getDataBySydh(@Param("sydh") String sydh);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1302Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1302Rep.java
index 43aa687..4131c9e 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1302Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1302Rep.java
@@ -21,4 +21,7 @@
@Modifying
@Query("update Api1302 set czbz =:czbz where wsdjcdh=:wsdjcdh")
void updateStatus(@Param("wsdjcdh") String wsdjcdh, @Param("czbz") String czbz);
+
+ @Query("from Api1302 where wsdjcdh=:wsdjcdh ")
+ List<Api1302> getDataByWsdjcdh(@Param("wsdjcdh") String wsdjcdh);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1303Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1303Rep.java
index 65527d7..9426930 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1303Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1303Rep.java
@@ -20,4 +20,7 @@
@Modifying
@Query("update Api1303 set czbz =:czbz where hcjcdh=:id")
void updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+
+ @Query("from Api1303 where hcjcdh=:hcjcdh ")
+ List<Api1303> getDataByHcjcdh(@Param("hcjcdh") String hcjcdh);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1304Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1304Rep.java
index b42ad8d..b88879a 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1304Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1304Rep.java
@@ -21,4 +21,7 @@
@Modifying
@Query("update Api1304 set czbz =:czbz where qtndjcdh=:id")
void updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+
+ @Query("from Api1304 where qtndjcdh=:qtndjcdh ")
+ List<Api1304> getDataByQtndjcdh(@Param("qtndjcdh") String qtndjcdh);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java
index 56eb8bc..77397db 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java
@@ -22,4 +22,6 @@
@Query("update Api1310 set czbz =:czbz where zjbgdh=:id")
void updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+ @Query("from Api1310 where zjbgdh=:zjbgdh ")
+ List<Api1310> getDataByZjbgdh(@Param("zjbgdh") String zjbgdh);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1403Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1403Rep.java
index 632750d..66383b8 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1403Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1403Rep.java
@@ -20,4 +20,7 @@
@Modifying
@Query("update Api1403 set czbz =:czbz where lhjhdh=:id")
void updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+
+ @Query("from Api1403 where lhjhdh=:lhjhdh ")
+ List<Api1403> getDataByLhjhdh(@Param("lhjhdh") String lhjhdh);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java
index 4337622..1ae94ab 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java
@@ -21,4 +21,7 @@
@Query("update Api1404 set czbz =:czbz where jhmxdh=:id")
void updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+
+ @Query("from Api1404 where jhmxdh=:jhmxdh ")
+ List<Api1404> getDataByJhmxdh(@Param("jhmxdh") String jhmxdh);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
index 15a0549..fadc527 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/entity/Fz35CheckItem.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItem.java
index 773ed7e..fbe5669 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItem.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItem.java
@@ -3,10 +3,7 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
import java.io.Serializable;
/**
@@ -21,6 +18,7 @@
@Data
@Entity
@Table(name = "D_CHECK_ITEM")
+@IdClass(Fz35CheckItemKey.class)
public class Fz35CheckItem implements Serializable {
/**
@@ -33,10 +31,12 @@
@PropertyDef(label = "妫�娴嬬紪鐮�")
private String checkId;
+ @Id
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
+ @Id
@Column(name = "STANDARD_ID_", length = 40)
@PropertyDef(label = "妫�娴嬮」缂栫爜")
private String standardId;
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItemKey.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItemKey.java
new file mode 100644
index 0000000..09c76c1
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItemKey.java
@@ -0,0 +1,18 @@
+package com.fzzy.async.fzzy35.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+public class Fz35CheckItemKey implements Serializable {
+ private String checkId;
+ private String companyId;
+ private String standardId;
+
+ public Fz35CheckItemKey(){
+ super();
+ }
+ }
\ No newline at end of file
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 3de9c9e..a7a0cd0 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
@@ -132,6 +132,8 @@
api1109List = api1109Rep.getDataByBizId(apiData.getBizId());
if(null == api1109List || api1109List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1109List.get(0).getCzbz());
}
//淇濆瓨鏁版嵁
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
index 0e86cec..3af0978 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
@@ -132,6 +132,8 @@
api1201List = api1201Rep.getDataById(apiData.getHth());
if(null == api1201List || api1201List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1201List.get(0).getCzbz());
}
//淇濆瓨鏁版嵁
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
index cbc63a9..c5582d0 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -83,7 +83,7 @@
Calendar c = Calendar.getInstance();
for (Fz35InoutRecord sysData : list) {
//鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
- if(sysData.getRecordWeight() == 0){
+ if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
continue;
}
//鑾峰彇璐т綅淇℃伅
@@ -186,6 +186,8 @@
api1202List = api1202Rep.getDataById(apiData.getRkywdh());
if(null == api1202List || api1202List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1202List.get(0).getCzbz());
}
//淇濆瓨鏁版嵁
api1202Rep.save(apiData);
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
index 43d445f..ed9b4f6 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -13,6 +13,7 @@
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1203Rep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -87,12 +88,12 @@
List<Api1203> api1203List;
for (Fz35InoutRecord sysData : list) {
//鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
- if(sysData.getRecordWeight() == 0){
+ if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
continue;
}
fz35CheckItems = null;
//鑾峰彇鍏ュ簱璐ㄦ淇℃伅
- fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId());
+ fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId(), deptId.substring(0, 4));
if (null == fz35CheckItems || fz35CheckItems.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒板綋鍓嶅叆搴撹川妫�淇℃伅--------------");
continue;
@@ -127,16 +128,19 @@
if (gbCheckList == null || gbCheckList.isEmpty()) {
continue;
}
+ if (StringUtils.isEmpty(fz35CheckItem.getValue())) {
+ continue;
+ }
jyxm += gbCheckList.get(0).getCode() + ",";
jyz += fz35CheckItem.getValue() + ",";
- zkj += "0.0,";
- zkl += "0.0,";
+ zkj += ",0.0";
+ zkl += ",0.0";
}
apiData.setJyxm(jyxm);
apiData.setJyz(jyz);
- apiData.setZkj(zkj);
- apiData.setZkl(zkl);
+ apiData.setZkj(zkj.substring(1));
+ apiData.setZkl(zkl.substring(1));
if("UNPASS".equals(sysData.getCheckStatus())){
apiData.setJyjg("0");
}
@@ -165,6 +169,8 @@
api1203List = api1203Rep.getDataById(apiData.getRkjydh());
if(null == api1203List || api1203List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1203List.get(0).getCzbz());
}
//淇濆瓨鏁版嵁
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
index 91702ab..aac0e91 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -82,7 +82,7 @@
Calendar c = Calendar.getInstance();
for (Fz35InoutRecord sysData : list) {
//鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
- if(sysData.getRecordWeight() == 0){
+ if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
continue;
}
//鑾峰彇璐т綅淇℃伅
@@ -169,6 +169,8 @@
api1205List = api1205Rep.getDataById(apiData.getCkywdh());
if(null == api1205List || api1205List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1205List.get(0).getCzbz());
}
//淇濆瓨鏁版嵁
api1205Rep.save(apiData);
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
index ba783be..6778bbd 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
@@ -14,7 +14,6 @@
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.Date;
import java.util.List;
@@ -147,6 +146,8 @@
api1208List = api1208Rep.getDataById(api1105.getHwdm());
if(null == api1208List || api1208List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1208List.get(0).getCzbz());
}
apiData.setId(api1105.getHwdm());
//淇濆瓨鏁版嵁
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1209.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1209.java
index 38c912a..9f1b609 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1209.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1209.java
@@ -73,6 +73,7 @@
Api1209 apiData;
Api1105 api1105;
+ List<Api1209> api1209List;
for (Fz35MLossOver sysData : list) {
//鑾峰彇璐т綅淇℃伅
@@ -104,7 +105,6 @@
apiData.setSysfzc("0");
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setCzbz(Constant.CZBZ_I);
apiData.setZhgxsj(new Date());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
@@ -112,6 +112,13 @@
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
+ api1209List = api1209Rep.getDataBySydh(apiData.getSydh());
+ if(null == api1209List || api1209List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1209List.get(0).getCzbz());
+ }
+
//淇濆瓨鏁版嵁
api1209Rep.save(apiData);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
index c4bf0c7..2103ef8 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
@@ -16,7 +16,6 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.Date;
import java.util.List;
@@ -71,7 +70,7 @@
Date syncTime = new Date();
Api1302 api1302;
Api1105 api1105;
- //int index = 10001;
+ List<Api1302> api1302List;
for (Fz35Grain fz35Grain : list) {
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(fz35Grain.getDepotId());
@@ -113,15 +112,19 @@
api1302.setLssdzjh(getHumPointList2(fz35Grain.getPoints(), fz35Grain.getCable(), fz35Grain.getCableCir()));
}
- api1302.setCzbz(Constant.CZBZ_I);
api1302.setZhgxsj(syncTime);
api1302.setBizId(fz35Grain.getBatchId());
api1302.setKqdm(api1105.getKqdm());
api1302.setSyncTime(syncTime);
+ api1302List = api1302Rep.getDataByWsdjcdh(api1302.getWsdjcdh());
+ if(null == api1302List || api1302List.isEmpty()){
+ api1302.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1302.setCzbz(api1302List.get(0).getCzbz());
+ }
log.info("1302---鍚屾鏁版嵁锛�" + api1302.toString());
api1302Rep.save(api1302);
- // index++;
}
} catch (Exception e) {
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1303.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1303.java
index 6f8bb62..ef3813e 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1303.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1303.java
@@ -68,7 +68,7 @@
Date syncTime = new Date();
Api1303 api1303;
Api1105 api1105;
-
+ List<Api1303> api1303List;
for (Fz35Pest fz35Pest : list) {
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(fz35Pest.getDepotId());
@@ -102,12 +102,17 @@
api1303.setCldjpd("533");
}
- api1303.setCzbz(Constant.CZBZ_I);
api1303.setZhgxsj(syncTime);
api1303.setBizId(fz35Pest.getBatchId());
api1303.setKqdm(api1105.getKqdm());
api1303.setSyncTime(syncTime);
+ api1303List = api1303Rep.getDataByHcjcdh(api1303.getHcjcdh());
+ if(null == api1303List || api1303List.isEmpty()){
+ api1303.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1303.setCzbz(api1303List.get(0).getCzbz());
+ }
api1303Rep.save(api1303);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1304.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1304.java
index 4870429..5cadfc6 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1304.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1304.java
@@ -13,10 +13,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.Date;
import java.util.List;
-
/**
* 铏妫�娴嬫暟鎹悓姝�
@@ -64,7 +62,7 @@
Date syncTime = new Date();
Api1304 api1304;
Api1105 api1105;
- // int index = 10001;
+ List<Api1304> api1304List;
for (Fz35Gas fz35Gas : list) {
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(fz35Gas.getDepotId());
@@ -80,14 +78,18 @@
api1304 = updateGasInfo(api1304, fz35Gas.getPoints());
- api1304.setCzbz(Constant.CZBZ_I);
api1304.setZhgxsj(syncTime);
api1304.setBizId(fz35Gas.getBatchId());
api1304.setKqdm(api1105.getKqdm());
api1304.setSyncTime(syncTime);
+ api1304List = api1304Rep.getDataByQtndjcdh(api1304.getQtndjcdh());
+ if(null == api1304List || api1304List.isEmpty()){
+ api1304.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1304.setCzbz(api1304List.get(0).getCzbz());
+ }
api1304Rep.save(api1304);
- // index++;
}
} catch (Exception e) {
log.error("---鍚屾澶辫触----{}", e);
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java
index 33f9bde..1fea568 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java
@@ -22,7 +22,7 @@
/**
* 璐ㄦ鍚屾
*
- * @author chen
+ * @author czt
* @date 2023-05-14 19:51
*/
@Slf4j
@@ -71,6 +71,7 @@
List<GbCheckItem> gbCheckList;
String jyxm;
String jyxmz;
+ List<Api1310> api1310List;
for (Fz35Quality fz35Quality : list) {
api1105 = commonService.getApi1105Cache(fz35Quality.getDepotId());
if (null == api1105) {
@@ -92,7 +93,7 @@
//妫�娴嬮」锛屾娴嬪��
jyxm = "";
jyxmz = "";
- fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(fz35Quality.getId());
+ fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(fz35Quality.getId(), deptId.substring(0, 4));
if (null != fz35CheckItems && fz35CheckItems.size() > 0) {
for (Fz35CheckItem fz35CheckItem : fz35CheckItems) {
@@ -122,9 +123,15 @@
api1310.setYpdj(StringUtils.isEmpty(fz35Quality.getCheckLevel())?"0": fz35Quality.getCheckLevel());
api1310.setSfzcccnx(StringUtils.isEmpty(fz35Quality.getNormalYear())?"0": fz35Quality.getNormalYear());
api1310.setBz(fz35Quality.getRemark());
- api1310.setCzbz(Constant.CZBZ_I);
api1310.setZhgxsj(new Date());
+ api1310List = api1310Rep.getDataByZjbgdh(api1310.getZjbgdh());
+ if(null == api1310List || api1310List.isEmpty()){
+ api1310.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1310.setCzbz(api1310List.get(0).getCzbz());
+ }
+
api1310Rep.save(api1310);
}
} catch (Exception e) {
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java
index 8d4f1df..acc0f05 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java
@@ -4,7 +4,6 @@
import com.fzzy.api.entity.*;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.*;
-import com.fzzy.async.fzzy35.entity.Fz35CheckItem;
import com.fzzy.async.fzzy35.entity.Fz35Plan;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1403Rep;
import lombok.extern.slf4j.Slf4j;
@@ -57,6 +56,7 @@
Api1403 api1403;
List<Api1101> api1101List;
+ List<Api1403> api1403List;
for (Fz35Plan fz35Plan : list) {
api1403 = new Api1403();
api1403.setLhjhdh(fz35Plan.getId());
@@ -70,10 +70,16 @@
api1403.setJhxddw(api1101List.get(0).getDwdm());
}
api1403.setJhxdsj(fz35Plan.getCreateTime());
- api1403.setCzbz(Constant.CZBZ_I);
+
api1403.setZhgxsj(new Date());
api1403.setKqdm(kqdm);
api1403.setBizId(fz35Plan.getId());
+ api1403List = api1403Rep.getDataByLhjhdh(api1403.getLhjhdh());
+ if(null == api1403List || api1403List.isEmpty()){
+ api1403.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1403.setCzbz(api1403List.get(0).getCzbz());
+ }
api1403Rep.save(api1403);
}
} catch (Exception e) {
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1404.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1404.java
index b92681c..bf3d43b 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1404.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1404.java
@@ -64,6 +64,7 @@
Api1404 api1404;
List<Fz35PlanDetail> fz35PlanDetails;
Api1105 api1105;
+ List<Api1404> api1404List;
for (Fz35Plan fz35Plan : list) {
fz35PlanDetails = fzzy35Sync1404Rep.findDate(fz35Plan.getId());
@@ -85,10 +86,15 @@
api1404.setLhhwdm(fz35PlanDetail.getDepotId());
api1404.setLhsl(fz35PlanDetail.getPlanNum());
api1404.setLhlx(fz35PlanDetail.getType());
- api1404.setCzbz(Constant.CZBZ_I);
api1404.setZhgxsj(new Date());
api1404.setKqdm(kqdm);
api1404.setBizId(fz35PlanDetail.getId());
+ api1404List = api1404Rep.getDataByJhmxdh(api1404.getJhmxdh());
+ if(null == api1404List || api1404List.isEmpty()){
+ api1404.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1404.setCzbz(api1404List.get(0).getCzbz());
+ }
api1404Rep.save(api1404);
}
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java
index 719f1b1..9f54941 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java
@@ -18,6 +18,6 @@
* @param checkId
* @return
*/
- @Query("from Fz35CheckItem where checkId=:checkId order by standardId")
- List<Fz35CheckItem> listInoutCheckItem(@Param("checkId") String checkId);
+ @Query("from Fz35CheckItem where checkId=:checkId and companyId=:companyId order by standardId")
+ List<Fz35CheckItem> listInoutCheckItem(@Param("checkId") String checkId, @Param("companyId") String companyId);
}
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 5a49efd..f027b84 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -52,5 +52,6 @@
igds:
default:
companyId: 5303
- file-path: C:/app/igds-api/
+
+ file-path: D:/IGDS-API/FILE/
img-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/src/main/resources/application-pro5303.yml b/src/main/resources/application-pro5303.yml
index 5a49efd..ab77023 100644
--- a/src/main/resources/application-pro5303.yml
+++ b/src/main/resources/application-pro5303.yml
@@ -52,5 +52,5 @@
igds:
default:
companyId: 5303
- file-path: C:/app/igds-api/
+ file-path: D:/IGDS-API/FILE/
img-path: D:/IGDS/FILE/
\ No newline at end of file
--
Gitblit v1.9.3