From bca371e7ecc906ec824630c32aefd29a7a4f68d0 Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期三, 10 五月 2023 18:48:35 +0800
Subject: [PATCH] 提交库存同步
---
src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutNoticeIn.java | 2
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 10
src/main/java/com/fzzy/async/fzzy35/entity/Fz35PestKey.java | 4
src/main/java/com/fzzy/async/fzzy35/entity/Fz35Building.java | 2
src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java | 2
src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1109.java | 5
src/main/java/com/fzzy/async/fzzy35/entity/Fz35DefaultDept.java | 2
src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutNoticeOut.java | 2
src/main/java/com/fzzy/async/fzzy35/entity/Fz35GasKey.java | 4
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1303Rep.java | 8
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1206.java | 22 +-
src/main/java/com/fzzy/async/fzzy35/entity/Fz35FileInfo.java | 8
src/main/java/com/fzzy/async/fzzy35/entity/Fz35GrainKey.java | 4
src/main/java/com/fzzy/async/fzzy35/entity/Fz35MContract.java | 2
src/main/java/com/fzzy/async/fzzy35/entity/Fz35MLossOver.java | 2
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1204.java | 22 +-
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1111Rep.java | 8
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1208Rep.java | 8
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1202Rep.java | 12
src/main/java/com/fzzy/async/fzzy35/entity/Fz35SecCamera.java | 2
src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItem.java | 2
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1101Rep.java | 9
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java | 6
src/main/java/com/fzzy/async/fzzy35/entity/Fz35DepotKey.java | 4
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1204Rep.java | 8
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java | 46 ++--
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java | 74 ++++---
src/main/java/com/fzzy/async/fzzy35/entity/Fz35Pest.java | 4
src/main/java/com/fzzy/api/view/repository/Api1208Rep.java | 5
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 10
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1109Rep.java | 8
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1102.java | 9
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java | 42 ++--
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncNoticeInRep.java | 9
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1103Rep.java | 10
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1103.java | 6
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java | 20 +-
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1201Rep.java | 8
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1302Rep.java | 8
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java | 6
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1209.java | 6
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java | 6
src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutSettle.java | 2
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1303.java | 20 +-
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1304Rep.java | 8
src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutCheckItem.java | 2
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1101.java | 6
src/main/java/com/fzzy/async/fzzy35/entity/Fz35Depot.java | 4
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1209Rep.java | 8
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncNoticeOutRep.java | 9
src/main/java/com/fzzy/async/fzzy35/entity/Fz35Gas.java | 10
src/main/java/com/fzzy/async/fzzy35/entity/Fz35Grain.java | 4
/dev/null | 17 -
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1102Rep.java | 13
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java | 8
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1304.java | 16
56 files changed, 280 insertions(+), 284 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1208Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1208Rep.java
index f30544e..972c0b1 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1208Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1208Rep.java
@@ -14,11 +14,14 @@
public interface Api1208Rep extends JpaRepository<Api1208, String>, JpaSpecificationExecutor<Api1208> {
- @Query("from Api1208 where kqdm=:kqdm and (czbz= 'i'or czbz = 'u') ")
+ @Query("from Api1208 where kqdm=:kqdm and (czbz= 'i' or czbz = 'u') ")
List<Api1208> findPushData(@Param("kqdm") String kqdm);
@Transactional
@Modifying
@Query("update Api1208 set czbz =:czbz where id=:id")
void updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+
+ @Query("from Api1208 where id=:id ")
+ List<Api1208> getDataById(@Param("id") String id);
}
diff --git a/src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1109.java b/src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1109.java
index 1becf12..8256aeb 100644
--- a/src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1109.java
@@ -7,7 +7,8 @@
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.FileInfo;
+import com.fzzy.async.fzzy30.entity.FileInfo;
+import com.fzzy.async.fzzy30.repository.FzzySync1109Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1109Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -34,7 +35,7 @@
private final static String IMG_TYPE_3 = "3";
@Autowired
- private Fzzy35Sync1109Rep fzzySync1109Rep;
+ private FzzySync1109Rep fzzySync1109Rep;
@Autowired
private Api1109Rep api1109Rep;
@Autowired
diff --git a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
index 0945b99..1eeee2a 100644
--- a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
@@ -49,29 +49,29 @@
Date start = param.getStart();
Date end = param.getEnd();
- //鍚堝悓鍚屾
- 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);
+// //鍚堝悓鍚屾
+// 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);
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Building.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Building.java
similarity index 98%
rename from src/main/java/com/fzzy/async/fzzy35/entity/Building.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35Building.java
index ee0b5bb..14c5771 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/Building.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Building.java
@@ -20,7 +20,7 @@
@Data
@Entity
@Table(name = "D_BUILDING")
-public class Building implements Serializable {
+public class Fz35Building implements Serializable {
/**
*
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/CheckItem.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItem.java
similarity index 97%
rename from src/main/java/com/fzzy/async/fzzy35/entity/CheckItem.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItem.java
index 0252420..773ed7e 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/CheckItem.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItem.java
@@ -21,7 +21,7 @@
@Data
@Entity
@Table(name = "D_CHECK_ITEM")
-public class CheckItem implements Serializable {
+public class Fz35CheckItem implements Serializable {
/**
*
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/DefaultDept.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DefaultDept.java
similarity index 98%
rename from src/main/java/com/fzzy/async/fzzy35/entity/DefaultDept.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35DefaultDept.java
index 187eab6..b927cc2 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/DefaultDept.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DefaultDept.java
@@ -13,7 +13,7 @@
@Data
@Entity
@Table(name = "BDF2_DEPT")
-public class DefaultDept implements Serializable {
+public class Fz35DefaultDept implements Serializable {
private static final long serialVersionUID = -7669420244144806105L;
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Depot.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Depot.java
similarity index 97%
rename from src/main/java/com/fzzy/async/fzzy35/entity/Depot.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35Depot.java
index 0621bc0..be541da 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/Depot.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Depot.java
@@ -19,8 +19,8 @@
@Data
@Entity
@Table(name = "D_DEPOT")
-@IdClass(DepotKey.class)
-public class Depot implements Serializable {
+@IdClass(Fz35DepotKey.class)
+public class Fz35Depot implements Serializable {
@Id
@Column(name = "ID_", length = 50)
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/DepotKey.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DepotKey.java
similarity index 74%
rename from src/main/java/com/fzzy/async/fzzy35/entity/DepotKey.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35DepotKey.java
index 63b5005..dbbcb88 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/DepotKey.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DepotKey.java
@@ -7,10 +7,10 @@
@Data
@AllArgsConstructor
-public class DepotKey implements Serializable {
+public class Fz35DepotKey implements Serializable {
private String id;
private String companyId;
- public DepotKey(){
+ public Fz35DepotKey(){
super();
}
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/FileInfo.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35FileInfo.java
similarity index 88%
rename from src/main/java/com/fzzy/async/fzzy35/entity/FileInfo.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35FileInfo.java
index 031f08f..04e14f5 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/FileInfo.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35FileInfo.java
@@ -22,7 +22,7 @@
@Data
@Entity
@Table(name = "D_FILE")
-public class FileInfo implements Serializable {
+public class Fz35FileInfo implements Serializable {
private static final long serialVersionUID = 86018008520229637L;
@@ -51,16 +51,16 @@
@Column(name = "CREATE_TIME_")
private Date createTime;
- public FileInfo(){
+ public Fz35FileInfo(){
super();
}
- public FileInfo(String fileName, String type, String imgDataStr, Date createTime) {
+ public Fz35FileInfo(String fileName, String type, String imgDataStr, Date createTime) {
this.fileName = fileName;
this.createTime = createTime;
}
- public FileInfo(FileInfo file){
+ public Fz35FileInfo(Fz35FileInfo file){
this.createTime = file.getCreateTime();
this.fileName = file.getFileName();
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Gas.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Gas.java
similarity index 94%
rename from src/main/java/com/fzzy/async/fzzy35/entity/Gas.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35Gas.java
index 54c6a0d..39d8536 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/Gas.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Gas.java
@@ -16,8 +16,8 @@
@Data
@Entity
@Table(name = "D_GAS")
-@IdClass(GasKey.class)
-public class Gas implements Serializable {
+@IdClass(Fz35GasKey.class)
+public class Fz35Gas implements Serializable {
private static final long serialVersionUID = 1L;
@@ -113,12 +113,12 @@
private String remark;
- public Gas() {
+ public Fz35Gas() {
super();
}
- public Gas(String batchId, String companyId, String depotId,
- Date receiveDate) {
+ public Fz35Gas(String batchId, String companyId, String depotId,
+ Date receiveDate) {
super();
this.batchId = batchId;
this.companyId = companyId;
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/PestKey.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35GasKey.java
similarity index 78%
rename from src/main/java/com/fzzy/async/fzzy35/entity/PestKey.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35GasKey.java
index f74131e..9c7b7f6 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/PestKey.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35GasKey.java
@@ -7,11 +7,11 @@
@Data
@AllArgsConstructor
-public class PestKey implements Serializable {
+public class Fz35GasKey implements Serializable {
private String batchId;
private String companyId;
private String depotId;
- public PestKey(){
+ public Fz35GasKey(){
super();
}
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Grain.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Grain.java
similarity index 97%
rename from src/main/java/com/fzzy/async/fzzy35/entity/Grain.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35Grain.java
index 2540530..4185eb3 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/Grain.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Grain.java
@@ -19,8 +19,8 @@
@Data
@Entity
@Table(name = "D_GRAIN")
-@IdClass(GrainKey.class)
-public class Grain implements Serializable {
+@IdClass(Fz35GrainKey.class)
+public class Fz35Grain implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/PestKey.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35GrainKey.java
similarity index 77%
copy from src/main/java/com/fzzy/async/fzzy35/entity/PestKey.java
copy to src/main/java/com/fzzy/async/fzzy35/entity/Fz35GrainKey.java
index f74131e..c424ddb 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/PestKey.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35GrainKey.java
@@ -7,11 +7,11 @@
@Data
@AllArgsConstructor
-public class PestKey implements Serializable {
+public class Fz35GrainKey implements Serializable {
private String batchId;
private String companyId;
private String depotId;
- public PestKey(){
+ public Fz35GrainKey(){
super();
}
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/InoutCheckItem.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutCheckItem.java
similarity index 96%
rename from src/main/java/com/fzzy/async/fzzy35/entity/InoutCheckItem.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutCheckItem.java
index 7ef42d3..c15b36f 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/InoutCheckItem.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutCheckItem.java
@@ -22,7 +22,7 @@
@Data
@Entity
@Table(name = "D_INOUT_CHECK_ITEM")
-public class InoutCheckItem implements Serializable {
+public class Fz35InoutCheckItem implements Serializable {
/**
*
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/InoutNoticeIn.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutNoticeIn.java
similarity index 98%
rename from src/main/java/com/fzzy/async/fzzy35/entity/InoutNoticeIn.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutNoticeIn.java
index b8d71dd..161adde 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/InoutNoticeIn.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutNoticeIn.java
@@ -14,7 +14,7 @@
@Data
@Entity
@Table(name = "D_INOUT_NOTICE_IN")
-public class InoutNoticeIn implements Serializable {
+public class Fz35InoutNoticeIn implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/InoutNoticeOut.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutNoticeOut.java
similarity index 98%
rename from src/main/java/com/fzzy/async/fzzy35/entity/InoutNoticeOut.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutNoticeOut.java
index 6f25d90..a457412 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/InoutNoticeOut.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutNoticeOut.java
@@ -14,7 +14,7 @@
@Data
@Entity
@Table(name = "D_INOUT_NOTICE_OUT")
-public class InoutNoticeOut implements Serializable {
+public class Fz35InoutNoticeOut implements Serializable {
/**
*
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/InoutRecord.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java
similarity index 99%
rename from src/main/java/com/fzzy/async/fzzy35/entity/InoutRecord.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java
index 17c71dc..c8b34da 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/InoutRecord.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java
@@ -15,7 +15,7 @@
@Data
@Entity
@Table(name = "D_INOUT_RECORD")
-public class InoutRecord {
+public class Fz35InoutRecord {
@Id
@Column(name = "ID_", length = 40)
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/InoutSettle.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutSettle.java
similarity index 98%
rename from src/main/java/com/fzzy/async/fzzy35/entity/InoutSettle.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutSettle.java
index 463c46a..78af9d9 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/InoutSettle.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutSettle.java
@@ -12,7 +12,7 @@
@Data
@Entity
@Table(name = "D_INOUT_SETTLE")
-public class InoutSettle {
+public class Fz35InoutSettle {
@Id
@Column(name = "ID_", length = 40)
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/MContract.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35MContract.java
similarity index 98%
rename from src/main/java/com/fzzy/async/fzzy35/entity/MContract.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35MContract.java
index f8779d2..39f3e01 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/MContract.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35MContract.java
@@ -19,7 +19,7 @@
@Data
@Entity
@Table(name = "D_M_CONTRACT")
-public class MContract implements Serializable {
+public class Fz35MContract implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/MLossOver.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35MLossOver.java
similarity index 96%
rename from src/main/java/com/fzzy/async/fzzy35/entity/MLossOver.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35MLossOver.java
index 55d5815..d418c1a 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/MLossOver.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35MLossOver.java
@@ -22,7 +22,7 @@
@Data
@Entity
@Table(name = "D_M_LOSS_OVER")
-public class MLossOver implements Serializable {
+public class Fz35MLossOver implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Pest.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Pest.java
similarity index 96%
rename from src/main/java/com/fzzy/async/fzzy35/entity/Pest.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35Pest.java
index ef5f1e0..1dda62c 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/Pest.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Pest.java
@@ -18,8 +18,8 @@
@Data
@Entity
@Table(name = "D_PEST")
-@IdClass(PestKey.class)
-public class Pest implements Serializable {
+@IdClass(Fz35PestKey.class)
+public class Fz35Pest implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/PestKey.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35PestKey.java
similarity index 77%
copy from src/main/java/com/fzzy/async/fzzy35/entity/PestKey.java
copy to src/main/java/com/fzzy/async/fzzy35/entity/Fz35PestKey.java
index f74131e..16cfc44 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/PestKey.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35PestKey.java
@@ -7,11 +7,11 @@
@Data
@AllArgsConstructor
-public class PestKey implements Serializable {
+public class Fz35PestKey implements Serializable {
private String batchId;
private String companyId;
private String depotId;
- public PestKey(){
+ public Fz35PestKey(){
super();
}
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/SecCamera.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35SecCamera.java
similarity index 98%
rename from src/main/java/com/fzzy/async/fzzy35/entity/SecCamera.java
rename to src/main/java/com/fzzy/async/fzzy35/entity/Fz35SecCamera.java
index 07594fd..038536c 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/SecCamera.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35SecCamera.java
@@ -18,7 +18,7 @@
@Data
@Entity
@Table(name = "D_SEC_CAMERA")
-public class SecCamera implements Serializable {
+public class Fz35SecCamera implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/GasKey.java b/src/main/java/com/fzzy/async/fzzy35/entity/GasKey.java
deleted file mode 100644
index e15339c..0000000
--- a/src/main/java/com/fzzy/async/fzzy35/entity/GasKey.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.fzzy.async.fzzy35.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@AllArgsConstructor
-public class GasKey implements Serializable {
- private String batchId;
- private String companyId;
- private String depotId;
- public GasKey(){
- super();
- }
- }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/GrainKey.java b/src/main/java/com/fzzy/async/fzzy35/entity/GrainKey.java
deleted file mode 100644
index a9b0e28..0000000
--- a/src/main/java/com/fzzy/async/fzzy35/entity/GrainKey.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.fzzy.async.fzzy35.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@AllArgsConstructor
-public class GrainKey implements Serializable {
- private String batchId;
- private String companyId;
- private String depotId;
- public GrainKey(){
- super();
- }
- }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1101.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1101.java
index b8d718f..ee74c54 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1101.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1101.java
@@ -6,7 +6,7 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1101Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.DefaultDept;
+import com.fzzy.async.fzzy35.entity.Fz35DefaultDept;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1101Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,14 +48,14 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<DefaultDept> list = fzzy35Sync1101Rep.listDept(deptId.substring(0, 4));
+ List<Fz35DefaultDept> list = fzzy35Sync1101Rep.listApi1101(deptId.substring(0, 4));
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
return;
}
Api1101 apiData;
- for (DefaultDept sysData : list) {
+ for (Fz35DefaultDept sysData : list) {
//TODO
// apiData = new Api1101();
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1102.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1102.java
index b5921aa..aadbf0c 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1102.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1102.java
@@ -6,8 +6,9 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.DefaultDept;
+import com.fzzy.async.fzzy35.entity.Fz35DefaultDept;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1101Rep;
+import com.fzzy.async.fzzy35.repository.Fzzy35Sync1102Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -22,7 +23,7 @@
public class Fzzy35Sync1102 {
@Autowired
- private Fzzy35Sync1101Rep fzzy35Sync1101Rep;
+ private Fzzy35Sync1102Rep fzzy35Sync1102Rep;
@Autowired
private Api1102Rep api1102Rep;
@Autowired
@@ -48,14 +49,14 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<DefaultDept> list = fzzy35Sync1101Rep.listDept(deptId);
+ List<Fz35DefaultDept> list = fzzy35Sync1102Rep.listApi1102(deptId);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒板簱鍖轰俊鎭�------------------");
return;
}
Api1102 apiData;
- for (DefaultDept sysData : list) {
+ for (Fz35DefaultDept sysData : list) {
//TODO
// apiData = new Api1101();
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1103.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1103.java
index f318d14..2cb824b 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1103.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1103.java
@@ -5,7 +5,7 @@
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.Building;
+import com.fzzy.async.fzzy35.entity.Fz35Building;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1103Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,14 +45,14 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Building> list = fzzy35Sync1103Rep.listBuilding(deptId);
+ List<Fz35Building> list = fzzy35Sync1103Rep.listBuilding(deptId);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
return;
}
Api1101 apiData;
- for (Building sysData : list) {
+ for (Fz35Building sysData : list) {
//TODO
// apiData = new Api1101();
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..7ce3b64 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
@@ -7,7 +7,7 @@
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.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;
@@ -72,7 +72,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,7 +83,7 @@
Api1109 apiData;
String wjlx;
String wjmc;
- for (FileInfo sysData : list) {
+ for (Fz35FileInfo sysData : list) {
if (StringUtils.isEmpty(sysData.getBizId())) {
continue;
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java
index e929717..6f872fe 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java
@@ -7,7 +7,7 @@
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1111Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.SecCamera;
+import com.fzzy.async.fzzy35.entity.Fz35SecCamera;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1111Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -53,7 +53,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<SecCamera> list = fzzy35Sync1111Rep.listCamera(deptId);
+ List<Fz35SecCamera> list = fzzy35Sync1111Rep.listCamera(deptId);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮洃鎺т俊鎭�------------------");
@@ -67,7 +67,7 @@
List<Api1111> listApi1111;
Integer num = 1000001;
String spjksbwzys = "left: {X}px ; top : {Y}px ; width : 10px ; height: 10px";
- for (SecCamera sysData : list) {
+ for (Fz35SecCamera sysData : list) {
apiData = new Api1111();
apiData.setDwmc(api1101.getDwmc());
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 b70c500..bcb19b3 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
@@ -9,7 +9,7 @@
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1201Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.MContract;
+import com.fzzy.async.fzzy35.entity.Fz35MContract;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1201Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -60,7 +60,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<MContract> list = fzzySync1201Rep.listContract(deptId, start, end);
+ List<Fz35MContract> list = fzzySync1201Rep.listContract(deptId, start, end);
if (null == list || list.isEmpty()) {
log.debug("-------------娌℃湁鑾峰彇鍒板悎鍚屼俊鎭�------------------");
@@ -71,7 +71,7 @@
Api1102 api1201 = api1102Rep.findById(kqdm).get();
Api1201 apiData;
- for (MContract sysData : list) {
+ for (Fz35MContract sysData : list) {
apiData = new Api1201();
//鍗曚綅浠ｇ爜锛� 1101 鎺ュ彛鐨勫崟浣嶄唬 鐮侊級 +鑷畾涔夌紪鐮�
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 7d741c1..d369ba9 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -9,8 +9,8 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.InoutNoticeIn;
-import com.fzzy.async.fzzy35.entity.InoutRecord;
+import com.fzzy.async.fzzy35.entity.Fz35InoutNoticeIn;
+import com.fzzy.async.fzzy35.entity.Fz35InoutRecord;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35SyncNoticeInRep;
import lombok.extern.slf4j.Slf4j;
@@ -68,7 +68,7 @@
apiLog.setId(ContextUtil.getUUID());
try {
//鑾峰彇绮鍏ュ簱璁板綍淇℃伅锛屾牴鎹祦绋嬪畬鎴愭椂闂磋幏鍙�
- List<InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
+ List<Fz35InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撲俊鎭�------------------");
@@ -77,9 +77,9 @@
Api1202 apiData;
Api1105 api1105;
- List<InoutNoticeIn> listInoutNotice;
+ List<Fz35InoutNoticeIn> listInoutNotice;
Calendar c = Calendar.getInstance();
- for (InoutRecord sysData : list) {
+ for (Fz35InoutRecord sysData : list) {
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(sysData.getDepotId());
if (null == api1105) {
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 1ea0d11..2277270 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -11,8 +11,8 @@
import com.fzzy.api.view.repository.Api1203Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.api.view.repository.GbCheckItemRep;
-import com.fzzy.async.fzzy35.entity.InoutRecord;
-import com.fzzy.async.fzzy35.entity.CheckItem;
+import com.fzzy.async.fzzy35.entity.Fz35InoutRecord;
+import com.fzzy.async.fzzy35.entity.Fz35CheckItem;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1203Rep;
import lombok.extern.slf4j.Slf4j;
@@ -71,7 +71,7 @@
apiLog.setId(ContextUtil.getUUID());
try {
//鑾峰彇绮鍏ュ簱璁板綍淇℃伅
- List<InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
+ List<Fz35InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撲俊鎭�------------------");
@@ -80,17 +80,17 @@
Api1203 apiData;
Api1105 api1105;
- List<CheckItem> checkItems;
+ List<Fz35CheckItem> fz35CheckItems;
List<GbCheckItem> gbCheckList;
String jyxm;
String jyz;
String zkj;
String zkl;
- for (InoutRecord sysData : list) {
+ for (Fz35InoutRecord sysData : list) {
//鑾峰彇鍏ュ簱璐ㄦ淇℃伅
- checkItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId());
- if (null == checkItems || checkItems.isEmpty()) {
+ fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId());
+ if (null == fz35CheckItems || fz35CheckItems.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒板綋鍓嶅叆搴撹川妫�淇℃伅--------------");
continue;
}
@@ -119,14 +119,14 @@
jyz = "";
zkj = "";
zkl = "";
- for (CheckItem checkItem : checkItems) {
- gbCheckList = gbCheckItemRep.findByBizCode(checkItem.getStandardId());
+ for (Fz35CheckItem fz35CheckItem : fz35CheckItems) {
+ gbCheckList = gbCheckItemRep.findByBizCode(fz35CheckItem.getStandardId());
if (gbCheckList == null || gbCheckList.isEmpty()) {
continue;
}
jyxm += gbCheckList.get(0).getCode() + ",";
- jyz += checkItem.getValue() + ",";
+ jyz += fz35CheckItem.getValue() + ",";
zkj += "0,";
zkl += "0,";
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1204.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1204.java
index dc973a3..7801a4d 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1204.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1204.java
@@ -9,8 +9,8 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1204Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.InoutRecord;
-import com.fzzy.async.fzzy35.entity.InoutSettle;
+import com.fzzy.async.fzzy35.entity.Fz35InoutRecord;
+import com.fzzy.async.fzzy35.entity.Fz35InoutSettle;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1204Rep;
import lombok.extern.slf4j.Slf4j;
@@ -66,7 +66,7 @@
apiLog.setId(ContextUtil.getUUID());
try {
//鑾峰彇绮鍏ュ簱缁撶畻淇℃伅
- List<InoutSettle> list = fzzySync1204Rep.listInoutSettle(INOUT_TYPE_IN, start, end);
+ List<Fz35InoutSettle> list = fzzySync1204Rep.listInoutSettle(INOUT_TYPE_IN, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撶粨绠椾俊鎭�------------------");
@@ -75,22 +75,22 @@
Api1204 apiData;
Api1105 api1105;
- List<InoutRecord> inoutRecords;
- InoutRecord inoutRecord;
- for (InoutSettle sysData : list) {
+ List<Fz35InoutRecord> fz35InoutRecords;
+ Fz35InoutRecord fz35InoutRecord;
+ for (Fz35InoutSettle sysData : list) {
//鑾峰彇绮鍏ュ簱淇℃伅
- inoutRecords = fzzySync1202Rep.listInoutRecordById(sysData.getId());
- if (null == inoutRecords || inoutRecords.isEmpty()) {
+ fz35InoutRecords = fzzySync1202Rep.listInoutRecordById(sysData.getId());
+ if (null == fz35InoutRecords || fz35InoutRecords.isEmpty()) {
continue;
}
- inoutRecord = inoutRecords.get(0);
- if (!deptId.equals(inoutRecord.getDeptId())) {
+ fz35InoutRecord = fz35InoutRecords.get(0);
+ if (!deptId.equals(fz35InoutRecord.getDeptId())) {
continue;
}
//鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(inoutRecord.getDepotId());
+ api1105 = commonService.getApi1105Cache(fz35InoutRecord.getDepotId());
if (null == api1105) {
continue;
}
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 a731bc6..ceae9f1 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -9,8 +9,8 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1205Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.InoutNoticeOut;
-import com.fzzy.async.fzzy35.entity.InoutRecord;
+import com.fzzy.async.fzzy35.entity.Fz35InoutNoticeOut;
+import com.fzzy.async.fzzy35.entity.Fz35InoutRecord;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35SyncNoticeOutRep;
import lombok.extern.slf4j.Slf4j;
@@ -67,7 +67,7 @@
apiLog.setId(ContextUtil.getUUID());
try {
//鑾峰彇绮鍑哄簱淇℃伅锛屾牴鎹祦绋嬪畬鎴愭椂闂磋幏鍙�
- List<InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_OUT, start, end);
+ List<Fz35InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_OUT, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷嚭搴撲俊鎭�------------------");
@@ -76,10 +76,10 @@
Api1205 apiData;
Api1105 api1105;
- List<InoutNoticeOut> listInoutNotice;
+ List<Fz35InoutNoticeOut> listInoutNotice;
// List<GbArea> gbAreaList;
Calendar c = Calendar.getInstance();
- for (InoutRecord sysData : list) {
+ for (Fz35InoutRecord sysData : list) {
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(sysData.getDepotId());
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1206.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1206.java
index 49c9871..bb018d1 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1206.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1206.java
@@ -11,8 +11,8 @@
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1206Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.InoutRecord;
-import com.fzzy.async.fzzy35.entity.InoutSettle;
+import com.fzzy.async.fzzy35.entity.Fz35InoutRecord;
+import com.fzzy.async.fzzy35.entity.Fz35InoutSettle;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1204Rep;
import lombok.extern.slf4j.Slf4j;
@@ -69,7 +69,7 @@
apiLog.setId(ContextUtil.getUUID());
try {
//鑾峰彇绮鍏ュ簱缁撶畻淇℃伅
- List<InoutSettle> list = fzzySync1204Rep.listInoutSettle(INOUT_TYPE_OUT, start, end);
+ List<Fz35InoutSettle> list = fzzySync1204Rep.listInoutSettle(INOUT_TYPE_OUT, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撶粨绠椾俊鎭�------------------");
@@ -81,22 +81,22 @@
Api1206 apiData;
Api1105 api1105;
- List<InoutRecord> inoutRecords;
- InoutRecord inoutRecord;
- for (InoutSettle sysData : list) {
+ List<Fz35InoutRecord> fz35InoutRecords;
+ Fz35InoutRecord fz35InoutRecord;
+ for (Fz35InoutSettle sysData : list) {
//鑾峰彇绮鍑哄簱淇℃伅
- inoutRecords = fzzySync1202Rep.listInoutRecordById(sysData.getId());
- if (null == inoutRecords || inoutRecords.isEmpty()) {
+ fz35InoutRecords = fzzySync1202Rep.listInoutRecordById(sysData.getId());
+ if (null == fz35InoutRecords || fz35InoutRecords.isEmpty()) {
continue;
}
- inoutRecord = inoutRecords.get(0);
- if (!deptId.equals(inoutRecord.getDeptId())) {
+ fz35InoutRecord = fz35InoutRecords.get(0);
+ if (!deptId.equals(fz35InoutRecord.getDeptId())) {
continue;
}
//鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(inoutRecord.getDepotId());
+ api1105 = commonService.getApi1105Cache(fz35InoutRecord.getDepotId());
if (null == api1105) {
continue;
}
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 191cd34..2d0113b 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
@@ -8,10 +8,11 @@
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1208Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.Depot;
+import com.fzzy.async.fzzy35.entity.Fz35Depot;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1208Rep;
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;
@@ -58,7 +59,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Depot> list = fzzySync1208Rep.listDepot(deptId);
+ List<Fz35Depot> list = fzzySync1208Rep.listDepot(deptId);
if (null == list || list.isEmpty()) {
@@ -73,68 +74,79 @@
Api1208 apiData;
Api1105 api1105;
// List<GbArea> gbAreaList;
- for (Depot depot : list) {
+ List<Api1208> api1208List;
+ for (Fz35Depot fz35Depot : list) {
//鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(depot.getId());
+ api1105 = commonService.getApi1105Cache(fz35Depot.getId());
if (null == api1105) {
continue;
}
- apiData = api1208Rep.getOne(api1105.getHwdm());
- if (apiData == null){
- apiData = new Api1208();
- apiData.setCzbz(Constant.CZBZ_I);
- }else{
- //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- }
+
apiData = new Api1208();
apiData.setHwdm(api1105.getHwdm());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, depot.getFoodVariety());
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz35Depot.getFoodVariety());
apiData.setLspzdm(mappingCode);
//绮鎬ц川
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, depot.getFoodType());
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, fz35Depot.getFoodType());
apiData.setLsxzdm(mappingCode);
//绮绛夌骇
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, depot.getFoodLevel());
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, fz35Depot.getFoodLevel());
apiData.setLsdjdm(mappingCode);
- apiData.setShnd(depot.getFoodYear());
+ apiData.setShnd(fz35Depot.getFoodYear());
//浜у湴浠ｇ爜
- String cd = commonService.getFoodLocationIdFromCache(depot.getFoodLocation());
+ String cd = commonService.getFoodLocationIdFromCache(fz35Depot.getFoodLocation());
apiData.setCd(cd);
- apiData.setBgy(depot.getStoreKeeperName());
+ apiData.setBgy(fz35Depot.getStoreKeeperName());
+ //绮潈褰掑睘鍗曚綅
apiData.setLqgsdwdm(api1102.getDwdm());
+ //绮潈琛屾斂鍖哄垝浠ｇ爜
+ apiData.setLqxzqhdm(api1102.getDwdm().substring(2, 8));
+ //绠＄悊鏂瑰紡-榛樿鐩村偍
+ apiData.setGlfs("01");
+ //鏀跺偍鍦扮偣-榛樿搴撳唴
+ apiData.setScdd("1");
+ //鍌ㄧ伯鏂瑰紡
+ apiData.setClfs(fz35Depot.getStoreType());
//璐т綅鐘舵��
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, depot.getDepotStatus());
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz35Depot.getDepotStatus());
apiData.setHwzt(mappingCode);
-
- //鍥藉埆
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_GB, depot.getFoodLocation());
- if(StringUtils.isNotEmpty(mappingCode)){
- apiData.setGb(mappingCode);
- }else{
- apiData.setGb("156");
+ //鍏ヤ粨鏃堕棿
+ apiData.setRcsj(fz35Depot.getStoreDate());
+ //灏佷粨鏃ユ湡
+ if("3".equals(apiData.getHwzt())){
+ apiData.setFcrq(DateUtils.addDays(fz35Depot.getStoreDate(), 10));
}
-
- apiData.setRcsj(depot.getStoreDate());
- apiData.setSjsl(depot.getStorageReal());
- apiData.setJjsl(depot.getStorageReal());
+ //鍑轰粨瀹屾垚鏃堕棿
+ if("1".equals(apiData.getHwzt())){
+ apiData.setCcwcsj(DateUtils.addDays(fz35Depot.getStoreDate(), 5));
+ }
+ //鍥藉埆
+ apiData.setGb("156");
+ apiData.setSjsl(fz35Depot.getStorageReal());
+ apiData.setJjsl(fz35Depot.getStorageReal());
+ apiData.setSjzlxg(6);
+ apiData.setLdtj(10000);
apiData.setZhgxsj(new Date());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
- apiData.setBizId(depot.getId());
+ apiData.setBizId(fz35Depot.getId());
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
+ api1208List = api1208Rep.getDataById(api1105.getHwdm());
+ if(null == api1208List || api1208List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }
apiData.setId(api1105.getHwdm());
- //淇濆瓨鏁版嵁
//淇濆瓨鏁版嵁
api1208Rep.save(apiData);
}
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 52cc5d3..38c912a 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1209.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1209.java
@@ -8,7 +8,7 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1209Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.MLossOver;
+import com.fzzy.async.fzzy35.entity.Fz35MLossOver;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1209Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.time.DateFormatUtils;
@@ -62,7 +62,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<MLossOver> list = fzzySync1209Rep.listMLossOver(deptId, start, end);
+ List<Fz35MLossOver> list = fzzySync1209Rep.listMLossOver(deptId, start, end);
if (null == list || list.isEmpty()) {
@@ -73,7 +73,7 @@
Api1209 apiData;
Api1105 api1105;
- for (MLossOver sysData : list) {
+ for (Fz35MLossOver sysData : list) {
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(sysData.getDepotId());
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 f48b4d4..c4bf0c7 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
@@ -10,7 +10,7 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1302Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.Grain;
+import com.fzzy.async.fzzy35.entity.Fz35Grain;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1302Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -60,7 +60,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Grain> list = fzzySync1302Rep.findByReceiveDate(start, end);
+ List<Fz35Grain> list = fzzySync1302Rep.findByReceiveDate(start, end);
log.info(DateUtils.format("yyyy-MM-dd HH:mm:ss",start));
log.info(DateUtils.format("yyyy-MM-dd HH:mm:ss",end));
if (null == list || list.isEmpty()) {
@@ -72,9 +72,9 @@
Api1302 api1302;
Api1105 api1105;
//int index = 10001;
- for (Grain grain : list) {
+ for (Fz35Grain fz35Grain : list) {
//鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(grain.getDepotId());
+ api1105 = commonService.getApi1105Cache(fz35Grain.getDepotId());
if (null == api1105) {
continue;
}
@@ -82,41 +82,41 @@
//鐢辫揣浣嶄唬鐮�+妫�娴嬫棩鏈� 锛坹yyyMMdd锛� +4 浣嶉『搴忓彿缁勬垚 --2019 1128 0819
api1302 = new Api1302();
//api1302.setWsdjcdh(api1105.getHwdm() + DateFormatUtils.format(grain.getReceiveDate(), "yyyyMMdd") + String.valueOf(index).substring(1));
- api1302.setWsdjcdh(api1105.getHwdm() + grain.getBatchId());
- api1302.setJcsj(grain.getReceiveDate());
+ api1302.setWsdjcdh(api1105.getHwdm() + fz35Grain.getBatchId());
+ api1302.setJcsj(fz35Grain.getReceiveDate());
api1302.setHwdm(api1105.getHwdm());
- api1302.setCfww(grain.getTempOut() == null ? 0.00:grain.getTempOut());
- if(null == grain.getHumidityOut() || grain.getHumidityOut() < 0){
+ api1302.setCfww(fz35Grain.getTempOut() == null ? 0.00: fz35Grain.getTempOut());
+ if(null == fz35Grain.getHumidityOut() || fz35Grain.getHumidityOut() < 0){
api1302.setCfws(-1);
}else {
- api1302.setCfws(grain.getHumidityOut());
+ api1302.setCfws(fz35Grain.getHumidityOut());
}
- api1302.setCfnw(grain.getTempIn() == null ? 0.00:grain.getTempIn());
- if(null == grain.getHumidityIn() || grain.getHumidityIn() < 0){
+ api1302.setCfnw(fz35Grain.getTempIn() == null ? 0.00: fz35Grain.getTempIn());
+ if(null == fz35Grain.getHumidityIn() || fz35Grain.getHumidityIn() < 0){
api1302.setCfns(-1);
}else {
- api1302.setCfns(grain.getHumidityIn());
+ api1302.setCfns(fz35Grain.getHumidityIn());
}
- api1302.setLszgw(grain.getTempMax() == null ? 0.00:grain.getTempMax());
- api1302.setLspjw(grain.getTempAve() == null ? 0.00:grain.getTempAve());
- api1302.setLszdw(grain.getTempMin() == null ? 0.00:grain.getTempMin());
+ api1302.setLszgw(fz35Grain.getTempMax() == null ? 0.00: fz35Grain.getTempMax());
+ api1302.setLspjw(fz35Grain.getTempAve() == null ? 0.00: fz35Grain.getTempAve());
+ api1302.setLszdw(fz35Grain.getTempMin() == null ? 0.00: fz35Grain.getTempMin());
//娓╁害闆嗗悎
- if (StringUtils.isEmpty(grain.getCableCir())) {
- api1302.setLswdzjh(getTempPointList1(grain.getPoints(), grain.getCable()));
- api1302.setLssdzjh(getHumPointList1(grain.getPoints(), grain.getCable()));
+ if (StringUtils.isEmpty(fz35Grain.getCableCir())) {
+ api1302.setLswdzjh(getTempPointList1(fz35Grain.getPoints(), fz35Grain.getCable()));
+ api1302.setLssdzjh(getHumPointList1(fz35Grain.getPoints(), fz35Grain.getCable()));
} else {
- api1302.setLswdzjh(getTempPointList2(grain.getPoints(), grain.getCable(), grain.getCableCir()));
- api1302.setLssdzjh(getHumPointList2(grain.getPoints(), grain.getCable(), grain.getCableCir()));
+ api1302.setLswdzjh(getTempPointList2(fz35Grain.getPoints(), fz35Grain.getCable(), fz35Grain.getCableCir()));
+ api1302.setLssdzjh(getHumPointList2(fz35Grain.getPoints(), fz35Grain.getCable(), fz35Grain.getCableCir()));
}
api1302.setCzbz(Constant.CZBZ_I);
api1302.setZhgxsj(syncTime);
- api1302.setBizId(grain.getBatchId());
+ api1302.setBizId(fz35Grain.getBatchId());
api1302.setKqdm(api1105.getKqdm());
api1302.setSyncTime(syncTime);
log.info("1302---鍚屾鏁版嵁锛�" + api1302.toString());
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 f2122d2..6f8bb62 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1303.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1303.java
@@ -8,7 +8,7 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1303Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.Pest;
+import com.fzzy.async.fzzy35.entity.Fz35Pest;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1303Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -60,7 +60,7 @@
apiLog.setId(ContextUtil.getUUID());
try {
- List<Pest> list = fzzy35Sync1303Rep.findPestByReceiveDate(start, end);
+ List<Fz35Pest> list = fzzy35Sync1303Rep.findPestByReceiveDate(start, end);
if (null == list || list.isEmpty()) {
return;
}
@@ -69,16 +69,16 @@
Api1303 api1303;
Api1105 api1105;
- for (Pest pest : list) {
+ for (Fz35Pest fz35Pest : list) {
//鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(pest.getDepotId());
+ api1105 = commonService.getApi1105Cache(fz35Pest.getDepotId());
if (null == api1105) {
continue;
}
api1303 = new Api1303();
- api1303.setHcjcdh(api1105.getHwdm() + pest.getBatchId());
- api1303.setJcsj(pest.getReceiveDate());
+ api1303.setHcjcdh(api1105.getHwdm() + fz35Pest.getBatchId());
+ api1303.setJcsj(fz35Pest.getReceiveDate());
api1303.setHwdm(api1105.getHwdm());
//妫�鏌ュ铏柟娉曪紝0-杩滅▼銆�1-浜哄伐銆�2-鍏朵粬
@@ -90,22 +90,22 @@
api1303.setHczl("21212");
//铏彛瀵嗗害鍊奸泦鍚�
- String ckmdzjh = this.geeCkmdzjh(pest.getPestMax(), pest.getPoints());
+ String ckmdzjh = this.geeCkmdzjh(fz35Pest.getPestMax(), fz35Pest.getPoints());
api1303.setCkmdzjh(ckmdzjh);
//铏伯绛夌骇鍒ゅ畾锛�531-鍩烘湰鏃犺櫕绮��532-涓�鑸櫕绮��533涓ラ噸铏伯銆�534鍗卞铏伯
api1303.setCldjpd("531");
- if (pest.getPestMax() > 5) {
+ if (fz35Pest.getPestMax() > 5) {
api1303.setCldjpd("532");
}
- if (pest.getPestMax() > 30) {
+ if (fz35Pest.getPestMax() > 30) {
api1303.setCldjpd("533");
}
api1303.setCzbz(Constant.CZBZ_I);
api1303.setZhgxsj(syncTime);
- api1303.setBizId(pest.getBatchId());
+ api1303.setBizId(fz35Pest.getBatchId());
api1303.setKqdm(api1105.getKqdm());
api1303.setSyncTime(syncTime);
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 cd1422e..4870429 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1304.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1304.java
@@ -8,7 +8,7 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1304Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.Gas;
+import com.fzzy.async.fzzy35.entity.Fz35Gas;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1304Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +56,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Gas> list = fzzySync1304Rep.findByReceiveDate(start, end);
+ List<Fz35Gas> list = fzzySync1304Rep.findByReceiveDate(start, end);
if (null == list || list.isEmpty()) {
return;
}
@@ -65,25 +65,25 @@
Api1304 api1304;
Api1105 api1105;
// int index = 10001;
- for (Gas gas : list) {
+ for (Fz35Gas fz35Gas : list) {
//鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(gas.getDepotId());
+ api1105 = commonService.getApi1105Cache(fz35Gas.getDepotId());
if (null == api1105) {
continue;
}
api1304 = new Api1304();
// api1304.setQtndjcdh(api1105.getHwdm() + DateFormatUtils.format(gas.getReceiveDate(), "yyyyMMdd") + String.valueOf(index).substring(1));
- api1304.setQtndjcdh(api1105.getHwdm() + gas.getBatchId());
- api1304.setJcsj(gas.getReceiveDate());
+ api1304.setQtndjcdh(api1105.getHwdm() + fz35Gas.getBatchId());
+ api1304.setJcsj(fz35Gas.getReceiveDate());
api1304.setHwdm(api1105.getHwdm());
- api1304 = updateGasInfo(api1304, gas.getPoints());
+ api1304 = updateGasInfo(api1304, fz35Gas.getPoints());
api1304.setCzbz(Constant.CZBZ_I);
api1304.setZhgxsj(syncTime);
- api1304.setBizId(gas.getBatchId());
+ api1304.setBizId(fz35Gas.getBatchId());
api1304.setKqdm(api1105.getKqdm());
api1304.setSyncTime(syncTime);
api1304Rep.save(api1304);
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1101Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1101Rep.java
index e679e32..32eb215 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1101Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1101Rep.java
@@ -1,7 +1,6 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.DefaultDept;
-import com.fzzy.async.fzzy35.entity.MContract;
+import com.fzzy.async.fzzy35.entity.Fz35DefaultDept;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -10,13 +9,13 @@
/**
* 鍩虹淇℃伅-鍗曚綅鍙婂簱鍖轰俊鎭�
*/
-public interface Fzzy35Sync1101Rep extends JpaRepository<MContract, String> {
+public interface Fzzy35Sync1101Rep extends JpaRepository<Fz35DefaultDept, String> {
/**
* 鑾峰彇鍗曚綅鎴栧簱鍖轰俊鎭�
*
* @return
*/
- @Query("from DefaultDept where id=:id ")
- List<DefaultDept> listDept(@Param("id") String id);
+ @Query("from Fz35DefaultDept where id=:id ")
+ List<Fz35DefaultDept> listApi1101(@Param("id") String id);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1102Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1102Rep.java
index 6e33c0f..065bf65 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1102Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1102Rep.java
@@ -1,6 +1,7 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.MContract;
+import com.fzzy.async.fzzy35.entity.Fz35DefaultDept;
+import com.fzzy.async.fzzy35.entity.Fz35MContract;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -11,15 +12,13 @@
/**
* 绮璐攢-鍚堝悓淇℃伅鏁版嵁鎺ュ彛鏁版嵁鑾峰彇
*/
-public interface Fzzy35Sync1102Rep extends JpaRepository<MContract, String> {
+public interface Fzzy35Sync1102Rep extends JpaRepository<Fz35DefaultDept, String> {
/**
- * 鏍规嵁淇℃伅鑾峰彇鍚堝悓淇℃伅
+ * 鑾峰彇鍗曚綅鎴栧簱鍖轰俊鎭�
*
- * @param start
- * @param end
* @return
*/
- @Query("from MContract where deptId=:deptId and createTime >=:start and createTime <:end order by createTime ")
- List<MContract> listContract(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+ @Query("from Fz35DefaultDept where id=:id ")
+ List<Fz35DefaultDept> listApi1102(@Param("id") String id);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1103Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1103Rep.java
index 2d7229f..0277293 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1103Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1103Rep.java
@@ -1,7 +1,7 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.Building;
-import com.fzzy.async.fzzy35.entity.MContract;
+import com.fzzy.async.fzzy35.entity.Fz35Building;
+import com.fzzy.async.fzzy35.entity.Fz35MContract;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -10,13 +10,13 @@
/**
* 鍩虹淇℃伅-浠撴埧淇℃伅
*/
-public interface Fzzy35Sync1103Rep extends JpaRepository<MContract, String> {
+public interface Fzzy35Sync1103Rep extends JpaRepository<Fz35Building, String> {
/**
* 鑾峰彇浠撴埧淇℃伅
*
* @return
*/
- @Query("from Building where deptId=:deptId ")
- List<Building> listBuilding(@Param("deptId") String deptId);
+ @Query("from Fz35Building where deptId=:deptId ")
+ List<Fz35Building> listBuilding(@Param("deptId") String deptId);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1109Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1109Rep.java
index 82c12cd..951a53c 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1109Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1109Rep.java
@@ -1,6 +1,6 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.FileInfo;
+import com.fzzy.async.fzzy35.entity.Fz35FileInfo;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -11,7 +11,7 @@
/**
* 鏂囦欢淇℃伅
*/
-public interface Fzzy35Sync1109Rep extends JpaRepository<FileInfo, String> {
+public interface Fzzy35Sync1109Rep extends JpaRepository<Fz35FileInfo, String> {
/**
* 鏍规嵁淇℃伅鏂囦欢淇℃伅
@@ -20,6 +20,6 @@
* @param end
* @return
*/
- @Query("from FileInfo where createTime >=:start and createTime <:end order by createTime ")
- List<FileInfo> listFileInfo(@Param("start") Date start, @Param("end") Date end);
+ @Query("from Fz35FileInfo where createTime >=:start and createTime <:end order by createTime ")
+ List<Fz35FileInfo> listFileInfo(@Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1111Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1111Rep.java
index 108cfaf..2f49256 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1111Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1111Rep.java
@@ -1,6 +1,6 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.SecCamera;
+import com.fzzy.async.fzzy35.entity.Fz35SecCamera;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -9,7 +9,7 @@
/**
* 鐩戞帶淇℃伅
*/
-public interface Fzzy35Sync1111Rep extends JpaRepository<SecCamera, String> {
+public interface Fzzy35Sync1111Rep extends JpaRepository<Fz35SecCamera, String> {
/**
* 鑾峰彇鎽勫儚澶翠俊鎭�
@@ -18,7 +18,7 @@
*/
// @Query("from SecCamera where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
// List<SecCamera> listCamera(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
- @Query("from SecCamera where deptId=:deptId order by ipIn")
- List<SecCamera> listCamera(@Param("deptId") String deptId);
+ @Query("from Fz35SecCamera where deptId=:deptId order by ipIn")
+ List<Fz35SecCamera> listCamera(@Param("deptId") String deptId);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1201Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1201Rep.java
index da8b214..3836c1e 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1201Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1201Rep.java
@@ -1,6 +1,6 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.MContract;
+import com.fzzy.async.fzzy35.entity.Fz35MContract;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -11,7 +11,7 @@
/**
* 绮璐攢-鍚堝悓淇℃伅鏁版嵁鎺ュ彛鏁版嵁鑾峰彇
*/
-public interface Fzzy35Sync1201Rep extends JpaRepository<MContract, String> {
+public interface Fzzy35Sync1201Rep extends JpaRepository<Fz35MContract, String> {
/**
* 鏍规嵁淇℃伅鑾峰彇鍚堝悓淇℃伅
@@ -20,6 +20,6 @@
* @param end
* @return
*/
- @Query("from MContract where deptId=:deptId and createTime >=:start and createTime <:end order by createTime ")
- List<MContract> listContract(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+ @Query("from Fz35MContract where deptId=:deptId and createTime >=:start and createTime <:end order by createTime ")
+ List<Fz35MContract> listContract(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1202Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1202Rep.java
index f22eba3..c2e5685 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1202Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1202Rep.java
@@ -1,6 +1,6 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.InoutRecord;
+import com.fzzy.async.fzzy35.entity.Fz35InoutRecord;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -14,7 +14,7 @@
* @author chen
* @date 2022-09-23 17:10
*/
-public interface Fzzy35Sync1202Rep extends JpaRepository<InoutRecord, String> {
+public interface Fzzy35Sync1202Rep extends JpaRepository<Fz35InoutRecord, String> {
/**
* 鏍规嵁淇℃伅鑾峰彇鍑哄叆搴撲俊鎭�
@@ -24,15 +24,15 @@
* @param end
* @return
*/
- @Query("from InoutRecord where deptId=:deptId and type=:type and completeTime >=:start and completeTime <:end order by completeTime ")
- List<InoutRecord> listInoutRecord(@Param("deptId") String deptId, @Param("type") String type, @Param("start") Date start, @Param("end") Date end);
+ @Query("from Fz35InoutRecord where deptId=:deptId and type=:type and completeTime >=:start and completeTime <:end order by completeTime ")
+ List<Fz35InoutRecord> listInoutRecord(@Param("deptId") String deptId, @Param("type") String type, @Param("start") Date start, @Param("end") Date end);
/**
* 鏍规嵁id鑾峰彇绮鍑哄叆搴撲俊鎭�
* @param id
* @return
*/
- @Query("from InoutRecord where id=:id order by completeTime ")
- List<InoutRecord> listInoutRecordById(@Param("id") String id);
+ @Query("from Fz35InoutRecord where id=:id order by completeTime ")
+ List<Fz35InoutRecord> listInoutRecordById(@Param("id") String id);
}
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 3d61e60..c3f7ac2 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java
@@ -1,6 +1,6 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.CheckItem;
+import com.fzzy.async.fzzy35.entity.Fz35CheckItem;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -10,7 +10,7 @@
/**
* 绮鍏ュ簱璐ㄦ
*/
-public interface Fzzy35Sync1203Rep extends JpaRepository<CheckItem, String> {
+public interface Fzzy35Sync1203Rep extends JpaRepository<Fz35CheckItem, String> {
/**
* 鏍规嵁鍏ュ簱妫�楠岀紪鐮佽幏鍙栨楠屼俊鎭�
@@ -18,6 +18,6 @@
* @param checkId
* @return
*/
- @Query("from CheckItem where checkId=:checkId ")
- List<CheckItem> listInoutCheckItem(@Param("checkId") String checkId);
+ @Query("from Fz35CheckItem where checkId=:checkId ")
+ List<Fz35CheckItem> listInoutCheckItem(@Param("checkId") String checkId);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1204Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1204Rep.java
index 82bafa4..652c581 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1204Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1204Rep.java
@@ -1,6 +1,6 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.InoutSettle;
+import com.fzzy.async.fzzy35.entity.Fz35InoutSettle;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -11,7 +11,7 @@
/**
* 绮鍏ュ簱缁撶畻
*/
-public interface Fzzy35Sync1204Rep extends JpaRepository<InoutSettle, String> {
+public interface Fzzy35Sync1204Rep extends JpaRepository<Fz35InoutSettle, String> {
/**
* 鑾峰彇鍑哄叆搴撶粨绠椾俊鎭�
@@ -20,6 +20,6 @@
* @param end
* @return
*/
- @Query("from InoutSettle where type=:type and payTime >=:start and payTime <:end order by payTime ")
- List<InoutSettle> listInoutSettle(@Param("type") String type, @Param("start") Date start, @Param("end") Date end);
+ @Query("from Fz35InoutSettle where type=:type and payTime >=:start and payTime <:end order by payTime ")
+ List<Fz35InoutSettle> listInoutSettle(@Param("type") String type, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1208Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1208Rep.java
index 14a3736..c2c390e 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1208Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1208Rep.java
@@ -1,6 +1,6 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.Depot;
+import com.fzzy.async.fzzy35.entity.Fz35Depot;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -10,13 +10,13 @@
/**
* 绮璐攢-绮搴撳瓨
*/
-public interface Fzzy35Sync1208Rep extends JpaRepository<Depot, String> {
+public interface Fzzy35Sync1208Rep extends JpaRepository<Fz35Depot, String> {
/**
* 鏍规嵁淇℃伅鑾峰彇浠撳簱淇℃伅
*
* @return
*/
- @Query("from Depot where deptId=:deptId order by id ")
- List<Depot> listDepot(@Param("deptId") String deptId);
+ @Query("from Fz35Depot where deptId=:deptId order by id ")
+ List<Fz35Depot> listDepot(@Param("deptId") String deptId);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1209Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1209Rep.java
index b9d908f..772f99e 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1209Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1209Rep.java
@@ -1,6 +1,6 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.MLossOver;
+import com.fzzy.async.fzzy35.entity.Fz35MLossOver;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -11,7 +11,7 @@
/**
* 绮璐攢-鎹熸孩
*/
-public interface Fzzy35Sync1209Rep extends JpaRepository<MLossOver, String> {
+public interface Fzzy35Sync1209Rep extends JpaRepository<Fz35MLossOver, String> {
/**
* 鏍规嵁淇℃伅鑾峰彇鎹熸孩淇℃伅
@@ -20,6 +20,6 @@
* @param end
* @return
*/
- @Query("from MLossOver where deptId=:deptId and submitTime >=:start and submitTime <:end order by submitTime ")
- List<MLossOver> listMLossOver(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+ @Query("from Fz35MLossOver where deptId=:deptId and submitTime >=:start and submitTime <:end order by submitTime ")
+ List<Fz35MLossOver> listMLossOver(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1302Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1302Rep.java
index 808e1be..ace34ae 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1302Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1302Rep.java
@@ -1,6 +1,6 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.Grain;
+import com.fzzy.async.fzzy35.entity.Fz35Grain;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -14,7 +14,7 @@
* @author chen
* @date 2022-09-07 14:35
*/
-public interface Fzzy35Sync1302Rep extends JpaRepository<Grain, String> {
+public interface Fzzy35Sync1302Rep extends JpaRepository<Fz35Grain, String> {
/**
* 鏍规嵁鏃堕棿娈垫煡璇㈢伯鎯呮暟鎹�
@@ -22,6 +22,6 @@
* @param end
* @return
*/
- @Query("from Grain where receiveDate >=:start and receiveDate <:end order by receiveDate ")
- List<Grain> findByReceiveDate(@Param("start") Date start, @Param("end") Date end);
+ @Query("from Fz35Grain where receiveDate >=:start and receiveDate <:end order by receiveDate ")
+ List<Fz35Grain> findByReceiveDate(@Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1303Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1303Rep.java
index ed7248c..2f1fd07 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1303Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1303Rep.java
@@ -1,6 +1,6 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.Pest;
+import com.fzzy.async.fzzy35.entity.Fz35Pest;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -14,7 +14,7 @@
* @author chen
* @date 2022-09-08 09:51
*/
-public interface Fzzy35Sync1303Rep extends JpaRepository<Pest, String> {
+public interface Fzzy35Sync1303Rep extends JpaRepository<Fz35Pest, String> {
/**
* 鏍规嵁鏃堕棿娈垫煡璇㈢伯鎯呮暟鎹�
@@ -23,6 +23,6 @@
* @param end
* @return
*/
- @Query("from Pest where receiveDate >=:start and receiveDate <:end order by receiveDate ")
- List<Pest> findPestByReceiveDate(@Param("start") Date start, @Param("end") Date end);
+ @Query("from Fz35Pest where receiveDate >=:start and receiveDate <:end order by receiveDate ")
+ List<Fz35Pest> findPestByReceiveDate(@Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1304Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1304Rep.java
index 21837c1..9c0f29a 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1304Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1304Rep.java
@@ -1,6 +1,6 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.Gas;
+import com.fzzy.async.fzzy35.entity.Fz35Gas;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -14,7 +14,7 @@
* @author chen
* @date 2022-09-08 10:42
*/
-public interface Fzzy35Sync1304Rep extends JpaRepository<Gas, String> {
+public interface Fzzy35Sync1304Rep extends JpaRepository<Fz35Gas, String> {
/**
* 鏍规嵁鏃堕棿娈垫煡璇㈢伯鎯呮暟鎹�
@@ -22,6 +22,6 @@
* @param end
* @return
*/
- @Query("from Gas where receiveDate >=:start and receiveDate <:end order by receiveDate ")
- List<Gas> findByReceiveDate(@Param("start") Date start, @Param("end") Date end);
+ @Query("from Fz35Gas where receiveDate >=:start and receiveDate <:end order by receiveDate ")
+ List<Fz35Gas> findByReceiveDate(@Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncNoticeInRep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncNoticeInRep.java
index ffa00cf..00b941e 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncNoticeInRep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncNoticeInRep.java
@@ -1,7 +1,6 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.InoutNoticeIn;
-import com.fzzy.async.fzzy35.entity.InoutRecord;
+import com.fzzy.async.fzzy35.entity.Fz35InoutNoticeIn;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -13,7 +12,7 @@
* @author czt
* @date 2023-04-06 10:10
*/
-public interface Fzzy35SyncNoticeInRep extends JpaRepository<InoutNoticeIn, String> {
+public interface Fzzy35SyncNoticeInRep extends JpaRepository<Fz35InoutNoticeIn, String> {
/**
@@ -21,7 +20,7 @@
* @param id
* @return
*/
- @Query("from InoutNoticeIn where id=:id ")
- List<InoutNoticeIn> listInoutNoticeInById(@Param("id") String id);
+ @Query("from Fz35InoutNoticeIn where id=:id ")
+ List<Fz35InoutNoticeIn> listInoutNoticeInById(@Param("id") String id);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncNoticeOutRep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncNoticeOutRep.java
index 21d71fd..b2224f4 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncNoticeOutRep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncNoticeOutRep.java
@@ -1,7 +1,6 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.InoutNoticeOut;
-import com.fzzy.async.fzzy35.entity.InoutRecord;
+import com.fzzy.async.fzzy35.entity.Fz35InoutNoticeOut;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -14,7 +13,7 @@
* @author czt
* @date 2023-04-06 10:10
*/
-public interface Fzzy35SyncNoticeOutRep extends JpaRepository<InoutNoticeOut, String> {
+public interface Fzzy35SyncNoticeOutRep extends JpaRepository<Fz35InoutNoticeOut, String> {
/**
@@ -22,7 +21,7 @@
* @param id
* @return
*/
- @Query("from InoutNoticeOut where id=:id ")
- List<InoutNoticeOut> listInoutNoticeOutById(@Param("id") String id);
+ @Query("from Fz35InoutNoticeOut where id=:id ")
+ List<Fz35InoutNoticeOut> listInoutNoticeOutById(@Param("id") String id);
}
--
Gitblit v1.9.3