From cbaff53b2c82cfaa7ad8cb22f5a33a1b7caecd7c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 25 九月 2025 10:06:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1506Rep.java | 27
src/main/java/com/fzzy/async/fzzy61/entity/Fz61AreationData.java | 267 ++
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1504Rep.java | 27
src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogApplyKey.java | 18
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1404.java | 123
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1504.java | 82
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1307Rep.java | 30
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1304.java | 141 +
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1509.java | 82
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1303.java | 152 +
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1403.java | 111
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDepotConfRep.java | 26
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1311Rep.java | 22
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1403Rep.java | 36
src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1508.java | 103
src/main/java/com/fzzy/async/fzzy61/entity/Fz61SecSnapDepot.java | 64
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1311.java | 161 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1508Rep.java | 27
src/main/java/com/fzzy/async/fzzy61/entity/Fz61Quality.java | 173 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1510Rep.java | 27
src/main/java/com/fzzy/async/fzzy61/entity/Fz61Depot.java | 174 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDepotRep.java | 26
src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1510.java | 136 +
src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotConf.java | 168 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1023Rep.java | 22
src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1509.java | 195 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync9201Rep.java | 22
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1302Rep.java | 27
src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1506.java | 127 +
src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLog.java | 314 ++
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDrugLogPeopleRep.java | 19
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1304Rep.java | 27
src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotConfKey.java | 16
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDrugLogDtlRep.java | 21
src/main/java/com/fzzy/async/fzzy61/entity/Fz61Gas.java | 124 +
src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService13.java | 93
src/main/java/com/fzzy/async/fzzy61/entity/Fz61Pest.java | 109
src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogApply.java | 291 ++
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDrugLogWayRep.java | 19
src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1504.java | 106
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1307.java | 161 +
src/main/java/com/fzzy/async/fzzy61/entity/Fz61AssetsLiability.java | 598 ++++
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1306Rep.java | 27
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1507Rep.java | 27
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1505Rep.java | 27
src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService14.java | 62
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1310Rep.java | 27
src/main/java/com/fzzy/async/fzzy61/entity/Fz61GrainKey.java | 17
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1306.java | 128 +
src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogWay.java | 46
src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1505.java | 127 +
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1506.java | 82
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1507.java | 82
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1023.java | 231 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1509Rep.java | 27
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync9201.java | 211 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1404Rep.java | 25
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync2103.java | 205 +
src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutPlan.java | 107
src/main/java/com/fzzy/async/fzzy61/entity/Fz61PestKey.java | 17
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1508.java | 82
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1505.java | 82
src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogPeople.java | 56
src/main/java/com/fzzy/async/fzzy61/entity/Fz61Grain.java | 114
src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutPlanDetail.java | 65
src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogDtl.java | 129 +
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1310.java | 186 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1303Rep.java | 28
src/main/java/com/fzzy/async/fzzy61/entity/Fz61GasKey.java | 17
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1302.java | 284 ++
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1510.java | 82
src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1507.java | 155 +
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1305.java | 115
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1305Rep.java | 27
74 files changed, 7,391 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService13.java b/src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService13.java
new file mode 100644
index 0000000..4cb8da4
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService13.java
@@ -0,0 +1,93 @@
+package com.fzzy.async.fzzy61;
+
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.data.SyncProtocol;
+import com.fzzy.api.service.SyncService13;
+import com.fzzy.async.fzzy61.impl.*;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Desc: 绮绠＄悊淇℃伅鍚屾
+ * @author: czt
+ * @update-time: 2023/08/14
+ */
+@Component
+public class Fzzy61SyncService13 implements SyncService13 {
+
+ @Autowired
+ private Fzzy61Sync1302 fzzySync1302;
+ @Autowired
+ private Fzzy61Sync1303 fzzySync1303;
+ @Autowired
+ private Fzzy61Sync1304 fzzySync1304;
+ @Autowired
+ private Fzzy61Sync1305 fzzySync1305;
+ @Autowired
+ private Fzzy61Sync1306 fzzySync1306;
+ @Autowired
+ private Fzzy61Sync1307 fzzySync1307;
+ @Autowired
+ private Fzzy61Sync1310 fzzySync1310;
+ @Autowired
+ private Fzzy61Sync1023 fzzySync1023;
+ @Autowired
+ private Fzzy61Sync1311 fzzySync1311;
+ @Autowired
+ private Fzzy61Sync9201 fzzySync9201;
+ @Autowired
+ private Fzzy61Sync2103 fzzy61Sync2103;
+
+ @Override
+ public String getProtocol() {
+ return SyncProtocol.FZZY_V61_GB.getCode();
+ }
+
+ @Override
+ public void syncData(ApiParam param) {
+
+
+ /*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
+ if (StringUtils.isNotEmpty(param.getPushProtocol()) && (PushProtocol.SB_GD_2022.getCode().equals(param.getPushProtocol())||PushProtocol.SB_GD_2023.getCode().equals(param.getPushProtocol()))) {
+ //骞夸笢鐪佸钩鍙�2022鐗堬紝闇�瑕佸悓姝ョ啅钂稿妗堜俊鎭�
+ //鐔忚捀澶囨鏁版嵁鍚屾
+ fzzySync1023.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ fzzySync9201.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ }
+ if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
+ //涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ョ伯鎯呰澶囬厤缃俊鎭�
+
+ //鍚屾绮儏璁惧閰嶇疆淇℃伅
+ fzzy61Sync2103.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ //瑙嗛鐩戞帶淇℃伅鍚屾
+ fzzySync1311.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ }
+
+ /*-----鍏叡鎺ュ彛-----*/
+
+ //娓╂箍搴︽娴嬫暟鎹悓姝�
+ fzzySync1302.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //铏妫�娴嬪悓姝�
+ fzzySync1303.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //姘斾綋妫�娴嬪悓姝�
+ fzzySync1304.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //璐ㄦ鍚屾
+ fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //閫氶浣滀笟淇℃伅鍚屾
+ fzzySync1305.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //鐔忚捀浣滀笟淇℃伅鍚屾
+ fzzySync1306.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //浠撳唴瑙嗛鍥惧儚鎶撴媿鍚屾
+ fzzySync1307.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ }
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService14.java b/src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService14.java
new file mode 100644
index 0000000..ce18125
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService14.java
@@ -0,0 +1,62 @@
+package com.fzzy.async.fzzy61;
+
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.SyncProtocol;
+import com.fzzy.api.service.SyncService14;
+import com.fzzy.async.fzzy61.impl.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * FZZY-绮簱绯荤粺4.0瀵规帴
+ */
+@Component
+public class Fzzy61SyncService14 implements SyncService14 {
+
+
+ @Autowired
+ private Fzzy61Sync1403 fzzy61Sync1403;
+ @Autowired
+ private Fzzy61Sync1404 fzzy61Sync1404;
+ @Autowired
+ private Fzzy61Sync1504 fzzy61Sync1504;
+ @Autowired
+ private Fzzy61Sync1505 fzzy61Sync1505;
+ @Autowired
+ private Fzzy61Sync1506 fzzy61Sync1506;
+ @Autowired
+ private Fzzy61Sync1507 fzzy61Sync1507;
+ @Autowired
+ private Fzzy61Sync1508 fzzy61Sync1508;
+ @Autowired
+ private Fzzy61Sync1509 fzzy61Sync1509;
+ @Autowired
+ private Fzzy61Sync1510 fzzy61Sync1510;
+
+
+ @Override
+ public String getProtocol() {
+ return SyncProtocol.FZZY_V61_GB.getCode();
+ }
+
+ @Override
+ public void syncData(ApiParam param) {
+
+ //杞崲璁″垝鍚屾
+ fzzy61Sync1403.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //杞崲璁″垝鏄庣粏鍚屾
+ fzzy61Sync1404.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ //鍚屾璐㈠姟淇℃伅
+// fzzy61Sync1504.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+// fzzy61Sync1505.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+// fzzy61Sync1506.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+// fzzy61Sync1507.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+// fzzy61Sync1508.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+// fzzy61Sync1509.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+// fzzy61Sync1510.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ }
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1504.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1504.java
new file mode 100644
index 0000000..357e29f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1504.java
@@ -0,0 +1,106 @@
+package com.fzzy.async.fzzy61.entity;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2024-12-19 14:23
+ **/
+
+import com.alibaba.fastjson.annotation.JSONField;
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璐﹀淇℃伅
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "API_1504")
+public class Fz61Api1504 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nacctid", precision = 23)
+ private String nacctid;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐﹀鍚嶇О")
+ @Column(name = "cncctname", length = 256)
+ private String cncctname;
+
+ @PropertyDef(label = "鏈綅甯�")
+ @Column(name = "ccurrency", length = 3)
+ private String ccurrency;
+
+ @PropertyDef(label = "浼氳涓荤")
+ @Column(name = "cacctchief", length = 20)
+ private String cacctchief;
+
+ @JSONField(format = "yyyyMM")
+ @PropertyDef(label = "鍚敤鏈熼棿", description = "yyyyMM")
+ @Column(name = "cperiodstart", length = 10)
+ private Date cperiodstart;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍚敤鏃ユ湡")
+ @Column(name = "cyearbmd", length = 10)
+ private Date cyearbmd;
+
+ @PropertyDef(label = "鏈熼棿鏁�", description = "榛樿12")
+ @Column(name = "nacctperiodnum")
+ private Integer nacctperiodnum;
+
+ @PropertyDef(label = "浼氳鍒跺害浠ｇ爜", description = "11:浼佷笟浼氳鍑嗗垯鍒跺害(绮2013鐗�)(榛樿浠ｇ爜鍊�)")
+ @Column(name = "caccclasscode", length = 2)
+ private String caccclasscode;
+
+ @PropertyDef(label = "绉戠洰绾ф", description = "4-8:榛樿鏈�灏忓�间负4")
+ @Column(name = "naccgrade")
+ private Integer naccgrade;
+
+ @PropertyDef(label = "绉戠洰缂栫爜瑙勫垯", description = "4222XXXX:榛樿鍓嶅洓绾х骇闀胯鍒欎负4222")
+ @Column(name = "cacccodestr", length = 40)
+ private String cacccodestr;
+
+ @PropertyDef(label = "鍗曚綅鍚嶇О")
+ @Column(name = "ccropname", length = 256)
+ private String ccropname;
+
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ @Column(name = "corgcode", length = 18)
+ private String corgcode;
+
+ @PropertyDef(label = "姣忔湀缁撹处鏃�")
+ @Column(name = "nendday")
+ private Integer nendday;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
+
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1505.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1505.java
new file mode 100644
index 0000000..402db7e
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1505.java
@@ -0,0 +1,127 @@
+package com.fzzy.async.fzzy61.entity;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2024-12-19 14:23
+ **/
+
+import com.alibaba.fastjson.annotation.JSONField;
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 绉戠洰淇℃伅
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "API_1505")
+public class Fz61Api1505 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @Column(name = "ID_", precision = 110)
+ @JSONField(serialize = false)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nacctid", length = 23)
+ private String nacctid;
+
+
+ @PropertyDef(label = "骞村害")
+ @Column(name = "cyear")
+ private Integer cyear;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @Column(name = "ccode", length = 80)
+ private String ccode;
+
+ @PropertyDef(label = "绉戠洰鍚嶇О")
+ @Column(name = "cname", length = 256)
+ private String cname;
+
+ @PropertyDef(label = "绉戠洰鍏ㄧО")
+ @Column(name = "callname", length = 65536)
+ private String callname;
+
+ /**
+ * 1:璧勪骇绫�
+ * 2:璐熷�虹被
+ * 3:鍏卞悓绫�
+ * 4:鎵�鏈夎�呮潈鐩婄被
+ * 5:鎴愭湰璐圭敤绫�
+ * 6:鎹熺泭绫�
+ */
+ @PropertyDef(label = "绉戠洰绫诲埆")
+ @Column(name = "nclass", length = 9)
+ private String nclass;
+ /**
+ * (-1)-璐锋柟锛�1-鍊熸柟
+ */
+ @PropertyDef(label = "浣欓鏂瑰悜")
+ @Column(name = "cdc")
+ private Integer cdc;
+
+ @PropertyDef(label = "鏈骇绉戠洰")
+ @Column(name = "bl")
+ private Integer bl;
+
+ @PropertyDef(label = "绉戠洰绾ф")
+ @Column(name = "ngrade")
+ private Integer ngrade;
+
+ @PropertyDef(label = "鏁伴噺绉戠洰")
+ @Column(name = "bq")
+ private Integer bq;
+
+ @PropertyDef(label = "鏁伴噺鍗曚綅")
+ @Column(name = "cqunit")
+ private Integer cqunit;
+
+ @PropertyDef(label = "鐜伴噾绫荤鐩�")
+ @Column(name = "bcash")
+ private Integer bcash;
+
+ @PropertyDef(label = "閾惰绫荤鐩�")
+ @Column(name = "bbank")
+ private Integer bbank;
+
+ @PropertyDef(label = "鐜伴噾娴侀噺绫荤鐩�")
+ @Column(name = "bxjll")
+ private Integer bxjll;
+
+ @PropertyDef(label = "鍐荤粨")
+ @Column(name = "bf")
+ private Integer bf;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
+
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1506.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1506.java
new file mode 100644
index 0000000..ca98503
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1506.java
@@ -0,0 +1,127 @@
+package com.fzzy.async.fzzy61.entity;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2024-12-19 14:23
+ **/
+
+import com.alibaba.fastjson.annotation.JSONField;
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 绉戠洰浣欓琛�
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "API_1506")
+public class Fz61Api1506 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @Column(name = "ID_", precision = 110)
+ @JSONField(serialize = false)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nacctid", length = 23)
+ private String nacctid;
+
+ @PropertyDef(label = "鏈熼棿")
+ @Column(name = "cyear")
+ private Integer cyear;
+
+ @PropertyDef(label = "骞村害")
+ @Column(name = "nno")
+ private Integer nno;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @Column(name = "ccode", length = 80)
+ private String ccode;
+
+ @PropertyDef(label = "鏈熷垵鏈綅甯佷綑棰�")
+ @Column(name = "bm", precision = 20, scale = 4)
+ private Double bm;
+
+ @PropertyDef(label = "鏈熸湯鏈綅甯佷綑棰�")
+ @Column(name = "em", precision = 20, scale = 4)
+ private Double em;
+
+ @PropertyDef(label = "鏈熷垵鏁伴噺")
+ @Column(name = "bqty", precision = 20, scale = 4)
+ private Double bqty;
+
+ @PropertyDef(label = "鏈熸湯鏁伴噺")
+ @Column(name = "eqty", precision = 20, scale = 4)
+ private Double eqty;
+ /**
+ * 1:鍊熸柟
+ * -1:璐锋柟
+ */
+ @PropertyDef(label = "浣欓鏂瑰悜")
+ @Column(name = "cdc")
+ private Integer cdc;
+
+ @PropertyDef(label = "鍊熸柟鏈綅甯佸彂鐢熼")
+ @Column(name = "dm", precision = 20, scale = 4)
+ private Double dm;
+
+ @PropertyDef(label = "璐锋柟鏈綅甯佸彂鐢熼")
+ @Column(name = "cm", precision = 20, scale = 4)
+ private Double cm;
+
+ @PropertyDef(label = "鍊熸柟鍙戠敓鏁伴噺")
+ @Column(name = "dq", precision = 20, scale = 4)
+ private Double dq;
+
+ @PropertyDef(label = "璐锋柟鍙戠敓鏁伴噺")
+ @Column(name = "cq", precision = 20, scale = 4)
+ private Double cq;
+
+ @PropertyDef(label = "鏈熷垵澶栧竵浣欓")
+ @Column(name = "bfm", precision = 20, scale = 4)
+ private Double bfm;
+
+ @PropertyDef(label = "鏈熸湯澶栧竵浣欓")
+ @Column(name = "efm", precision = 20, scale = 4)
+ private Double efm;
+
+ @PropertyDef(label = "鍊熸柟澶栧竵鍙戠敓棰�")
+ @Column(name = "dfm", precision = 20, scale = 4)
+ private Double dfm;
+
+ @PropertyDef(label = "璐锋柟澶栧竵鍙戠敓棰�")
+ @Column(name = "cfm", precision = 20, scale = 4)
+ private Double cfm;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
+
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1507.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1507.java
new file mode 100644
index 0000000..27b4c0e
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1507.java
@@ -0,0 +1,155 @@
+package com.fzzy.async.fzzy61.entity;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2024-12-19 14:23
+ **/
+
+import com.alibaba.fastjson.annotation.JSONField;
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 浼氳鍑瘉淇℃伅
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "API_1507")
+public class Fz61Api1507 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @Column(name = "ID_", length = 40)
+ @JSONField(serialize = false)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nacctid", length = 23)
+ private String nacctid;
+
+ @PropertyDef(label = "鍑瘉绫诲瀷")
+ @Column(name = "cvkind", length = 9)
+ private String cvkind;
+
+ @PropertyDef(label = "鏈熼棿")
+ @Column(name = "cmon")
+ private Integer cmon;
+
+ @PropertyDef(label = "骞村害")
+ @Column(name = "cyear")
+ private Integer cyear;
+
+ @PropertyDef(label = "鍑瘉鍙�")
+ @Column(name = "nvno")
+ private Integer nvno;
+
+ @PropertyDef(label = "鍒嗗綍搴忓彿")
+ @Column(name = "nno")
+ private Integer nno;
+
+ @PropertyDef(label = "鍑瘉鍒嗙被")
+ @Column(name = "btmp")
+ private Integer btmp;
+
+ @PropertyDef(label = "鎽樿")
+ @Column(name = "digest", length = 512)
+ private String digest;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @Column(name = "ccode", length = 80)
+ private String ccode;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍑瘉鏃ユ湡")
+ @Column(name = "ccsmalldatetime", length = 10)
+ private Date ccsmalldatetime;
+
+ @PropertyDef(label = "鍒跺崟浜�")
+ @Column(name = "cmaker", length = 32)
+ private String cmaker;
+ /**
+ * 1:鍊熸柟
+ * -1:璐锋柟
+ */
+ @PropertyDef(label = "鏂瑰悜")
+ @Column(name = "cdc")
+ private Integer cdc;
+
+ @PropertyDef(label = "瀹℃牳浜�")
+ @Column(name = "ccker", length = 32)
+ private String ccker;
+
+ @PropertyDef(label = "璁拌处浜�")
+ @Column(name = "cpter", length = 32)
+ private String cpter;
+ /**
+ * 0:鍚�
+ * 1:鏄�
+ */
+ @PropertyDef(label = "璁拌处鏍囧織")
+ @Column(name = "bpt")
+ private Integer bpt;
+
+ @PropertyDef(label = "闄勪欢寮犳暟")
+ @Column(name = "nanum")
+ private Integer nanum;
+
+ @PropertyDef(label = "閲戦")
+ @Column(name = "nm", precision = 20, scale = 4)
+ private Double nm;
+
+ @PropertyDef(label = "鏁伴噺")
+ @Column(name = "nqty", precision = 20, scale = 4)
+ private Double nqty;
+
+ @PropertyDef(label = "鍗曚环")
+ @Column(name = "nprice", precision = 20, scale = 4)
+ private Double nprice;
+
+ @PropertyDef(label = "鍑虹撼")
+ @Column(name = "ccashier", length = 32)
+ private String ccashier;
+
+ @PropertyDef(label = "姹囩巼")
+ @Column(name = "rate", precision = 20, scale = 4)
+ private Double rate;
+
+ @PropertyDef(label = "澶栧竵閲戦")
+ @Column(name = "nfm", precision = 20, scale = 4)
+ private Double nfm;
+
+ @PropertyDef(label = "璁￠噺鍗曚綅", description = "璁￠噺鍗曚綅姹夊瓧")
+ @Column(name = "meterunitid", length = 32)
+ private String meterunitid;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
+
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1508.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1508.java
new file mode 100644
index 0000000..c1f92bc
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1508.java
@@ -0,0 +1,103 @@
+package com.fzzy.async.fzzy61.entity;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2024-12-19 14:23
+ **/
+
+import com.alibaba.fastjson.annotation.JSONField;
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鐜伴噾娴侀噺鍒嗛厤淇℃伅
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "API_1508")
+public class Fz61Api1508 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @Column(name = "ID_", length = 40)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nacctid", length = 23)
+ private String nacctid;
+
+ @PropertyDef(label = "鍑瘉绫诲瀷")
+ @Column(name = "cvkind", length = 10)
+ private String cvkind;
+
+ @PropertyDef(label = "鏈熼棿")
+ @Column(name = "cmon")
+ private Integer cmon;
+
+ @PropertyDef(label = "骞村害")
+ @Column(name = "cyear")
+ private Integer cyear;
+
+ @PropertyDef(label = "鍑瘉鍙�")
+ @Column(name = "nvno")
+ private Integer nvno;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @Column(name = "ccode", length = 80)
+ private String ccode;
+
+ @PropertyDef(label = "瀵规柟绉戠洰缂栫爜")
+ @Column(name = "cdfcode", length = 80)
+ private String cdfcode;
+
+ @PropertyDef(label = "鐜伴噾娴侀噺椤圭洰浠ｇ爜")
+ @Column(name = "ccashcode", length = 80)
+ private String ccashcode;
+
+ @PropertyDef(label = "鍒嗗綍搴忓彿")
+ @Column(name = "nrowno")
+ private Integer nrowno;
+
+ @PropertyDef(label = "閲戦")
+ @Column(name = "nm", precision = 20, scale = 4)
+ private Double nm;
+
+ /**
+ * 1:娴佸叆
+ * -1:娴佸嚭
+ */
+ @PropertyDef(label = "鏂瑰悜")
+ @Column(name = "cdc")
+ private Integer cdc;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
+
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1509.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1509.java
new file mode 100644
index 0000000..e19bc29
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1509.java
@@ -0,0 +1,195 @@
+package com.fzzy.async.fzzy61.entity;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2024-12-19 14:23
+ **/
+
+import com.alibaba.fastjson.annotation.JSONField;
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鍥哄畾璧勪骇鍗＄墖淇℃伅
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "API_1509")
+public class Fz61Api1509 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @Column(name = "ID_", precision = 18)
+ @JSONField(serialize = false)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nacctid", length = 23)
+ private String nacctid;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
+ @Column(name = "fixassetcode", length = 20)
+ private String fixassetcode;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鑷紪鐮�")
+ @Column(name = "origfixassetcode", length = 20)
+ private String origfixassetcode;
+
+ @PropertyDef(label = "璧勪骇绫诲埆缂栫爜")
+ @Column(name = "groupcode", length = 20)
+ private String groupcode;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鍚嶇О")
+ @Column(name = "fixassetname", length = 80)
+ private String fixassetname;
+
+ @PropertyDef(label = "璁￠噺鍗曚綅鍚嶇О")
+ @Column(name = "unitname", length = 20)
+ private String unitname;
+
+ @PropertyDef(label = "鍘熷��")
+ @Column(name = "valueorg", length = 20, scale = 4)
+ private Double valueorg;
+
+ @PropertyDef(label = "褰撳墠鍘熷��")
+ @Column(name = "dresentvalueorg", length = 20, scale = 4)
+ private Double dresentvalueorg;
+ /**
+ * 1:涓嶆彁鎶樻棫娉�
+ * 2:骞冲潎骞撮檺娉�
+ * 3:鍔ㄦ�佸钩鍧囧勾闄愭硶
+ * 4:宸ヤ綔閲忔硶
+ * 5:骞存暟鎬诲拰娉�
+ * 6:鍙屽�嶄綑棰濋�掑噺娉�
+ */
+ @PropertyDef(label = "鎶樻棫鏂规硶")
+ @Column(name = "deprmethodid")
+ private Integer deprmethodid;
+
+ /**
+ * 1:鎶曡祫
+ * 2:鑷缓
+ * 3:璐拱
+ * 4:铻嶈祫绉熻祦
+ * 5:缁忚惀绉熷叆
+ * 6:鏃犲伩璋冨叆
+ * 7:鎹愯禒
+ * 8:鎹㈠叆
+ */
+ @PropertyDef(label = "鍥哄畾璧勪骇鏉ユ簮")
+ @Column(name = "sourceid")
+ private Integer sourceid;
+
+ @PropertyDef(label = "鍨嬪彿")
+ @Column(name = "model", length = 40)
+ private String model;
+
+ @PropertyDef(label = "瑙勬牸")
+ @Column(name = "specs", length = 40)
+ private String specs;
+
+ @PropertyDef(label = "鍒堕�犲晢")
+ @Column(name = "manufacturer", length = 60)
+ private String manufacturer;
+
+ @PropertyDef(label = "浜у湴")
+ @Column(name = "makingplace", length = 40)
+ private String makingplace;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "杩涘崟浣嶆棩鏈�")
+ @Column(name = "enterday", length = 10)
+ private Date enterday;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寮�濮嬩娇鐢ㄦ棩鏈�")
+ @Column(name = "beginuseday", length = 10)
+ private Date beginuseday;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寤哄崱鏃ユ湡")
+ @Column(name = "makinday", length = 10)
+ private Date makinday;
+
+ @PropertyDef(label = "绠＄悊浜�")
+ @Column(name = "keeper", length = 20)
+ private String keeper;
+
+ @PropertyDef(label = "寤哄崱浜�")
+ @Column(name = "maker", length = 20)
+ private String maker;
+
+ @PropertyDef(label = "棰勮浣跨敤鏈熼棿鏁�")
+ @Column(name = "usingperiods")
+ private Integer usingperiods;
+
+ @PropertyDef(label = "棰勮鍑�娈嬪��")
+ @Column(name = "expecremain", precision = 20, scale = 4)
+ private Double expecremain;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇瀵瑰簲绉戠洰缂栫爜")
+ @Column(name = "assetacctcode", length = 20)
+ private String assetacctcode;
+
+ @PropertyDef(label = "绱鎶樻棫瀵瑰簲绉戠洰缂栫爜")
+ @Column(name = "depracctcode", length = 20)
+ private String depracctcode;
+
+ @PropertyDef(label = "绱鎶樻棫")
+ @Column(name = "accumulatedepr", precision = 20, scale = 4)
+ private Double accumulatedepr;
+ /**
+ * 0:鍚�
+ * 1:鏄�
+ */
+ @PropertyDef(label = "鏄惁鎶ュ簾娓呯悊")
+ @Column(name = "abadoned", length = 1)
+ private String abadoned;
+
+ /**
+ * 1:鍦ㄤ娇鐢�
+ * 2:鏈娇鐢�
+ * 3:鍋滅敤
+ * 4:鍑哄敭
+ * 5:鎶ユ崯
+ * 6:鐩樹簭
+ */
+ @PropertyDef(label = "褰撳墠浣跨敤鐘舵�佸悕绉�")
+ @Column(name = "presentstatus", length = 20)
+ private String presentstatus;
+
+ @PropertyDef(label = "澶囨敞")
+ @Column(name = "notes", length = 512)
+ private String notes;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
+
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1510.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1510.java
new file mode 100644
index 0000000..2c1f919
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Api1510.java
@@ -0,0 +1,136 @@
+package com.fzzy.async.fzzy61.entity;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2024-12-19 14:23
+ **/
+
+import com.alibaba.fastjson.annotation.JSONField;
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璧勪骇鎶樻棫淇℃伅
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "API_1510")
+public class Fz61Api1510 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @Column(name = "ID_", precision = 18)
+ @JSONField(serialize = false)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nacctid", length = 23)
+ private String nacctid;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
+ @Column(name = "fixassetcode", length = 20)
+ private String fixassetcode;
+
+ @PropertyDef(label = "鏈熼棿")
+ @Column(name = "period")
+ private Integer period;
+
+ @PropertyDef(label = "骞村害")
+ @Column(name = "acctyear")
+ private Integer acctyear;
+
+ @PropertyDef(label = "鏈熷垵鍘熷��")
+ @Column(name = "bvalueorg", precision = 20, scale = 4)
+ private Double bvalueorg;
+
+ @PropertyDef(label = "绱鎶樻棫")
+ @Column(name = "baccumdepr", precision = 20, scale = 4)
+ private Double baccumdepr;
+
+ @PropertyDef(label = "鏈湡璁℃彁鎶樻棫")
+ @Column(name = "deprammount", precision = 20, scale = 4)
+ private Double deprammount;
+
+ @PropertyDef(label = "鏈勾绱璁℃彁鎶樻棫")
+ @Column(name = "yaccumdepr", precision = 20, scale = 4)
+ private Double yaccumdepr;
+
+ @PropertyDef(label = "鏈湡鏁伴噺澧炲姞")
+ @Column(name = "qtyadd", precision = 20, scale = 4)
+ private Double qtyadd;
+
+ @PropertyDef(label = "鏈湡鏁伴噺鍑忓皯")
+ @Column(name = "qtydecrease", precision = 20, scale = 4)
+ private Double qtydecrease;
+
+ @PropertyDef(label = "鏈湡鍘熷�煎鍔�")
+ @Column(name = "valueorgadd", precision = 20, scale = 4)
+ private Double valueorgadd;
+
+ @PropertyDef(label = "鏈湡鍘熷�煎噺灏�")
+ @Column(name = "valueorgderease", precision = 20, scale = 4)
+ private Double valueorgderease;
+
+ @PropertyDef(label = "鏈湡绱鎶樻棫璋冨")
+ @Column(name = "accudepradjustadd", precision = 20, scale = 4)
+ private Double accudepradjustadd;
+
+ @PropertyDef(label = "鏈湡绱鎶樻棫璋冨噺")
+ @Column(name = "accudepradjustdec", precision = 20, scale = 4)
+ private Double accudepradjustdec;
+
+ @PropertyDef(label = "鏈勾绱鏁伴噺澧炲姞")
+ @Column(name = "yqtyincrease", precision = 20, scale = 4)
+ private Double yqtyIncrease;
+
+ @PropertyDef(label = "鏈勾绱鏁伴噺鍑忓皯")
+ @Column(name = "yqtydecrease", precision = 20, scale = 4)
+ private Double yqtydecrease;
+
+ @PropertyDef(label = "鏈勾鍘熷�肩疮璁″鍔�")
+ @Column(name = "yvalueincrease", precision = 20, scale = 4)
+ private Double yvalueincrease;
+
+ @PropertyDef(label = "鏈勾鍘熷�肩疮璁″噺灏�")
+ @Column(name = "yvaluedecrease", precision = 20, scale = 4)
+ private Double yvaluedecrease;
+
+ @PropertyDef(label = "鏈勾绱鎶樻棫璋冨")
+ @Column(name = "yaccudeprincrease", precision = 20, scale = 4)
+ private Double yaccudeprincrease;
+
+ @PropertyDef(label = "鏈勾绱鎶樻棫璋冨噺")
+ @Column(name = "yaccudeprdecrease", precision = 20, scale = 4)
+ private Double yaccudeprdecrease;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
+
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61AreationData.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61AreationData.java
new file mode 100644
index 0000000..b92c902
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61AreationData.java
@@ -0,0 +1,267 @@
+package com.fzzy.async.fzzy61.entity;
+
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 閫氶鏁版嵁
+ * @author vince
+ *
+ */
+@Data
+@Entity
+@Table(name = "D_AREATION_DATA")
+public class Fz61AreationData implements Serializable {
+
+ public static String SORT_PROP = "id";
+
+ @Id
+ @Column(name = "ID_", length = 41)
+ @PropertyDef(label = "涓婚敭")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "鎿嶄綔浠撳簱")
+ private String depotId;
+
+ @Column(name = "OBJECTIVE_", length = 100)
+ @PropertyDef(label = "閫氶鐩殑")
+ private String objective;
+
+ @PropertyDef(label = "绮爢瀛旈殭搴�")
+ @Column(name = "ldkxd", precision = 10, scale = 3)
+ private Double ldkxd;
+
+ /**
+ * 1锛氳嚜鐒剁┖姘旈�氶
+ * 2锛氬姞鐑┖姘旈�氶
+ * 3锛氬喎鍗寸┖姘旈�氶
+ * 4锛氬唴寰幆鎺ф俯
+ * 5锛氱┖璋冩帶娓╅�氶
+ * 6锛氱淮鎸侀�氶
+ */
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "閫氶绫诲瀷")
+ private String type;
+ /**
+ * 1锛氬湴妲�
+ * 2锛氬湴涓婄
+ * 3锛氱Щ鍔ㄥ紡
+ * 4锛氱寮�
+ * 5锛氬緞鍚�
+ * 6锛氬す搴�
+ * 9锛氬叾浠�
+ */
+ @Column(name = "WIND_NET_TYPE_", length = 10)
+ @PropertyDef(label = "椋庣綉绫诲瀷")
+ private String windNetType;
+
+ @PropertyDef(label = "椋庣綉璁剧疆鏂瑰紡")
+ @Column(name = "fwszfs", length = 64)
+ private String fwszfs;
+
+ @PropertyDef(label = "涓婚閬撴埅闈㈢Н")
+ @Column(name = "zfdjmj", precision = 10, scale = 3)
+ private Double zfdjmj;
+
+ @PropertyDef(label = "鏀閬撴埅闈㈢Н")
+ @Column(name = "zhfdjmj", precision = 10, scale = 3)
+ private Double zhfdjmj;
+
+ @PropertyDef(label = "鏀閬撴�婚暱搴�")
+ @Column(name = "zfdzcd", precision = 20, scale = 3)
+ private Double zfdzcd;
+
+ @PropertyDef(label = "椋庣綉寮�瀛旂巼")
+ @Column(name = "fwkkl", precision = 10, scale = 3)
+ private Double fwkkl;
+
+ @PropertyDef(label = "绌烘皵閫斿緞姣�")
+ @Column(name = "kqtjb", precision = 10, scale = 3)
+ private Double kqtjb;
+
+ @PropertyDef(label = "閫氶鍙ｈ缃釜鏁�")
+ @Column(name = "tfkszgs")
+ private Integer tfkszgs;
+
+ @PropertyDef(label = "閫氶鏈哄瀷鍙�")
+ @Column(name = "tfjxh", length = 128)
+ private String tfjxh;
+
+ @PropertyDef(label = "閫氶鏈哄彴鏁�")
+ @Column(name = "tfjts")
+ private Integer tfjts;
+
+ @PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍏ㄥ帇")
+ @Column(name = "dtfjedqy", precision = 10, scale = 3)
+ private Double dtfjedqy;
+
+ @PropertyDef(label = "鍗曞彴椋庢満棰濆畾椋庨噺")
+ @Column(name = "dtfjedfl", precision = 10, scale = 3)
+ private Double dtfjedfl;
+
+ @PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍔熺巼")
+ @Column(name = "dtfjedgl", precision = 10, scale = 3)
+ private Double dtfjedgl;
+
+ /**
+ * 1锛氬帇鍏ュ紡閫氶
+ * 2锛氬惛鍑哄紡閫氶
+ * 3锛氬帇鍏ヤ笌鍚稿嚭鐩哥粨鍚堝紡閫氶
+ * 4锛氱幆娴侀�氶
+ * 9锛氬叾瀹�
+ */
+ @Column(name = "AIR_SUPPLY_MODE_", length = 10)
+ @PropertyDef(label = "閫侀鏂瑰紡")
+ private String airSupplyMode;
+
+ @PropertyDef(label = "鍗曞彴椋庢満瀹炴祴椋庨噺")
+ @Column(name = "dtfjscfl", precision = 10, scale = 3)
+ private Double dtfjscfl;
+
+ @PropertyDef(label = "鍗曞彴椋庢満杞村姛鐜�")
+ @Column(name = "dtfjzgl", precision = 10, scale = 3)
+ private Double dtfjzgl;
+
+ @PropertyDef(label = "鎬婚閲�")
+ @Column(name = "zfl", precision = 10, scale = 3)
+ private Double zfl;
+
+ @PropertyDef(label = "鍗曚綅閫氶閲�")
+ @Column(name = "dwtfl", precision = 10, scale = 3)
+ private Double dwtfl;
+
+ @PropertyDef(label = "瀹炴祴绯荤粺闃诲姏")
+ @Column(name = "scxtzl", precision = 10, scale = 3)
+ private Double scxtzl;
+
+ /**
+ * 鎬昏�楃數閲� 鍗冪摝
+ */
+ @Column(name = "TOTAL_ES_")
+ @PropertyDef(label = "鎬昏�楃數閲�")
+ private Double totalEs;
+
+ @PropertyDef(label = "浣滀笟鏃舵皵娓�")
+ @Column(name = "zysqw", precision = 10, scale = 3)
+ private double zysqw;
+
+ @PropertyDef(label = "浣滀笟鏃舵皵婀�")
+ @Column(name = "zysqs", precision = 10, scale = 3)
+ private double zysqs;
+
+ @Column(name = "BEFORE_TEMP_AVG_")
+ @PropertyDef(label = "浣滀笟鍓嶅钩鍧囩伯娓�")
+ private Double beforeTempAvg;
+
+ @Column(name = "AFTER_TEMP_AVG_")
+ @PropertyDef(label = "浣滀笟鍚庡钩鍧囩伯娓�")
+ private Double afterTempAvg;
+
+ @PropertyDef(label = "闄嶆俯骞呭害")
+ @Column(name = "jwfd", precision = 10, scale = 3)
+ private double jwfd;
+
+ @PropertyDef(label = "鍚ㄧ伯闄嶆俯鑳借��")
+ @Column(name = "dljwnh", precision = 10, scale = 3)
+ private double dljwnh;
+
+ @PropertyDef(label = "澶辨按鐜�")
+ @Column(name = "ssl_", precision = 10, scale = 3)
+ private double ssl;
+
+ @PropertyDef(label = "淇濇按鏁堟灉璇勪环缁撴灉")
+ @Column(name = "bsxgpjjg", length = 128)
+ private String bsxgpjjg;
+
+ @PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇鏁翠粨")
+ @Column(name = "tfjwjyxpjzc", length = 128)
+ private String tfjwjyxpjzc;
+
+ @PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓婂眰")
+ @Column(name = "tfjwjyxpjsc", length = 128)
+ private String tfjwjyxpjsc;
+
+ @PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓�(闂�)灞�")
+ @Column(name = "tfjwjyxpjzjc", length = 128)
+ private String tfjwjyxpjzjc;
+
+ @PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓嬪眰")
+ @Column(name = "tfjwjyxpjxc", length = 128)
+ private String tfjwjyxpjxc;
+
+ @Column(name = "BEFORE_PER_WET_AVG_")
+ @PropertyDef(label = "浣滀笟鍓嶅钩鍧囨按鍒�")
+ private Double beforPerWetAvg;
+
+ @Column(name = "AFTER_PER_WET_AVG_")
+ @PropertyDef(label = "浣滀笟鍚庡钩鍧囨按鍒�")
+ private Double afterPerWetAvg;
+
+ @PropertyDef(label = "闄嶆按骞呭害")
+ @Column(name = "jsfd", precision = 10, scale = 3)
+ private Double jsfd;
+
+ @PropertyDef(label = "鍚ㄧ伯闄嶆按鑳借��")
+ @Column(name = "dljsnh", precision = 10, scale = 3)
+ private Double dljsnh;
+
+ @PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄鏁翠粨")
+ @Column(name = "tfjsjyxfxzc", length = 128)
+ private String tfjsjyxfxzc;
+
+ @PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓婂眰")
+ @Column(name = "tfjsjyxfxsc", length = 128)
+ private String tfjsjyxfxsc;
+
+ @PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓�(闂�)灞�")
+ @Column(name = "tfjsjyxfxzjc", length = 128)
+ private String tfjsjyxfxzjc;
+
+ @PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓嬪眰")
+ @Column(name = "tfjsjyxfxxc", length = 128)
+ private String tfjsjyxfxxc;
+
+ @Column(name = "CHARGE_USER_", length = 30)
+ @PropertyDef(label = "璐熻矗浜�", description = "閫氶浣滀笟璐熻矗浜�")
+ private String chargeUser;
+ @Column(name = "OPERATORS_", length = 30)
+ @PropertyDef(label = "浣滀笟浜哄憳", description = "閫氶浣滀笟浜�")
+ private String operators;
+
+ @Column(name = "START_TIME_")
+ @PropertyDef(label = "閫氶浣滀笟鏃堕棿")
+ private Date startTime;
+
+ @Column(name = "LONG_TIME_")
+ @PropertyDef(label = "閫氶鏃堕暱锛屽崟浣嶅皬鏃�")
+ private Double longTime;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "淇敼鏃堕棿", description = "鏈�鍚庝慨鏀规椂闂�")
+ private Date updateTime;
+
+ @Column(name = "UPDATE_USER_", length = 30)
+ @PropertyDef(label = "淇敼浜�", description = "鏈�鍚庝慨鏀逛汉")
+ private String updateUser;
+
+ @Column(name = "REMARK_", length = 200)
+ @PropertyDef(label = "澶囨敞淇℃伅")
+ private String remark;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61AssetsLiability.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61AssetsLiability.java
new file mode 100644
index 0000000..48f4f43
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61AssetsLiability.java
@@ -0,0 +1,598 @@
+package com.fzzy.async.fzzy61.entity;
+
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璐㈠姟绠＄悊-璧勪骇璐熷��
+ *
+ * @author czt
+ * @date 2023-04-10 10:40
+ */
+@Data
+@Entity
+@Table(name = "D_FINANCE_ASSETS_Liability")
+public class Fz61AssetsLiability implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @PropertyDef(label = "id" )
+ @Column(name = "ID_", length = 40)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "鎶ヨ〃鏃堕棿" )
+ @Column(name = "bbsj")
+ private Date bbsj;
+
+ @PropertyDef(label = "璐у竵璧勯噾鏈熸湯浣欓(鍏�)" )
+ @Column(name = "hbjjqmye")
+ private Double hbjjqmye;
+
+ @PropertyDef(label = "璐у竵璧勯噾骞村垵浣欓(鍏�)" )
+ @Column(name = "hbjjncye")
+ private Double hbjjncye;
+
+ @PropertyDef(label = "浜ゆ槗鎬ч噾铻嶈祫浜ф湡鏈綑棰�(鍏�)" )
+ @Column(name = "jyxjrzcqmye")
+ private Double jyxjrzcqmye;
+
+ @PropertyDef(label = "浜ゆ槗鎬ч噾铻嶈祫浜у勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "jyxjrzcncye")
+ private Double jyxjrzcncye;
+
+ @PropertyDef(label = "琛嶇敓閲戣瀺璧勪骇鏈熸湯浣欓(鍏�)" )
+ @Column(name = "ysjrzcqmye")
+ private Double ysjrzcqmye;
+
+ @PropertyDef(label = "琛嶇敓閲戣瀺璧勪骇骞村垵浣欓(鍏�)" )
+ @Column(name = "ysjrzcncye")
+ private Double ysjrzcncye;
+
+ @PropertyDef(label = "搴旀敹绁ㄦ嵁鏈熸湯浣欓(鍏�)" )
+ @Column(name = "yspjqmye")
+ private Double yspjqmye;
+
+ @PropertyDef(label = "搴旀敹绁ㄦ嵁骞村垵浣欓(鍏�)" )
+ @Column(name = "yspjncye")
+ private Double yspjncye;
+
+ @PropertyDef(label = "搴旀敹璐︽鏈熸湯浣欓(鍏�)" )
+ @Column(name = "yszkqmye")
+ private Double yszkqmye;
+
+ @PropertyDef(label = "搴旀敹璐︽骞村垵浣欓(鍏�)" )
+ @Column(name = "yszkncye")
+ private Double yszkncye;
+
+ @PropertyDef(label = "棰勪粯娆鹃」鏈熸湯浣欓(鍏�)" )
+ @Column(name = "yuskxqmye")
+ private Double yuskxqmye;
+
+ @PropertyDef(label = "棰勪粯娆鹃」骞村垵浣欓(鍏�)" )
+ @Column(name = "yuskxncye")
+ private Double yuskxncye;
+
+ @PropertyDef(label = "鍏朵粬搴旀敹娆炬湡鏈綑棰�(鍏�)" )
+ @Column(name = "qtyszkqmye")
+ private Double qtyszkqmye;
+
+ @PropertyDef(label = "鍏朵粬搴旀敹娆惧勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "qtyszkncye")
+ private Double qtyszkncye;
+
+ @PropertyDef(label = "瀛樿揣鏈熸湯浣欓(鍏�)" )
+ @Column(name = "chqmye")
+ private Double chqmye;
+
+ @PropertyDef(label = "瀛樿揣骞村垵浣欓(鍏�)" )
+ @Column(name = "chncye")
+ private Double chncye;
+
+ @PropertyDef(label = "鍚堝悓璧勪骇鏈熸湯浣欓(鍏�)" )
+ @Column(name = "htzcqmye")
+ private Double htzcqmye;
+
+ @PropertyDef(label = "鍚堝悓璧勪骇骞村垵浣欓(鍏�)" )
+ @Column(name = "htzcncye")
+ private Double htzcncye;
+
+ @PropertyDef(label = "鎸佹湁寰呭敭璧勪骇鏈熸湯浣欓(鍏�)" )
+ @Column(name = "cydszcqmye")
+ private Double cydszcqmye;
+
+ @PropertyDef(label = "鎸佹湁寰呭敭璧勪骇骞村垵浣欓(鍏�)" )
+ @Column(name = "cydszcncye")
+ private Double cydszcncye;
+
+ @PropertyDef(label = "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇鏈熸湯浣欓(鍏�)" )
+ @Column(name = "ynndqfldzcqmye")
+ private Double ynndqfldzcqmye;
+
+ @PropertyDef(label = "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇骞村垵浣欓(鍏�)" )
+ @Column(name = "ynndqfldzcncye")
+ private Double ynndqfldzcncye;
+
+ @PropertyDef(label = "鍏朵粬娴佸姩璧勪骇鏈熸湯浣欓(鍏�)" )
+ @Column(name = "qtldzcqmye")
+ private Double qtldzcqmye;
+
+ @PropertyDef(label = "鍏朵粬娴佸姩璧勪骇骞村垵浣欓(鍏�)" )
+ @Column(name = "qtldzcncye")
+ private Double qtldzcncye;
+
+ @PropertyDef(label = "娴佸姩璧勪骇鍚堣鏈熸湯浣欓(鍏�)" )
+ @Column(name = "ldzchjqmye")
+ private Double ldzchjqmye;
+
+ @PropertyDef(label = "娴佸姩璧勪骇鍚堣骞村垵浣欓(鍏�)" )
+ @Column(name = "ldzchjncye")
+ private Double ldzchjncye;
+
+ @PropertyDef(label = "鍊哄埜鎶曡祫鏈熸湯浣欓(鍏�)" )
+ @Column(name = "zjtzqmye")
+ private Double zjtzqmye;
+
+ @PropertyDef(label = "鍊哄埜鎶曡祫骞村垵浣欓(鍏�)" )
+ @Column(name = "zjtzncye")
+ private Double zjtzncye;
+
+ @PropertyDef(label = "鍏朵粬鍊哄埜鎶曡祫鏈熸湯浣欓(鍏�)" )
+ @Column(name = "qtzqtzqmye")
+ private Double qtzqtzqmye;
+
+ @PropertyDef(label = "鍏朵粬鍊哄埜鎶曡祫骞村垵浣欓(鍏�)" )
+ @Column(name = "qtzqtzncye")
+ private Double qtzqtzncye;
+
+ @PropertyDef(label = "闀挎湡搴旀敹娆炬湡鏈綑棰�(鍏�)" )
+ @Column(name = "cqyskqmye")
+ private Double cqyskqmye;
+
+ @PropertyDef(label = "闀挎湡搴旀敹娆惧勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "cqyskncye")
+ private Double cqyskncye;
+
+ @PropertyDef(label = "闀挎湡鑲℃潈鎶曡祫鏈熸湯浣欓(鍏�)" )
+ @Column(name = "cqgqtzqmye")
+ private Double cqgqtzqmye;
+
+ @PropertyDef(label = "闀挎湡鑲℃潈鎶曡祫骞村垵浣欓(鍏�)" )
+ @Column(name = "cqgqtzncye")
+ private Double cqgqtzncye;
+
+ @PropertyDef(label = "鍏朵粬鏉冪泭宸ュ叿鎶曡祫鏈熸湯浣欓(鍏�)" )
+ @Column(name = "qtqygjtzqmye")
+ private Double qtqygjtzqmye;
+
+ @PropertyDef(label = "鍏朵粬鏉冪泭宸ュ叿鎶曡祫骞村垵浣欓(鍏�)" )
+ @Column(name = "qtqygjtzncye")
+ private Double qtqygjtzncye;
+
+ @PropertyDef(label = "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜ф湡鏈綑棰�(鍏�)" )
+ @Column(name = "qtfldjrzcqmye")
+ private Double qtfldjrzcqmye;
+
+ @PropertyDef(label = "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜у勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "qtfldjrzcncye")
+ private Double qtfldjrzcncye;
+
+ @PropertyDef(label = "鎶曡祫鎬ф埧鍦颁骇鏈熸湯浣欓(鍏�)" )
+ @Column(name = "tzxfdcqmye")
+ private Double tzxfdcqmye;
+
+ @PropertyDef(label = "鎶曡祫鎬ф埧鍦颁骇骞村垵浣欓(鍏�)" )
+ @Column(name = "tzxfdcncye")
+ private Double tzxfdcncye;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鏈熸湯浣欓(鍏�)" )
+ @Column(name = "gdzcqmye")
+ private Double gdzcqmye;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇骞村垵浣欓(鍏�)" )
+ @Column(name = "gdzcncye")
+ private Double gdzcncye;
+
+ @PropertyDef(label = "鍦ㄥ缓宸ョ▼鏈熸湯浣欓(鍏�)" )
+ @Column(name = "zjgcqmye")
+ private Double zjgcqmye;
+
+ @PropertyDef(label = "鍦ㄥ缓宸ョ▼骞村垵浣欓(鍏�)" )
+ @Column(name = "zjgcncye")
+ private Double zjgcncye;
+
+ @PropertyDef(label = "鐢熶骇鎬х敓鐗╄祫浜ф湡鏈綑棰�(鍏�)" )
+ @Column(name = "scxswzcqmye")
+ private Double scxswzcqmye;
+
+ @PropertyDef(label = "鐢熶骇鎬х敓鐗╄祫浜у勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "scxswzcncye")
+ private Double scxswzcncye;
+
+ @PropertyDef(label = "娌规皵璧勪骇鏈熸湯浣欓(鍏�)" )
+ @Column(name = "yqzcqmye")
+ private Double yqzcqmye;
+
+ @PropertyDef(label = "娌规皵璧勪骇骞村垵浣欓(鍏�)" )
+ @Column(name = "yqzcncye")
+ private Double yqzcncye;
+
+ @PropertyDef(label = "鏃犲舰璧勪骇鏈熸湯浣欓(鍏�)" )
+ @Column(name = "wxzcqmye")
+ private Double wxzcqmye;
+
+ @PropertyDef(label = "鏃犲舰璧勪骇骞村垵浣欓(鍏�)" )
+ @Column(name = "wxzcncye")
+ private Double wxzcncye;
+
+ @PropertyDef(label = "寮�鍙戞敮鍑烘湡鏈綑棰�(鍏�)" )
+ @Column(name = "kfzcqmye")
+ private Double kfzcqmye;
+
+ @PropertyDef(label = "寮�鍙戞敮鍑哄勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "kfzcncye")
+ private Double kfzcncye;
+
+ @PropertyDef(label = "鍟嗚獕鏈熸湯浣欓(鍏�)" )
+ @Column(name = "syqmye")
+ private Double syqmye;
+
+ @PropertyDef(label = "鍟嗚獕骞村垵浣欓(鍏�)" )
+ @Column(name = "syncye")
+ private Double syncye;
+
+ @PropertyDef(label = "闀挎湡寰呮憡璐圭敤鏈熸湯浣欓(鍏�)" )
+ @Column(name = "cqdtfyqmye")
+ private Double cqdtfyqmye;
+
+ @PropertyDef(label = "闀挎湡寰呮憡璐圭敤骞村垵浣欓(鍏�)" )
+ @Column(name = "cqdtfyncye")
+ private Double cqdtfyncye;
+
+ @PropertyDef(label = "閫掑欢鎵�寰楃◣璧勪骇鏈熸湯浣欓(鍏�)" )
+ @Column(name = "dysdszcqmye")
+ private Double dysdszcqmye;
+
+ @PropertyDef(label = "閫掑欢鎵�寰楃◣璧勪骇骞村垵浣欓(鍏�)" )
+ @Column(name = "dysdszcncye")
+ private Double dysdszcncye;
+
+ @PropertyDef(label = "鍏朵粬闈炴祦鍔ㄨ祫浜ф湡鏈綑棰�(鍏�)" )
+ @Column(name = "qtfldzcqmye")
+ private Double qtfldzcqmye;
+
+ @PropertyDef(label = "鍏朵粬闈炴祦鍔ㄨ祫浜у勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "qtfldzcncye")
+ private Double qtfldzcncye;
+
+ @PropertyDef(label = "闈炴祦鍔ㄨ祫浜у悎璁℃湡鏈綑棰�(鍏�)" )
+ @Column(name = "fldzcqmye")
+ private Double fldzcqmye;
+
+ @PropertyDef(label = "闈炴祦鍔ㄨ祫浜у悎璁″勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "fldzcncye")
+ private Double fldzcncye;
+
+ @PropertyDef(label = "璧勪骇鎬昏鏈熸湯浣欓(鍏�)" )
+ @Column(name = "zczjqmye")
+ private Double zczjqmye;
+
+ @PropertyDef(label = "璧勪骇鎬昏骞村垵浣欓(鍏�)" )
+ @Column(name = "zczjncye")
+ private Double zczjncye;
+
+ @PropertyDef(label = "鐭湡鍊熸鏈熸湯浣欓(鍏�)" )
+ @Column(name = "dqjkmye")
+ private Double dqjkmye;
+
+ @PropertyDef(label = "鐭湡鍊熸骞村垵浣欓(鍏�)" )
+ @Column(name = "dqjkncye")
+ private Double dqjkncye;
+
+ @PropertyDef(label = "浜ゆ槗鎬ч噾铻嶈礋鍊烘湡鏈綑棰�(鍏�)" )
+ @Column(name = "jyxjrfzqmye")
+ private Double jyxjrfzqmye;
+
+ @PropertyDef(label = "浜ゆ槗鎬ч噾铻嶈礋鍊哄勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "jyxjrfzncye")
+ private Double jyxjrfzncye;
+
+ @PropertyDef(label = "琛嶇敓閲戣瀺璐熷�烘湡鏈綑棰�(鍏�)" )
+ @Column(name = "ysjrfzqmye")
+ private Double ysjrfzqmye;
+
+ @PropertyDef(label = "琛嶇敓閲戣瀺璐熷�哄勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "ysjrfzncye")
+ private Double ysjrfzncye;
+
+ @PropertyDef(label = "搴斾粯绁ㄦ嵁鏈熸湯浣欓(鍏�)" )
+ @Column(name = "ldfzyspjqmye")
+ private Double ldfzyspjqmye;
+
+ @PropertyDef(label = "搴斾粯绁ㄦ嵁骞村垵浣欓(鍏�)" )
+ @Column(name = "ldfzyspjncye")
+ private Double ldfzyspjncye;
+
+ @PropertyDef(label = "搴斾粯璐︽鏈熸湯浣欓(鍏�)" )
+ @Column(name = "ldfzyszkqmye")
+ private Double ldfzyszkqmye;
+
+ @PropertyDef(label = "搴斾粯璐︽骞村垵浣欓(鍏�)" )
+ @Column(name = "ldfzyszkncye")
+ private Double ldfzyszkncye;
+
+ @PropertyDef(label = "棰勬敹娆鹃」鏈熸湯浣欓(鍏�)" )
+ @Column(name = "ldfzyuskxqmye")
+ private Double ldfzyuskxqmye;
+
+ @PropertyDef(label = "棰勬敹娆鹃」骞村垵浣欓(鍏�)" )
+ @Column(name = "ldfzyuskxncye")
+ private Double ldfzyuskxncye;
+
+ @PropertyDef(label = "鍚堝悓璐熷�烘湡鏈綑棰�(鍏�)" )
+ @Column(name = "htfzqmye")
+ private Double htfzqmye;
+
+ @PropertyDef(label = "鍚堝悓璐熷�哄勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "htfzncye")
+ private Double htfzncye;
+
+ @PropertyDef(label = "搴斾粯鑱屽伐钖叕鏈熸湯浣欓(鍏�)" )
+ @Column(name = "yfzgxcqmye")
+ private Double yfzgxcqmye;
+
+ @PropertyDef(label = "搴斾粯鑱屽伐钖叕骞村垵浣欓(鍏�)" )
+ @Column(name = "yfzgxcncye")
+ private Double yfzgxcncye;
+
+ @PropertyDef(label = "搴斾氦绋庤垂鏈熸湯浣欓(鍏�)" )
+ @Column(name = "yjsfqmye")
+ private Double yjsfqmye;
+
+ @PropertyDef(label = "搴斾氦绋庤垂骞村垵浣欓(鍏�)" )
+ @Column(name = "yjsfncye")
+ private Double yjsfncye;
+
+ @PropertyDef(label = "鍏朵粬搴斾粯娆炬湡鏈綑棰�(鍏�)" )
+ @Column(name = "qtyfkqmye")
+ private Double qtyfkqmye;
+
+ @PropertyDef(label = "鍏朵粬搴斾粯娆惧勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "qtyfkncye")
+ private Double qtyfkncye;
+
+ @PropertyDef(label = "鎸佹湁寰呭敭璐熷�烘湡鏈綑棰�(鍏�)" )
+ @Column(name = "cydsfzqmye")
+ private Double cydsfzqmye;
+
+ @PropertyDef(label = "鎸佹湁寰呭敭璐熷�哄勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "cydsfzncye")
+ private Double cydsfzncye;
+
+ @PropertyDef(label = "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷�烘湡鏈綑棰�(鍏�)" )
+ @Column(name = "ynddqfldfzqmye")
+ private Double ynddqfldfzqmye;
+
+ @PropertyDef(label = "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷�哄勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "ynddqfldfzncye")
+ private Double ynddqfldfzncye;
+
+ @PropertyDef(label = "鍏朵粬娴佸姩璐熷�烘湡鏈綑棰�(鍏�)" )
+ @Column(name = "qtldfzqmye")
+ private Double qtldfzqmye;
+
+ @PropertyDef(label = "鍏朵粬娴佸姩璐熷�哄勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "qtldfzncye")
+ private Double qtldfzncye;
+
+ @PropertyDef(label = "娴佸姩璐熷�哄悎璁℃湡鏈綑棰�(鍏�)" )
+ @Column(name = "ldfzhjqmye")
+ private Double ldfzhjqmye;
+
+ @PropertyDef(label = "娴佸姩璐熷�哄悎璁″勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "ldfzhjncye")
+ private Double ldfzhjncye;
+
+ @PropertyDef(label = "闀挎湡鍊熸鏈熸湯浣欓(鍏�)" )
+ @Column(name = "cqjkqmye")
+ private Double cqjkqmye;
+
+ @PropertyDef(label = "闀挎湡鍊熸骞村垵浣欓(鍏�)" )
+ @Column(name = "cqjkncye")
+ private Double cqjkncye;
+
+ @PropertyDef(label = "搴斾粯鍊哄埜鏈熸湯浣欓(鍏�)" )
+ @Column(name = "yfzqqmye")
+ private Double yfzqqmye;
+
+ @PropertyDef(label = "搴斾粯鍊哄埜骞村垵浣欓(鍏�)" )
+ @Column(name = "yfzqncye")
+ private Double yfzqncye;
+
+ @PropertyDef(label = "鍏朵腑锛氫紭鍏堣偂鏈熸湯浣欓(鍏�)" )
+ @Column(name = "yfzqyxgqmye")
+ private Double yfzqyxgqmye;
+
+ @PropertyDef(label = "鍏朵腑锛氫紭鍏堣偂骞村垵浣欓(鍏�)" )
+ @Column(name = "yfzqyxgncye")
+ private Double yfzqyxgncye;
+
+ @PropertyDef(label = "姘哥画鍊烘湡鏈綑棰�(鍏�)" )
+ @Column(name = "yfzqyxzqmye")
+ private Double yfzqyxzqmye;
+
+ @PropertyDef(label = "姘哥画鍊哄勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "yfzqyxzncye")
+ private Double yfzqyxzncye;
+
+ @PropertyDef(label = "闀挎湡搴斾粯娆炬湡鏈綑棰�(鍏�)" )
+ @Column(name = "cqyfkqmye")
+ private Double cqyfkqmye;
+
+ @PropertyDef(label = "闀挎湡搴斾粯娆惧勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "cqyfkncye")
+ private Double cqyfkncye;
+
+ @PropertyDef(label = "棰勮璐熷�烘湡鏈綑棰�(鍏�)" )
+ @Column(name = "ysfzqmye")
+ private Double ysfzqmye;
+
+ @PropertyDef(label = "棰勮璐熷�哄勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "ysfzncye")
+ private Double ysfzncye;
+
+ @PropertyDef(label = "閫掑欢鏀剁泭鏈熸湯浣欓(鍏�)" )
+ @Column(name = "dysyqmye")
+ private Double dysyqmye;
+
+ @PropertyDef(label = "閫掑欢鏀剁泭骞村垵浣欓(鍏�)" )
+ @Column(name = "dysyncye")
+ private Double dysyncye;
+
+ @PropertyDef(label = "閫掑欢鎵�寰楃◣璐熷�烘湡鏈綑棰�(鍏�)" )
+ @Column(name = "dysdsfzqmye")
+ private Double dysdsfzqmye;
+
+ @PropertyDef(label = "閫掑欢鎵�寰楃◣璐熷�哄勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "dysdsfzncye")
+ private Double dysdsfzncye;
+
+ @PropertyDef(label = "鍏朵粬闈炴祦鍔ㄨ礋鍊烘湡鏈綑棰�(鍏�)" )
+ @Column(name = "qtfldfzqmye")
+ private Double qtfldfzqmye;
+
+ @PropertyDef(label = "鍏朵粬闈炴祦鍔ㄨ礋鍊哄勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "qtfldfzncye")
+ private Double qtfldfzncye;
+
+ @PropertyDef(label = "闈炴祦鍔ㄨ礋鍊哄悎璁℃湡鏈綑棰�(鍏�)" )
+ @Column(name = "fldfzhjqmye")
+ private Double fldfzhjqmye;
+
+ @PropertyDef(label = "闈炴祦鍔ㄨ礋鍊哄悎璁″勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "fldfzhjncye")
+ private Double fldfzhjncye;
+
+ @PropertyDef(label = "璐熷�哄悎璁℃湡鏈綑棰�(鍏�)" )
+ @Column(name = "fzhjqmye")
+ private Double fzhjqmye;
+
+ @PropertyDef(label = "璐熷�哄悎璁″勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "fzhjncye")
+ private Double fzhjncye;
+
+ @PropertyDef(label = "瀹炴敹璧勬湰(鎴栬偂鏈�)鏈熸湯浣欓(鍏�)" )
+ @Column(name = "sszbqmye")
+ private Double sszbqmye;
+
+ @PropertyDef(label = "瀹炴敹璧勬湰(鎴栬偂鏈�)骞村垵浣欓(鍏�)" )
+ @Column(name = "sszbncye")
+ private Double sszbncye;
+
+ @PropertyDef(label = "鍏朵粬鏉冪泭宸ュ叿鏈熸湯浣欓(鍏�)" )
+ @Column(name = "qtqygjqmye")
+ private Double qtqygjqmye;
+
+ @PropertyDef(label = "鍏朵粬鏉冪泭宸ュ叿骞村垵浣欓(鍏�)" )
+ @Column(name = "qtqygjncye")
+ private Double qtqygjncye;
+
+ @PropertyDef(label = "鍏朵腑锛氫紭鍏堣偂鏈熸湯浣欓(鍏�)" )
+ @Column(name = "qtqygjyxgqmye")
+ private Double qtqygjyxgqmye;
+
+ @PropertyDef(label = "鍏朵腑锛氫紭鍏堣偂骞村垵浣欓(鍏�)" )
+ @Column(name = "qtqygjyxgncye")
+ private Double qtqygjyxgncye;
+
+ @PropertyDef(label = "姘哥画鍊烘湡鏈綑棰�(鍏�)" )
+ @Column(name = "qtqygjyxzqmye")
+ private Double qtqygjyxzqmye;
+
+ @PropertyDef(label = "姘哥画鍊哄勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "qtqygjyxzncye")
+ private Double qtqygjyxzncye;
+
+ @PropertyDef(label = "璧勬湰鍏Н鏈熸湯浣欓(鍏�)" )
+ @Column(name = "zbgjqmye")
+ private Double zbgjqmye;
+
+ @PropertyDef(label = "璧勬湰鍏Н骞村垵浣欓(鍏�)" )
+ @Column(name = "zbgjncye")
+ private Double zbgjncye;
+
+ @PropertyDef(label = "鍑忥細搴撳瓨鑲℃湡鏈綑棰�(鍏�)" )
+ @Column(name = "jkcgqmye")
+ private Double jkcgqmye;
+
+ @PropertyDef(label = "鍑忥細搴撳瓨鑲″勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "jkcgncye")
+ private Double jkcgncye;
+
+ @PropertyDef(label = "鍏朵粬缁煎悎鏀剁泭鏈熸湯浣欓(鍏�)" )
+ @Column(name = "qtzhsyqmye")
+ private Double qtzhsyqmye;
+
+ @PropertyDef(label = "鍏朵粬缁煎悎鏀剁泭骞村垵浣欓(鍏�)" )
+ @Column(name = "qtzhsyncye")
+ private Double qtzhsyncye;
+
+ @PropertyDef(label = "涓撻」鍌ㄥ鏈熸湯浣欓(鍏�)" )
+ @Column(name = "zxcbqmye")
+ private Double zxcbqmye;
+
+ @PropertyDef(label = "涓撻」鍌ㄥ骞村垵浣欓(鍏�)" )
+ @Column(name = "zxcbncye")
+ private Double zxcbncye;
+
+ @PropertyDef(label = "鐩堜綑鍏Н鏈熸湯浣欓(鍏�)" )
+ @Column(name = "yygjqmye")
+ private Double yygjqmye;
+
+ @PropertyDef(label = "鐩堜綑鍏Н骞村垵浣欓(鍏�)" )
+ @Column(name = "yygjncye")
+ private Double yygjncye;
+
+ @PropertyDef(label = "鏈垎閰嶅埄娑︽湡鏈綑棰�(鍏�)" )
+ @Column(name = "wfplrqmye")
+ private Double wfplrqmye;
+
+ @PropertyDef(label = "鏈垎閰嶅埄娑﹀勾鍒濅綑棰�(鍏�)" )
+ @Column(name = "wfplrncye")
+ private Double wfplrncye;
+
+ @PropertyDef(label = "鎵�鏈夎�呮潈鐩�(鎴栬偂涓滄潈鐩�)鍚堣鏈熸湯浣欓(鍏�)" )
+ @Column(name = "syzqyqmye")
+ private Double syzqyqmye;
+
+ @PropertyDef(label = "鎵�鏈夎�呮潈鐩�(鎴栬偂涓滄潈鐩�)鍚堣骞村垵浣欓(鍏�)" )
+ @Column(name = "syzqyncye")
+ private Double syzqyncye;
+
+ @PropertyDef(label = "璐熷�哄拰鎵�鏈夎�呮潈鐩�(鎴栬偂涓滅泭)鎬昏鏈熸湯浣欓(鍏�)" )
+ @Column(name = "fzhsyzqyqmye")
+ private Double fzhsyzqyqmye;
+
+ @PropertyDef(label = "璐熷�哄拰鎵�鏈夎�呮潈鐩�(鎴栬偂涓滅泭)鎬昏骞村垵浣欓(鍏�)" )
+ @Column(name = "fzhsyzqyncye")
+ private Double fzhsyzqyncye;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Depot.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Depot.java
new file mode 100644
index 0000000..fe47a92
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Depot.java
@@ -0,0 +1,174 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Desc: 鍩虹淇℃伅-璐т綅淇℃伅
+ * @author: Andy
+ * @update-time: 2023/5/26
+ */
+@Data
+@Entity
+@Table(name = "D_DEPOT")
+public class Fz61Depot implements Serializable {
+
+ @Id
+ @Column(name = "ID_", length = 50)
+ @PropertyDef(label = "璐т綅缂栧彿")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @Column(name = "NAME_", length = 50)
+ @PropertyDef(label = "璐т綅鍚嶇О")
+ private String name;
+
+ @Column(name = "BUILDING_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炰粨鎴�")
+ private String buildingId;
+
+ @Column(name = "GRANARY_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲粧闂�")
+ private String granaryId;
+
+ @Column(name = "DEPOT_TYPE_", length = 10)
+ @PropertyDef(label = "浠撳簱绫诲瀷", description = "鏍规嵁鍥芥爣閰嶇疆绫诲瀷锛屽钩鎴夸粨銆佺珛绛掍粨銆佹祬鍦嗕粨銆佸偍娌圭綈")
+ private String depotType;
+
+ @Column(name = "DEPOT_STATUS_", length = 10)
+ @PropertyDef(label = "浠撳簱鐘舵��", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String depotStatus;
+
+ @Column(name = "STORE_TYPE_", length = 6)
+ @PropertyDef(label = "鍌ㄧ伯鏂瑰紡", description = "涓庡簱瀛樿〃鍏宠仈")
+ private String storeType;
+
+ @Column(name = "STORAGE_MAX_")
+ @PropertyDef(label = "璁捐鍌ㄩ噺", description = "鍗曚綅锛欿G")
+ private Double storageMax;
+
+ @Column(name = "STORAGE_REAL_")
+ @PropertyDef(label = "瀹為檯鍌ㄩ噺", description = "鍗曚綅锛欿G锛岄�氳繃搴撳瓨鍙樻洿")
+ private Double storageReal;
+
+ @Column(name = "FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "绮鎬ц川", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodType;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodVariety;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodLevel;
+
+ @Column(name = "FOOD_LOCATION_ID_", length = 50)
+ @PropertyDef(label = "绮浜у湴")
+ private String foodLocationId;
+
+ @Column(name = "FOOD_LOCATION_", length = 50)
+ @PropertyDef(label = "绮浜у湴", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodLocation;
+
+ @Column(name = "FOOD_YEAR_", length = 10)
+ @PropertyDef(label = "绮骞翠唤", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodYear;
+
+ @Column(name = "PER_WET_")
+ @PropertyDef(label = "姘村垎", description = "鐧惧垎姣旓紝榛樿涓虹┖锛屾潵婧愯川妫�淇℃伅")
+ private Double perWet;
+
+ @Column(name = "PER_IMPURITY_")
+ @PropertyDef(label = "鏉傝川", description = "鐧惧垎姣旓紝榛樿涓虹┖锛屾潵婧愯川妫�淇℃伅")
+ private Double perImpurity;
+
+ @Column(name = "BULK_WEIGHT_")
+ @PropertyDef(label = "瀹归噸 g/L", description = "瀹归噸 g/L")
+ private Double bulkWeight;
+
+ @Column(name = "STORE_KEEPER_", length = 30)
+ @PropertyDef(label = "淇濈鍛樿处鍙�")
+ private String storeKeeper;
+
+ @Column(name = "STORE_KEEPER_NAME_", length = 50)
+ @PropertyDef(label = "淇濈鍛�", description = "涓枃鍚嶇О")
+ private String storeKeeperName;
+
+ @Column(name = "STORE_DATE_")
+ @PropertyDef(label = "鍏ュ簱鏃堕棿", description = "榛樿绌猴紝閫氳繃搴撳瓨鍙樻洿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date storeDate;
+
+ @Column(name = "CHECK_DATE_")
+ @PropertyDef(label = "鏈�鍚庤川妫�鏃堕棿", description = "榛樿绌猴紝鏉ユ簮璐ㄦ淇℃伅")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date checkDate;
+
+ @Column(name = "REMARK_", length = 200)
+ @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
+ private String remark;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+ @Column(name = "BH_ID_", length = 50)
+ @PropertyDef(label = "閭︽捣绮儏鍒嗘満浠撳簱缂栫爜")
+ private String bhId;
+
+ @Column(name = "ORDER_NUM_")
+ @PropertyDef(label = "鏄剧ず椤哄簭")
+ private Integer orderNum = 1;
+
+ // ------------鍏朵粬灞炴�т俊鎭�------------//
+ @Transient
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVarietyName;
+
+ @Transient
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodTypeName;
+
+ @Transient
+ @PropertyDef(label = "浠撳簱绫诲瀷")
+ private String depotTypeName;
+
+ @Transient
+ @PropertyDef(label = "浠撳簱绫诲瀷")
+ private String depotStatusName;
+
+ @Transient
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevelName;
+
+ @Transient
+ @PropertyDef(label = "X鍧愭爣", description = "涓夌淮妯″瀷涓潗鏍囷紝椤甸潰鏃犻渶缁存姢")
+ private Double posX;
+
+ @Transient
+ @PropertyDef(label = "Y鍧愭爣", description = "涓夌淮妯″瀷涓潗鏍囷紝椤甸潰鏃犻渶缁存姢")
+ private Double posY;
+
+ @Transient
+ @PropertyDef(label = "淇濈鍛樼瓑绾�")
+ private String storeKeeperLevel = "楂樼骇淇濈鍛�";
+
+ @Transient
+ @PropertyDef(label = "淇濈鍛樼瓑绾�")
+ private String storeKeeperPhone = "####";
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotConf.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotConf.java
new file mode 100644
index 0000000..7bda132
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotConf.java
@@ -0,0 +1,168 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 浠撳簱閰嶇疆 鐢ㄤ簬閰嶇疆绮儏鍒嗘満绛夐厤缃紝姘斾綋閲囬泦閰嶇疆绛�
+ */
+@Data
+@Entity
+@Table(name = "D_DEPOT_CONF")
+@IdClass(Fz61DepotConfKey.class)
+public class Fz61DepotConf implements Serializable {
+
+
+ @Id
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "鎵�灞炰粨搴�")
+ private String depotId;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @Column(name = "GRAIN_SER_", length = 40)
+ @PropertyDef(label = "绮儏鍒嗘満", description = "浠呬粎绮儏閲囬泦鍒嗘満")
+ private String grainSer;
+
+ @Column(name = "TH_SER_", length = 40)
+ @PropertyDef(label = "娓╂箍搴﹀垎鏈�", description = "浠撴俯浠撴箍鐨勫垎鏈�")
+ private String thSer;
+
+ @Column(name = "ES_SER_", length = 40)
+ @PropertyDef(label = "鑳借�楀垎鏈�")
+ private String esSer;
+
+ @Column(name = "ES_SER_TAG_", length = 40)
+ @PropertyDef(label = "澶氳兘鑰楀垎鏈�")
+ private String esSerTag;
+
+ @Column(name = "GAS_SER_", length = 40)
+ @PropertyDef(label = "姘斾綋鍒嗘満")
+ private String gasSer;
+
+ @Column(name = "GAS_SER_TAG_", length = 40)
+ @PropertyDef(label = "澶氭皵浣撳垎鏈�")
+ private String gasSerTag;
+
+ @Column(name = "PEST_SER_", length = 40)
+ @PropertyDef(label = "铏鍒嗘満")
+ private String pestSer;
+
+ @Column(name = "PEST_SER_TAG_", length = 40)
+ @PropertyDef(label = "澶氳櫕瀹冲垎鏈�")
+ private String pestSerTag;
+
+ @Column(name = "VERB_SER_", length = 40)
+ @PropertyDef(label = "閫氶鍒嗘満")
+ private String verbSer;
+
+ @Column(name = "GRAIN_FREQ_", length = 4)
+ @PropertyDef(label = "绮儏淇濆瓨棰戠巼", description = "榛樿涓�澶╁娆�")
+ private String grainFreq;
+
+ @Column(name = "TH_CONF_", length = 5)
+ @PropertyDef(label = "浠撴俯浠撴箍閫氶亾")
+ private String thConf = "1";
+
+ @Column(name = "CABLE_RULE_", length = 20)
+ @PropertyDef(label = "甯冪嚎瑙勫垯", description = "骞虫柟浠撹〃绀哄眰琛屽垪锛岀瓛浠撹〃绀烘瘡鍦堢殑鍒楁暟")
+ private String cableRule;
+
+ @Column(name = "CABLE_CIR_", length = 20)
+ @PropertyDef(label = "绛掍粨灞傝鍒�", description = "閽堝绛掍粨")
+ private String cableCir;
+
+ @Column(name = "CABLE_CONE_", length = 2)
+ @PropertyDef(label = "绛掍粨閿ュ舰", description = "閽堝绛掍粨閿ュ舰锛�0=鏃犲垽鏂紝1=涓婇敟褰紝2=涓嬮敟褰�")
+ private String cableCone;
+
+ @Column(name = "CABLE_START_")
+ @PropertyDef(label = "鐢电紗寮�濮嬪垪")
+ private int cableStart;
+
+ @Column(name = "CABLE_END_")
+ @PropertyDef(label = "鐢电紗鎴嚦鍒�")
+ private int cableEnd;
+
+ @Column(name = "START_ORIENTATION_", length = 20)
+ @PropertyDef(label = "鐢电紗璧峰鏂逛綅", description = "榛樿鍙宠竟(鍙宠竟銆佸彸涓娿�佸乏杈广�佸乏涓�)")
+ private String startOrientation;
+
+ @Column(name = "START_DIRECTION_", length = 20)
+ @PropertyDef(label = "鐢电紗璧峰鏂瑰悜", description = "榛樿绾靛悜(绾靛悜銆佹í鍚�)")
+ private String startDirection;
+
+ @Column(name = "START_POINT_", length = 20)
+ @PropertyDef(label = "鐢电紗璧峰鐐逛綅", description = "榛樿椤堕儴(椤堕儴銆佸簳閮�)")
+ private String startPoint;
+
+ @Column(name = "START_CONVERT_", length = 20)
+ @PropertyDef(label = "灞傝杞崲", description = "榛樿涓嶈浆鎹�(榛樿銆侀『鏃堕拡銆侀�嗘椂閽�)")
+ private String startConvert;
+
+ @Column(name = "TEMP_MAX_")
+ @PropertyDef(label = "娓╁害涓婇檺")
+ private Double tempMax;
+
+ @Column(name = "ONLY_CUR_DEPOT_", length = 1)
+ @PropertyDef(label = "鏄剧ず褰撳墠", description = "榛樿涓嶈浆鎹�(榛樿銆侀『鏃堕拡銆侀�嗘椂閽�)")
+ private String onlyCurDepot = "Y";
+
+ @Column(name = "GAS_START_")
+ @PropertyDef(label = "姘斾綋閲囬泦鐐瑰紑濮�")
+ private int gasStart;
+
+ @Column(name = "GAS_END_")
+ @PropertyDef(label = "姘斾綋閲囬泦鐐规埅鑷�")
+ private int gasEnd;
+
+ @Column(name = "N2_MAX_")
+ @PropertyDef(label = "姘皵涓婇檺")
+ private Double n2Max;
+
+ @Column(name = "CO2_MAX_")
+ @PropertyDef(label = "浜屾哀鍖栫⒊涓婇檺")
+ private Double co2Max;
+
+ @Column(name = "O2_MAX_")
+ @PropertyDef(label = "姘ф皵涓婇檺")
+ private Double o2Max;
+
+ @Column(name = "PH3_MAX_")
+ @PropertyDef(label = "纾峰寲姘笂闄�")
+ private Double ph3Max;
+
+ @Column(name = "PEST_START_")
+ @PropertyDef(label = "铏閲囬泦鐐瑰紑濮�")
+ private int pestStart;
+
+ @Column(name = "PEST_END_")
+ @PropertyDef(label = "铏閲囬泦鐐规埅鑷�")
+ private int pestEnd;
+
+ @Column(name = "PEST_MAX_")
+ @PropertyDef(label = "铏涓婇檺")
+ private Double pestMax;
+
+ @Column(name = "IS_ONLY_TH_", length = 2)
+ @PropertyDef(label = "绮儏鏄惁娓╂箍搴�", description = "榛樿鍚︺��")
+ private String isOnlyTH ;
+
+ // 浠撳簱鍚嶇О
+ @Transient
+ private String depotName;
+
+ //浠撳簱绫诲瀷
+ @Transient
+ private String depotType;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotConfKey.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotConfKey.java
new file mode 100644
index 0000000..e56be12
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotConfKey.java
@@ -0,0 +1,16 @@
+package com.fzzy.async.fzzy61.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+public class Fz61DepotConfKey implements Serializable {
+ private String depotId;
+ private String companyId;
+ public Fz61DepotConfKey(){
+ super();
+ }
+ }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLog.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLog.java
new file mode 100644
index 0000000..1898078
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLog.java
@@ -0,0 +1,314 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鐜祦鐔忚捀-鐔忚捀浣滀笟璁板綍
+ *
+ * @date 2023骞�7鏈�26鏃�
+ */
+@Data
+@Entity
+@Table(name = "D_DRUG_LOG")
+public class Fz61DrugLog implements Serializable {
+
+ public static String SORT_PROP = "id";
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "鐔忚捀浣滀笟鍗曞彿", description = "浣滀笟鏃ユ湡 (yyyyMMdd) +3 浣嶉『搴忓彿")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撳簱")
+ private String depotId;
+
+ @Column(name = "START_")
+ @PropertyDef(label = "寮�濮嬫椂闂�")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date start;
+
+ @Column(name = "END_")
+ @PropertyDef(label = "鎴嚦鏃堕棿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date end;
+
+ @Column(name = "PEST_BATCH_ID_", length = 50)
+ @PropertyDef(label = "铏妫�娴嬪崟鍙�")
+ private String pestBatchId;
+
+ @Column(name = "NUM_")
+ @PropertyDef(label = "绗嚑娆＄啅钂�")
+ private Integer num = 0;
+
+
+ @Column(name = "MODE_", length = 1)
+ @PropertyDef(label = "鐔忚捀鏂瑰紡", description = "0:绮潰娼В1:甯冭鍩嬭棌2:鎺㈢3:缁煎悎鏂借嵂")
+ private String mode;
+
+ @Column(name = "RECIR_MODE_", length = 1)
+ @PropertyDef(label = "鐜祦鐔忚捀鏂瑰紡", description = "0:鍥哄畾寮忓竷缃舰寮�1:绉诲姩寮忓竷缃舰寮�")
+ private String recirMode;
+
+ @Column(name = "hlxzynhljsjh", length = 1)
+ @PropertyDef(label = "鐜祦鐔忚捀涓庡唴鐜祦鎶�鏈粨鍚�", description = "0:鍒嗗埆浣跨敤_鍥哄畾寮�1:鍒嗗埆浣跨敤_绉诲姩寮�2:浜屽悎涓�搴旂敤_鍗曞悜鎺у埗3:浜屽悎涓�搴旂敤_鍙屽悜鎺у埗")
+ private String hlxzynhljsjh;
+
+ @PropertyDef(label = "鐔忚捀鏂规鍒跺畾")
+ @Column(name = "xzfazd", length = 128)
+ private String xzfazd;
+
+ @PropertyDef(label = "鐔忚捀鏂规璧疯崏浜�")
+ @Column(name = "xzfaqcr", length = 64)
+ private String xzfaqcr;
+
+ @PropertyDef(label = "鐔忚捀鏂规鎵瑰噯浜�")
+ @Column(name = "xzfapzr", length = 64)
+ private String xzfapzr;
+
+ @PropertyDef(label = "鐔忚捀鏂规鎶ュ鎯呭喌")
+ @Column(name = "xzfabbqk", length = 64)
+ private String xzfabbqk;
+
+ @PropertyDef(label = "鏂借嵂浜哄憳璧勮川鎯呭喌")
+ @Column(name = "syryzzqk", length = 64)
+ private String syryzzqk;
+
+ @PropertyDef(label = "鏂借嵂璧勮川瀹℃牳")
+ @Column(name = "syzzsh", length = 64)
+ private String syzzsh;
+
+ @Column(name = "DRUG_NAME_", length = 64)
+ @PropertyDef(label = "鑽墏鍚嶇О")
+ private String drugName;
+
+ @PropertyDef(label = "鍓傚瀷")
+ @Column(name = "jx", length = 64)
+ private String jx;
+
+ @Column(name = "CONCENTRATION_", length = 50)
+ @PropertyDef(label = "鑽墏娴撳害", description = "%")
+ private Double concentration = 0.0;
+
+ @Column(name = "GRAIN_DOSE_")
+ @PropertyDef(label = "绮爢鍗曚綅鐢ㄨ嵂閲�", description = "g/m鲁")
+ private Double grainDose = 0.0;
+
+ @Column(name = "SPACE_DOSE_")
+ @PropertyDef(label = "绌洪棿鍗曚綅鐢ㄨ嵂閲�", description = "g/m鲁")
+ private Double spaceDose = 0.0;
+
+ @Column(name = "DOSE_")
+ @PropertyDef(label = "鎬荤敤鑽噺", description = "kg")
+ private Double dose = 0.0;
+
+ @PropertyDef(label = "鏂借嵂鏂规硶", description = "0:娼В娉�1:浠撳鍙戠敓鍣�2:閽㈢摱姘�")
+ @Column(name = "syff", length = 1)
+ private String syff;
+
+ @PropertyDef(label = "杈呭姪鏂借嵂鎺柦")
+ @Column(name = "fzsycs", length = 128)
+ private String fzsycs;
+
+ @PropertyDef(label = "绌烘皵鍛煎惛鍣ㄥ強瀹夊叏妫�鏌ユ儏鍐�")
+ @Column(name = "kqhqjaqjcqk", length = 128)
+ private String kqhqjaqjcqk;
+
+ @PropertyDef(label = "纾峰寲姘㈡娴嬭缃皟璇曟儏鍐�")
+ @Column(name = "lhqjczztsqk", length = 128)
+ private String lhqjczztsqk;
+
+ @PropertyDef(label = "姘ф皵娣卞害妫�娴嬭缃皟璇曟儏鍐�")
+ @Column(name = "yqsdjczztsqk", length = 128)
+ private String yqsdjczztsqk;
+
+ @PropertyDef(label = "纾峰寲姘㈡姤璀︿华瀹夊叏妫�鏌�")
+ @Column(name = "lhqbjyaqjc", length = 128)
+ private String lhqbjyaqjc;
+
+ @PropertyDef(label = "姘ф皵鎶ヨ浠畨鍏ㄦ鏌�")
+ @Column(name = "yqbjyaqjc", length = 128)
+ private String yqbjyaqjc;
+
+ @PropertyDef(label = "琛ヨ嵂鍓嶄粨鍐呯７鍖栨阿娴撳害")
+ @Column(name = "byqcnlhqnd", precision = 20, scale = 3)
+ private double byqcnlhqnd;
+
+ @PropertyDef(label = "纾峰寲姘㈡祿搴﹀崟浣�", description = "1锛歡/m鲁(榛樿);2锛歱pm;3:ml/m鲁;4锛�%VOL")
+ @Column(name = "nlhqnddw", length = 1)
+ private String nlhqnddw = "1";
+
+ @PropertyDef(label = "鐩爣娴撳害", description = "鍗曚綅锛歡/m鲁")
+ @Column(name = "mbnd", precision = 20, scale = 3)
+ private double mbnd;
+
+ @PropertyDef(label = "璁＄畻琛ヨ嵂閲�", description = "鍗曚綅锛歡")
+ @Column(name = "jsbyl", precision = 20, scale = 3)
+ private double jsbyl;
+
+ @PropertyDef(label = "瀹為檯琛ヨ嵂閲�", description = "鍗曚綅锛歡")
+ @Column(name = "sjbyl", precision = 20, scale = 3)
+ private double sjbyl;
+
+ @PropertyDef(label = "琛ヨ嵂鏂规硶")
+ @Column(name = "byff", length = 128)
+ private String byff;
+
+ @PropertyDef(label = "浣滀笟浜烘暟")
+ @Column(name = "zyrs")
+ private Integer zyrs;
+
+ @PropertyDef(label = "琛ヨ嵂浣滀笟鎵瑰噯浜�")
+ @Column(name = "byzypzr", length = 64)
+ private String byzypzr;
+
+ @PropertyDef(label = "鐜板満鎸囨尌浜�")
+ @Column(name = "xczhr", length = 64)
+ private String xczhr;
+
+ @PropertyDef(label = "宄板�兼祿搴�", description = "鍗曚綅锛歡/m鲁")
+ @Column(name = "fznd", precision = 20, scale = 3)
+ private double fznd;
+
+ @PropertyDef(label = "鐩爣娴撳害缁存寔澶╂暟", description = "鍗曚綅锛氬ぉ")
+ @Column(name = "mbndwcts")
+ private Integer mbndwcts;
+
+ @PropertyDef(label = "婕忔皵浣嶇疆鐩戞祴")
+ @Column(name = "lswzjc", length = 128)
+ private String lswzjc;
+
+ @PropertyDef(label = "婕忔皵閮ㄤ綅閲囧彇鐨勮ˉ鏁戞帾鏂�")
+ @Column(name = "lqbwcqdbjcs", length = 128)
+ private String lqbwcqdbjcs;
+
+ @PropertyDef(label = "瀵嗛棴鏃堕棿", description = "鍗曚綅锛氬ぉ")
+ @Column(name = "mbsj")
+ private Integer mbsj;
+
+ @PropertyDef(label = "CT鍊�")
+ @Column(name = "ctz", precision = 20, scale = 3)
+ private double ctz;
+
+ @PropertyDef(label = "鏁ｆ皵鍓嶇７鍖栨阿娴撳害", description = "鍗曚綅锛歡/m鲁")
+ @Column(name = "sqqlhqnd", precision = 20, scale = 3)
+ private double sqqlhqnd;
+
+ @Column(name = "VENTILATE_TIME_")
+ @PropertyDef(label = "鏁ｆ皵鏃堕棿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date ventilateTime;
+
+ @Column(name = "VENTILATE_METHOD_", length = 100)
+ @PropertyDef(label = "鏁ｆ皵鏂规硶")
+ private String ventilateMethod;
+
+ @PropertyDef(label = "鏁ｆ皵鎵瑰噯浜�")
+ @Column(name = "sqpzr", length = 64)
+ private String sqpzr;
+
+ @PropertyDef(label = "鏁ｆ皵鎸佺画澶╂暟", description = "鍗曚綅锛氬ぉ")
+ @Column(name = "sqcsts")
+ private Integer sqcsts;
+
+ @Column(name = "AFTER_PH3_")
+ @PropertyDef(label = "鏁ｆ皵鍚庣７鍖栨阿娴撳害", description = "鍗曚綅锛歡/m鲁")
+ private Double afterPh3;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @PropertyDef(label = "娈嬫福鏀堕泦浣滀笟鏃堕棿")
+ @Column(name = "czsjzysj")
+ private Date czsjzysj;
+
+ @PropertyDef(label = "娈嬫福鏀堕泦浣滀笟浜烘暟")
+ @Column(name = "czsjzyrs")
+ private Integer czsjzyrs;
+
+ @PropertyDef(label = "娈嬫福鏀堕泦鏂规硶")
+ @Column(name = "czsjff", length = 128)
+ private String czsjff;
+
+ @PropertyDef(label = "娈嬫福鏀堕泦浣滀笟鎵瑰噯浜�")
+ @Column(name = "czsjzypzr", length = 64)
+ private String czsjzypzr;
+
+ @PropertyDef(label = "娈嬫福澶勭悊鎺柦")
+ @Column(name = "czclcs", length = 128)
+ private String czclcs;
+
+ @PropertyDef(label = "娈嬫福澶勭悊浣滀笟浜烘暟")
+ @Column(name = "czclzyrs")
+ private Integer czclzyrs;
+
+ @PropertyDef(label = "娈嬫福澶勭悊鎵瑰噯浜�")
+ @Column(name = "czclpzr", length = 64)
+ private String czclpzr;
+
+ @PropertyDef(label = "鐔忚捀鍚庢椿铏鍑烘儏鍐�")
+ @Column(name = "xzhhcjcqk", length = 128)
+ private String xzhhcjcqk;
+
+ @PropertyDef(label = "鐔忚捀鍚庤櫕鍙ｅ瘑搴�", description = "鍗曚綅锛氬ご/kg")
+ @Column(name = "xzhckmd")
+ private Integer xzhckmd;
+
+ @PropertyDef(label = "鍩瑰吇15澶╁悗娲昏櫕鏁�", description = "鍗曚綅锛氬ご/kg")
+ @Column(name = "pyswthhcs")
+ private Integer pyswthhcs;
+
+ @PropertyDef(label = "鍩瑰吇45澶╁悗娲昏櫕鏁�", description = "鍗曚綅锛氬ご/kg")
+ @Column(name = "pysswthhcs")
+ private Integer pysswthhcs;
+
+
+ /**
+ * 0锛氳壇濂�
+ * 1锛氫竴鑸�
+ * 2锛氫笉濂�
+ */
+ @Column(name = "EVALUATE_", length = 1)
+ @PropertyDef(label = "鐔忚捀璇勪环", description = "0锛氳壇濂� 1锛氫竴鑸� 2锛氫笉濂�")
+ private String evaluate;
+
+ @PropertyDef(label = "鐔忚捀璐熻矗浜�")
+ @Column(name = "xzfzr", length = 64)
+ private String xzfzr;
+
+ @PropertyDef(label = "鐔忚捀浣滀笟浜哄憳")
+ @Column(name = "xzzyry", length = 128)
+ private String xzzyry;
+
+ @Column(name = "USER_", length = 30)
+ @PropertyDef(label = "鎿嶄綔浜�")
+ private String user;
+
+ @PropertyDef(label = "鏇存柊浜�")
+ @Column(name = "UPDATE_USER_", length = 30)
+ private String updateUser;
+
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ @Column(name = "UPDATE_TIME_")
+ private Date updateTime;
+
+ @Column(name = "REMARKS_", length = 500)
+ @PropertyDef(label = "澶囨敞璇存槑")
+ private String remarks;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogApply.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogApply.java
new file mode 100644
index 0000000..869de10
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogApply.java
@@ -0,0 +1,291 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fzzy.async.fzzy40.entity.Fz40DrugLogDtl;
+import com.fzzy.async.fzzy40.entity.Fz40DrugLogPeople;
+import com.fzzy.async.fzzy40.entity.Fz40DrugLogWay;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐔忚捀澶囨涓昏〃淇℃伅
+ *
+ * @Author:YAN
+ */
+@Entity
+@Data
+@Table(name = "D_DRUG_LOG_APPLY")
+public class Fz61DrugLogApply implements Serializable {
+
+ public static String SORT_PROP = "xzbm";
+
+ @Id
+ @Column(name = "xzbm", length = 12)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
+ private String xzbm;
+
+ @Column(name = "DEPT_ID_", length = 21)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String deptId;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
+
+ @Column(name = "sqxzrq")
+ @PropertyDef(label = "鐢宠鐔忚捀鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date sqxzrq;
+
+ @Column(name = "fzr", length = 20)
+ @PropertyDef(label = "璐熻矗浜�")
+ private String fzr;
+
+ @Column(name = "fzrdh", length = 11)
+ @PropertyDef(label = "璐熻矗浜虹數璇�")
+ private String fzrdh;
+
+ @Column(name = "xcfzr", length = 20)
+ @PropertyDef(label = "鐜板満璐熻矗浜�")
+ private String xcfzr;
+
+ @Column(name = "fzrzw", length = 10)
+ @PropertyDef(label = "鐜板満璐熻矗浜鸿亴鍔�")
+ private String xcfzrzw;
+
+ @Column(name = "xcfzrdh", length = 11)
+ @PropertyDef(label = "鐜板満璐熻矗浜虹數璇�")
+ private String xcfzrdh;
+
+ @Column(name = "tbr", length = 20)
+ @PropertyDef(label = "濉〃浜�")
+ private String tbr;
+
+ @Column(name = "tbrdh", length = 11)
+ @PropertyDef(label = "濉〃浜虹數璇�")
+ private String tbrdh;
+
+ @Column(name = "sfszjjxd", length = 2)
+ @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(涓�)", description = "鏄垨鍚�")
+ private String sfszjjxd;
+
+ @Column(name = "sfszjjxx", length = 2)
+ @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(瑗�)", description = "鏄垨鍚�")
+ private String sfszjjxx;
+
+ @Column(name = "sfszjjxn", length = 2)
+ @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(鍗�)", description = "鏄垨鍚�")
+ private String sfszjjxn;
+
+ @Column(name = "sfszjjxb", length = 2)
+ @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(鍖�)", description = "鏄垨鍚�")
+ private String sfszjjxb;
+
+ @Column(name = "ssxzzystqybqk", length = 1024)
+ @PropertyDef(label = "瀹炴柦鐔忚捀浣滀笟鏃跺ぉ姘旈鎶ユ儏鍐�")
+ private String ssxzzystqybqk;
+
+ @Column(name = "xzssgcap", length = 1024)
+ @PropertyDef(label = "鐔忚捀瀹夋帓鍙婂疄鏂借繃绋�")
+ private String xzssgcap;
+
+ @Column(name = "aqfhjyjcccs", length = 1024)
+ @PropertyDef(label = "瀹夊叏闃叉姢鍙婂簲鎬ュ缃帾鏂�")
+ private String aqfhjyjcccs;
+
+ @Column(name = "xzzysx", length = 1024)
+ @PropertyDef(label = "鐔忚捀娉ㄦ剰浜嬮」")
+ private String xzzysx;
+
+ @Column(name = "DRUG_NAME_", length = 64)
+ @PropertyDef(label = "鑽墏鍚嶇О")
+ private String drugName;
+
+ @Column(name = "DRUG_TYPE_", length = 10)
+ @PropertyDef(label = "鑽墏绫诲瀷/鍨嬪彿")
+ private String drugType;
+
+ @Column(name = "yjyxqz")
+ @PropertyDef(label = "鑽墏鏈夋晥鏈熻嚦")
+ private Date yjyxqz;
+
+ @Column(name = "lqsl", precision = 20, scale = 3)
+ @PropertyDef(label = "棰嗗彇鏁伴噺", description = "鍏枻")
+ private Double lqsl;
+
+ @Column(name = "sysbjfs", length = 20)
+ @PropertyDef(label = "鏂借嵂璁惧鍙婃柟寮�")
+ private String sysbjfs;
+
+ @Column(name = "zcdd", length = 30)
+ @PropertyDef(label = "鏆傚瓨鍦扮偣")
+ private String zcdd;
+
+ @Column(name = "lqr", length = 20)
+ @PropertyDef(label = "棰嗗彇浜�")
+ private String lqr;
+
+ @Column(name = "lqsj")
+ @PropertyDef(label = "棰嗗彇鏃堕棿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date lqsj;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date updateTime;
+
+
+ /**
+ * 鍌ㄧ伯绮儏鏄庣粏琛�
+ */
+ @Transient
+ private List<Fz61DrugLogDtl> drugLogDtls;
+
+ @Column(name = "DTL_ID_", length = 40)
+ @PropertyDef(label = "dtlId")
+ private String dtlId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撴埧/娌圭綈浠ｇ爜")
+ private String depotId;
+
+ @Column(name = "FOOD_VARIETY_", length = 20)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_TYPE_", length = 20)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "NUMBER_", precision = 20, scale = 3)
+ @PropertyDef(label = "绮鏁伴噺", description = "鍗曚綅锛氬惃")
+ private Double number = 0.0;
+
+ @Column(name = "PER_WET_", precision = 20, scale = 3)
+ @PropertyDef(label = "姘村垎", description = "鍗曚綅锛�%")
+ private Double perWet;
+
+ @Column(name = "PER_IMPURITY_", precision = 20, scale = 3)
+ @PropertyDef(label = "鏉傝川", description = "鍗曚綅锛�%")
+ private Double perImpurity;
+
+ @Column(name = "lw", precision = 20, scale = 3)
+ @PropertyDef(label = "绮俯")
+ private Double lw;
+
+ @Column(name = "cw", precision = 20, scale = 3)
+ @PropertyDef(label = "浠撴俯")
+ private Double cw;
+
+ @Column(name = "cnsd", precision = 20, scale = 3)
+ @PropertyDef(label = "浠撳唴婀垮害")
+ private Double cnsd;
+
+ @Column(name = "clfs", length = 1)
+ @PropertyDef(label = "瀛樼伯鏂瑰紡", description = "1锛氭暎瑁呭偍绮�;2锛氬寘瑁�;3锛氬洿鍖呮暎瀛�;9锛氬叾浠�")
+ private String clfs;
+
+ @Column(name = "rkrq")
+ @PropertyDef(label = "鍏ュ簱鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date rkrq;
+
+ @Column(name = "hc", length = 30)
+ @PropertyDef(label = "瀹宠櫕")
+ private String hc;
+
+ @Column(name = "cldjpd", length = 3)
+ @PropertyDef(label = "铏伯绛夌骇鍒ゅ畾")
+ private String cldjpd;
+
+ @Column(name = "ldtj", precision = 20, scale = 3)
+ @PropertyDef(label = "绮爢浣撶Н", description = "m鲁")
+ private Double ldtj;
+
+ @Column(name = "kjtj", precision = 20, scale = 3)
+ @PropertyDef(label = "绌洪棿浣撶Н", description = "m鲁")
+ private Double kjtj;
+
+ @Column(name = "lddwyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "绮爢鍗曚綅鐢ㄨ嵂閲�")
+ private Double lddwyyl;
+
+ @Column(name = "kjdwyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "绌洪棿鍗曚綅鐢ㄨ嵂閲�")
+ private Double kjdwyyl;
+
+ @Column(name = "zyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "鎬荤敤鑽噺")
+ private Double zyyl;
+ /**
+ * 浠撴埧姘斿瘑鎬т互 500 Pa 鐨勫帇鍔涘崐琛� 鏈� t 鍒嗕负鍥涗釜绛夌骇銆�
+ * 1锛� 鈪犵骇锛宼鈮�300s銆�
+ * 2锛� 鈪＄骇锛�120s鈮<300s銆�
+ * 3锛氣參绾э紝40s鈮<120s (骞虫埧浠�) 锛� 60s鈮� t<120s (绔嬬瓛浠撱�佹祬鍦嗕粨) 銆�
+ * 4锛氣叄绾э紝t<40s (骞虫埧浠�) 锛宼<60s (绔嬬瓛浠撱�佹祬鍦嗕粨) 銆�
+ */
+ @Column(name = "qmx", length = 1)
+ @PropertyDef(label = "姘斿瘑鎬�")
+ private String qmx;
+
+ @Column(name = "jhxzksrq")
+ @PropertyDef(label = "璁″垝鐔忚捀寮�濮嬫棩鏈�")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date jhxzksrq;
+
+ @Column(name = "jhxzjsrq")
+ @PropertyDef(label = "璁″垝鐔忚捀缁撴潫鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date jhxzjsrq;
+
+ /**
+ * 鐔忚捀澶囨鏂瑰紡
+ */
+ @Transient
+ private List<Fz61DrugLogWay> drugLogWays;
+
+ @Column(name = "Way_ID_", length = 40)
+ @PropertyDef(label = "wayId")
+ private String wayId;
+
+ @Column(name = "xznd", precision = 20, scale = 3)
+ @PropertyDef(label = "璁惧畾鐔忚捀娴撳害", description = "鍗曚綅锛歮l/m鲁")
+ private Double xznd;
+
+ @Column(name = "mbsj")
+ @PropertyDef(label = "瀵嗛棴鏃堕棿", description = "鍗曚綅锛氬ぉ")
+ private Integer mbsj;
+
+ @Column(name = "xzfs", length = 30)
+ @PropertyDef(label = "鐔忚捀鏂瑰紡")
+ private String xzfs;
+
+ @Column(name = "sqfs", length = 30)
+ @PropertyDef(label = "鏁ｆ皵鏂瑰紡")
+ private String sqfs;
+
+ /**
+ * 鐔忚捀浣滀笟浜哄憳
+ */
+ @Transient
+ private List<Fz61DrugLogPeople> drugLogPeople;
+
+ @Transient
+ @PropertyDef(label = "闄勪欢淇℃伅")
+ private List<Fz61FileInfo> files;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogApplyKey.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogApplyKey.java
new file mode 100644
index 0000000..5afe152
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogApplyKey.java
@@ -0,0 +1,18 @@
+package com.fzzy.async.fzzy61.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+public class Fz61DrugLogApplyKey implements Serializable {
+ private String id;
+ private String deptId;
+ private String standardId;
+
+ public Fz61DrugLogApplyKey(){
+ super();
+ }
+ }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogDtl.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogDtl.java
new file mode 100644
index 0000000..10043bd
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogDtl.java
@@ -0,0 +1,129 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 瀹炴柦鐔忚捀浣滀笟鐨勫偍绮伯鎯呮槑缁嗚〃
+ *
+ * @Author:YAN
+ */
+@Entity
+@Data
+@Table(name = "D_DRUG_LOG_DTL")
+public class Fz61DrugLogDtl implements Serializable {
+
+ @Id
+ @Column(name = "DTL_ID_", length = 40)
+ @PropertyDef(label = "dtlId")
+ private String dtlId;
+
+ @Column(name = "DRUG_LOG_ID_", length = 12)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
+ private String drugLogId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撴埧/娌圭綈浠ｇ爜")
+ private String depotId;
+
+ @Column(name = "FOOD_VARIETY_", length = 20)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_TYPE_", length = 20)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "NUMBER_", precision = 20, scale = 3)
+ @PropertyDef(label = "绮鏁伴噺", description = "鍗曚綅锛氬惃")
+ private Double number = 0.0;
+
+ @Column(name = "PER_WET_", precision = 20, scale = 3)
+ @PropertyDef(label = "姘村垎", description = "鍗曚綅锛�%")
+ private Double perWet;
+
+ @Column(name = "PER_IMPURITY_", precision = 20, scale = 3)
+ @PropertyDef(label = "鏉傝川", description = "鍗曚綅锛�%")
+ private Double perImpurity;
+
+ @Column(name = "lw", precision = 20, scale = 3)
+ @PropertyDef(label = "绮俯")
+ private Double lw;
+
+ @Column(name = "cw", precision = 20, scale = 3)
+ @PropertyDef(label = "浠撴俯")
+ private Double cw;
+
+ @Column(name = "cnsd", precision = 20, scale = 3)
+ @PropertyDef(label = "浠撳唴婀垮害")
+ private Double cnsd;
+
+ @Column(name = "clfs", length = 1)
+ @PropertyDef(label = "瀛樼伯鏂瑰紡", description = "1锛氭暎瑁呭偍绮�;2锛氬寘瑁�;3锛氬洿鍖呮暎瀛�;9锛氬叾浠�")
+ private String clfs;
+
+ @Column(name = "rkrq")
+ @PropertyDef(label = "鍏ュ簱鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date rkrq;
+
+ @Column(name = "hc", length = 30)
+ @PropertyDef(label = "瀹宠櫕")
+ private String hc;
+
+ @Column(name = "cldjpd", length = 3)
+ @PropertyDef(label = "铏伯绛夌骇鍒ゅ畾")
+ private String cldjpd;
+
+ @Column(name = "ldtj", precision = 20, scale = 3)
+ @PropertyDef(label = "绮爢浣撶Н", description = "m鲁")
+ private Double ldtj;
+
+ @Column(name = "kjtj", precision = 20, scale = 3)
+ @PropertyDef(label = "绌洪棿浣撶Н", description = "m鲁")
+ private Double kjtj;
+
+ @Column(name = "lddwyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "绮爢鍗曚綅鐢ㄨ嵂閲�")
+ private Double lddwyyl;
+
+ @Column(name = "kjdwyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "绌洪棿鍗曚綅鐢ㄨ嵂閲�")
+ private Double kjdwyyl;
+
+ @Column(name = "zyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "鎬荤敤鑽噺")
+ private Double zyyl;
+ /**
+ * 浠撴埧姘斿瘑鎬т互 500 Pa 鐨勫帇鍔涘崐琛� 鏈� t 鍒嗕负鍥涗釜绛夌骇銆�
+ * 1锛� 鈪犵骇锛宼鈮�300s銆�
+ * 2锛� 鈪＄骇锛�120s鈮<300s銆�
+ * 3锛氣參绾э紝40s鈮<120s (骞虫埧浠�) 锛� 60s鈮� t<120s (绔嬬瓛浠撱�佹祬鍦嗕粨) 銆� 4锛氣叄绾э紝t<40s (骞虫埧浠�) 锛宼<60s (绔嬬瓛浠撱�佹祬鍦嗕粨) 銆�
+ */
+ @Column(name = "qmx", length = 1)
+ @PropertyDef(label = "姘斿瘑鎬�")
+ private String qmx;
+
+ @Column(name = "jhxzksrq")
+ @PropertyDef(label = "璁″垝鐔忚捀寮�濮嬫棩鏈�")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date jhxzksrq;
+
+ @Column(name = "jhxzjsrq")
+ @PropertyDef(label = "璁″垝鐔忚捀缁撴潫鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date jhxzjsrq;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogPeople.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogPeople.java
new file mode 100644
index 0000000..2ba7b07
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogPeople.java
@@ -0,0 +1,56 @@
+package com.fzzy.async.fzzy61.entity;
+
+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 java.io.Serializable;
+
+/**
+ * 鐔忚捀浣滀笟浜哄憳淇℃伅琛�
+ *
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "D_DRUG_LOG_PEOPLE")
+public class Fz61DrugLogPeople implements Serializable {
+
+ @Id
+ @Column(name = "PEOPLE_ID_", length = 40)
+ @PropertyDef(label = "propleId")
+ private String propleId;
+
+
+ @Column(name = "DRUG_LOG_ID_", length = 12)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
+ private String drugLogId;
+
+ @Column(name = "mx", length = 20)
+ @PropertyDef(label = "濮撳悕")
+ private String mx;
+
+ @Column(name = "zw", length = 10)
+ @PropertyDef(label = "鑱屽姟")
+ private String zw;
+
+ @Column(name = "zyzg", length = 6)
+ @PropertyDef(label = "鑱屼笟璧勬牸", description = "鍒濈骇/涓骇/楂樼骇")
+ private String zyzg;
+
+ @Column(name = "stzk", length = 10)
+ @PropertyDef(label = "韬綋鐘跺喌")
+ private String stzk;
+
+ @Column(name = "xzrwfg", length = 30)
+ @PropertyDef(label = "鐔忚捀浠诲姟鍒嗗伐")
+ private String xzrwfg;
+
+ @Column(name = "sfwb", length = 2)
+ @PropertyDef(label = "鏄惁澶栧寘", description = "鏄�/鍚�")
+ private String sfwb;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogWay.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogWay.java
new file mode 100644
index 0000000..7e4181c
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogWay.java
@@ -0,0 +1,46 @@
+package com.fzzy.async.fzzy61.entity;
+
+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 java.io.Serializable;
+
+/**
+ * 鐔忚捀澶囨鏂瑰紡琛�
+ *
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "D_DRUG_LOG_WAY")
+public class Fz61DrugLogWay implements Serializable {
+
+ @Id
+ @Column(name = "WAY_ID_", length = 40)
+ @PropertyDef(label = "wayId")
+ private String wayId;
+
+ @Column(name = "DRUG_LOG_ID_", length = 12)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
+ private String drugLogId;
+
+ @Column(name = "xznd", precision = 20, scale = 3)
+ @PropertyDef(label = "璁惧畾鐔忚捀娴撳害", description = "鍗曚綅锛歮l/m鲁")
+ private Double xznd;
+
+ @Column(name = "mbsj")
+ @PropertyDef(label = "瀵嗛棴鏃堕棿", description = "鍗曚綅锛氬ぉ")
+ private Integer mbsj;
+
+ @Column(name = "xzfs", length = 30)
+ @PropertyDef(label = "鐔忚捀鏂瑰紡")
+ private String xzfs;
+
+ @Column(name = "sqfs", length = 30)
+ @PropertyDef(label = "鏁ｆ皵鏂瑰紡")
+ private String sqfs;
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Gas.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Gas.java
new file mode 100644
index 0000000..40ae7d0
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Gas.java
@@ -0,0 +1,124 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 姘斾綋涓氬姟鏁版嵁淇℃伅鍖呮嫭娴撳害锛屾爱姘旓紝鍘嬪姏淇℃伅 姘斾綋妯″潡锛氬寘鎷皵浣撴祿搴�
+ *
+ * @author Andy
+ *
+ */
+@Data
+@Entity
+@Table(name = "D_GAS")
+@IdClass(Fz61GasKey.class)
+public class Fz61Gas implements Serializable {
+
+ public static String SORT_PROP = "batchId";
+
+ @Id
+ @Column(name = "BATCH_ID_", length = 40)
+ @PropertyDef(label = "鎵规ID")
+ private String batchId;
+
+ @Id
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+ private String companyId;
+
+ @Id
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撳簱ID", description = "浠撳簱缂栧彿")
+ private String depotId;
+
+ @Column(name = "TYPE_", length = 1)
+ @PropertyDef(label = "绫诲瀷", description = "0-甯歌妫�娴嬶紝1-鐔忚捀妫�娴�")
+ private String type;
+
+ @Column(name = "PER_CO2_")
+ @PropertyDef(label = "浜屾哀鍖栫⒊娴撳害", description = "骞冲潎浜屾哀鍖栫⒊娴撳害(PPM)")
+ private Double perCo2 = 0.0;
+
+ @Column(name = "PER_O2_")
+ @PropertyDef(label = "姘ф皵娴撳害", description = "骞冲潎姘ф皵娴撳害(%)")
+ private Double perO2 = 0.0;
+
+ @Column(name = "PER_PH3_")
+ @PropertyDef(label = "纾峰寲姘㈡祿搴�", description = "骞冲潎纾峰寲姘㈡祿搴�(PPM)")
+ private Double perPh3 = 0.0;
+
+ @Column(name = "PER_N2_")
+ @PropertyDef(label = "姘皵娴撳害", description = "姘皵娴撳害(%)")
+ private Double perN2 = 0.0;
+
+ @Column(name = "PER_CO2_MAX_")
+ @PropertyDef(label = "浜屾哀鍖栫⒊娴撳害-鏈�澶�", description = "浜屾哀鍖栫⒊娴撳害(PPM)")
+ private Double perCo2Max = 0.0;
+
+ @Column(name = "PER_O2_MAX_")
+ @PropertyDef(label = "姘ф皵娴撳害-鏈�澶�", description = "姘ф皵娴撳害(%)")
+ private Double perO2Max = 0.0;
+
+ @Column(name = "PER_PH3_MAX_")
+ @PropertyDef(label = "纾峰寲姘㈡祿搴�-鏈�澶�", description = "纾峰寲姘㈡祿搴�(PPM)")
+ private Double perPh3Max = 0.0;
+
+ @Column(name = "PER_N2_MAX_")
+ @PropertyDef(label = "姘皵娴撳害-鏈�澶�")
+ private Double perN2Max = 0.0;
+
+ @Column(name = "PER_CO2_MIN_")
+ @PropertyDef(label = "浜屾哀鍖栫⒊娴撳害-鏈�灏�", description = "浜屾哀鍖栫⒊娴撳害(PPM)")
+ private Double perCo2Min = 0.0;
+
+ @Column(name = "PER_O2_MIN_")
+ @PropertyDef(label = "姘ф皵娴撳害-鏈�灏�", description = "姘ф皵娴撳害(%)")
+ private Double perO2Min = 0.0;
+
+ @Column(name = "PER_PH3_MIN_")
+ @PropertyDef(label = "纾峰寲姘㈡祿搴�-鏈�灏�", description = "纾峰寲姘㈡祿搴�(PPM)")
+ private Double perPh3Min = 0.0;
+
+ @Column(name = "PER_N2_MIN_")
+ @PropertyDef(label = "姘皵娴撳害-鏈�灏�")
+ private Double perN2Min = 0.0;
+
+ @Column(name = "RECEIVE_DATE_")
+ @PropertyDef(label = "妫�娴嬫椂闂�")
+ private Date receiveDate;
+
+ @Column(name = "GAS_START_")
+ @PropertyDef(label = "姘斾綋閲囬泦鐐瑰紑濮�", description = "姘斾綋閰嶇疆淇℃伅")
+ private int gasStart;
+
+ @Column(name = "GAS_END_")
+ @PropertyDef(label = "姘斾綋閲囬泦鐐规埅鑷�", description = "姘斾綋閰嶇疆淇℃伅")
+ private int gasEnd;
+
+ @Column(name = "CHECK_NUM_")
+ @PropertyDef(label = "閲囬泦閫氶亾涓暟")
+ private int checkNum = 0;
+
+ @Column(name = "POINTS_", length = 2000)
+ @PropertyDef(label = "閲囬泦鐐逛俊鎭�", description = "鍥哄畾涓猴細passCode,co2,o2,ph3,n2;passCode,co2,o2,ph3,n2;")
+ private String points;
+
+ @Column(name = "CHECK_USER_", length = 30)
+ @PropertyDef(label = "妫�娴嬩汉")
+ private String checkUser;
+
+ @Column(name = "BATCH_TAG_", length = 2)
+ @PropertyDef(label = "鐢熸垚鏂瑰紡", description = "01-璁惧閲囬泦锛�02-鎵嬪姩琛ュ綍")
+ private String batchTag = "01";
+
+ @Column(name = "REMARK_", length = 200)
+ @PropertyDef(label = "澶囨敞淇℃伅")
+ private String remark;
+
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61GasKey.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61GasKey.java
new file mode 100644
index 0000000..0975498
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61GasKey.java
@@ -0,0 +1,17 @@
+package com.fzzy.async.fzzy61.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+public class Fz61GasKey implements Serializable {
+ private String batchId;
+ private String companyId;
+ private String depotId;
+ public Fz61GasKey(){
+ super();
+ }
+ }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Grain.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Grain.java
new file mode 100644
index 0000000..4759321
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Grain.java
@@ -0,0 +1,114 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 绮儏鏁版嵁-涓昏〃
+ * <p>
+ * 鏇存柊璁板綍锛�
+ * 1锛屽垹闄よ鏁版嵁鐨勮〃璁板綍锛岃皟鏁翠负鏁版嵁鐩存帴鏂囨湰淇濆瓨涓昏〃涓�
+ * 2锛屼繚鐣欑偣浣嶅潗鏍囦俊鎭紝渚夸簬浠ュ悗鐐逛綅璧板娍鍥炬煡鐪�
+ *
+ * @author Andy
+ */
+@Entity
+@Table(name = "D_GRAIN")
+@Data
+@IdClass(Fz61GrainKey.class)
+public class Fz61Grain implements Serializable {
+
+ public static String SORT_PROP = "batchId";
+
+ @Id
+ @Column(name = "BATCH_ID_", length = 30)
+ @PropertyDef(label = "鎵规缂栧彿")
+ private String batchId;
+
+ @Id
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+ private String companyId;
+
+ @Id
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "鎵�灞炰粨搴�", description = "浠撳簱缂栧彿")
+ private String depotId;
+
+
+ @Column(name = "TEMP_MIN_")
+ @PropertyDef(label = "鏈�浣庢俯绮俯", description = "鍗曚綅鈩冿紝绮儏鏈�浣庢俯")
+ private Double tempMin = 0.0;
+
+ @Column(name = "TEMP_MAX_")
+ @PropertyDef(label = "鏈�楂樼伯娓�", description = "鍗曚綅鈩冿紝绮儏鏈�楂樻俯")
+ private Double tempMax = 0.0;
+
+ @Column(name = "TEMP_AVE_")
+ @PropertyDef(label = "骞冲潎绮俯", description = "鍗曚綅鈩冿紝绮儏骞冲潎娓╁害")
+ private Double tempAve = 0.0;
+
+ @Column(name = "HUMIDITY_IN_")
+ @PropertyDef(label = "浠撳唴婀垮害")
+ private Double humidityIn;
+
+ @Column(name = "TEMP_IN_")
+ @PropertyDef(label = "浠撳唴娓╁害")
+ private Double tempIn;
+
+ @Column(name = "HUMIDITY_OUT_")
+ @PropertyDef(label = "浠撳婀垮害")
+ private Double humidityOut;
+
+ @Column(name = "TEMP_OUT_")
+ @PropertyDef(label = "浠撳娓╁害")
+ private Double tempOut;
+
+ @Column(name = "CABLE_", length = 20)
+ @PropertyDef(label = "灞傝鍒�", description = "鐢ㄩ�楀彿闅斿紑鐨勯厤缃俊鎭�,灞�-琛�-鍒�")
+ private String cable;
+
+ @PropertyDef(label = "绛掍粨灞傞厤缃�", description = "鐢�-闅斿紑鐨勯厤缃俊鎭�")
+ @Column(name = "CABLE_CIR_", length = 20)
+ private String cableCir;
+
+ @PropertyDef(label = "娌归潰楂樺害", description = "鐢�-闅斿紑鐨勪袱涓�硷紝娌归潰楂樺害-寤虹瓚楂樺害")
+ @Column(name = "OIL_HEIGHT_", length = 20)
+ private String oilHeight;
+
+ @Column(name = "WEATHER_", length = 20)
+ @PropertyDef(label = "澶╂皵", description = "鐩存帴濉啓涓枃淇℃伅锛屾櫞锛岄槾闆ㄥぉ")
+ private String weather = "";
+
+ @Column(name = "RECEIVE_DATE_")
+ @PropertyDef(label = "鎺ユ敹鏃堕棿")
+ private Date receiveDate;
+
+ @Column(name = "CHECK_USER_", length = 30)
+ @PropertyDef(label = "妫�娴嬩汉")
+ private String checkUser;
+
+ @Column(name = "REMARK_", length = 500)
+ @PropertyDef(label = "澶囨敞", description = "澶囨敞")
+ private String remark;
+
+ @Column(name = "POINTS_", length = 2000)
+ @PropertyDef(label = "閲囬泦鐐逛俊鎭�", description = "鐢ㄩ�楀彿闅斿紑鐨勬俯搴︿俊鎭俊鎭�")
+ private String points;
+
+ @Column(name = "PUSH_TAG_", length = 2)
+ @PropertyDef(label = "鎺ㄩ�佹爣璁�", description = "鎺ㄩ�佸钩鍙版爣璁�")
+ private String pushTag;
+
+ @Column(name = "BATCH_TAG_", length = 2)
+ @PropertyDef(label = "鐢熸垚鏂瑰紡", description = "01-璁惧閲囬泦锛�02-鎵嬪姩琛ュ綍")
+ private String batchTag = "01";
+
+ @Transient
+ @PropertyDef(label = "鎵�灞炲垎搴�", description = "鍒嗗簱缂栫爜锛岄潪鏁版嵁搴撳瓧娈�")
+ private String deptId;
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61GrainKey.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61GrainKey.java
new file mode 100644
index 0000000..5fe54ed
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61GrainKey.java
@@ -0,0 +1,17 @@
+package com.fzzy.async.fzzy61.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+public class Fz61GrainKey implements Serializable {
+ private String batchId;
+ private String companyId;
+ private String depotId;
+ public Fz61GrainKey(){
+ super();
+ }
+ }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutPlan.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutPlan.java
new file mode 100644
index 0000000..dcdcabe
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutPlan.java
@@ -0,0 +1,107 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璁″垝绠＄悊-涓昏〃
+ * <p>
+ * 鍖呮嫭锛氭敹璐鍒掞紝閿�鍞鍒掞紝杞崲璁板綍锛岃鍒掓墽琛�
+ *
+ * @author: andy.jia
+ * @description: 鐗堟湰4.0瀛楁宸插
+ * @version:
+ * @data:2020骞�5鏈�27鏃�
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_PLAN")
+public class Fz61InoutPlan implements Serializable {
+
+ public static String SORT_PROP = "year";
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "璁″垝缂栫爜")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲簱鍖�")
+ private String deptId;
+
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "璁″垝绫诲瀷")
+ private String type;
+
+ @Column(name = "NAME_", length = 50)
+ @PropertyDef(label = "璁″垝鍚嶇О")
+ private String name;
+
+ @Column(name = "REFERENCE_NUMBER_", length = 40)
+ @PropertyDef(label = "璁″垝鏂囧彿")
+ private String referenceNumber;
+
+ @Column(name = "YEAR_", length = 10)
+ @PropertyDef(label = "骞翠唤")
+ private String year;
+
+ @Column(name = "BEGIN_TIME_")
+ @PropertyDef(label = "寮�濮嬫椂闂�")
+ private Date beginTime;
+
+ @Column(name = "END_TIME_")
+ @PropertyDef(label = "鎴鏃堕棿")
+ private Date endTime;
+
+ @PropertyDef(label = "璁″垝涓嬭揪鍗曚綅")
+ @Column(name = "jhxddw", length = 18)
+ private String jhxddw;
+
+ @PropertyDef(label = "璁″垝涓嬭揪鏃堕棿")
+ @Column(name = "jhxdsj")
+ private Date jhxdsj;
+
+ @Column(name = "CREATE_USER_", length = 30)
+ @PropertyDef(label = "鍒涘缓浜�")
+ private String createUser;
+
+ @Column(name = "CREATE_TIME_")
+ @PropertyDef(label = "鍒涘缓鏃堕棿")
+ private Date createTime;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+ @Column(name = "REMARK_", length = 250)
+ @PropertyDef(label = "澶囨敞")
+ private String remark;
+
+ /**
+ * --------闄勪欢--------
+ **/
+ @Column(name = "FILE_ID_", length = 30)
+ @PropertyDef(label = "闄勪欢id")
+ private String fileId;
+
+ @Column(name = "FILE_NAME_", length = 50)
+ @PropertyDef(label = "闄勪欢鍚嶇О")
+ private String fileName;
+
+ @Column(name = "FILE_TIME_")
+ @PropertyDef(label = "闄勪欢涓婁紶鏃堕棿")
+ private Date fileTime;
+
+ @Transient
+ private List<Fz61InoutPlanDetail> details;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutPlanDetail.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutPlanDetail.java
new file mode 100644
index 0000000..5644d6c
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutPlanDetail.java
@@ -0,0 +1,65 @@
+package com.fzzy.async.fzzy61.entity;
+
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璁″垝锛岃鍒掕缁�
+ *
+ * @DESC 鐗堟湰4.0 楠岃瘉
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_PLAN_DETAIL")
+public class Fz61InoutPlanDetail implements Serializable {
+
+ public static String SORT_PROP = "planId";
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "璁″垝鏄庣粏鍙�")
+ private String id;
+
+ @Column(name = "PLAN_ID_", length = 40)
+ @PropertyDef(label = "璁″垝缂栫爜")
+ private String planId;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "YEAR_", length = 10)
+ @PropertyDef(label = "鏀惰幏骞村害")
+ private String year;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撳簱")
+ private String depotId;
+
+ @Column(name = "PLAN_NUM_", precision = 16, scale = 2)
+ @PropertyDef(label = "璁″垝鏁伴噺", description = "鍗曚綅锛氬惃")
+ private Double planNum;
+
+ @Column(name = "TYPE_", length = 4)
+ @PropertyDef(label = "璁″垝绫诲瀷")
+ private String type;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Pest.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Pest.java
new file mode 100644
index 0000000..f6931e3
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Pest.java
@@ -0,0 +1,109 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 铏缁熻
+ *
+ * @author: andy.jia
+ * @description:
+ * @version:
+ * @data:2019骞�12鏈�25鏃�
+ *
+ */
+@Data
+@Entity
+@Table(name = "D_PEST")
+@IdClass(Fz61PestKey.class)
+public class Fz61Pest implements Serializable {
+
+ public static String SORT_PROP = "batchId";
+
+ @Id
+ @Column(name = "BATCH_ID_", length = 40)
+ @PropertyDef(label = "鎵规ID")
+ private String batchId;
+
+ @Id
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+ private String companyId;
+
+ @Id
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撳簱ID", description = "浠撳簱缂栧彿")
+ private String depotId;
+
+ @Column(name = "PEST_MAX_")
+ @PropertyDef(label = "鏈�澶氭暟閲�")
+ private int pestMax = 0;
+
+ @Column(name = "METHOD_", length = 10)
+ @PropertyDef(label = "铏妫�娴嬫柟娉�", description = "0-绮爢鎵︽牱锛�1-澧欓潰绮潰妫�鏌�")
+ private String method;
+
+ @Column(name = "POSITION_", length =30)
+ @PropertyDef(label = "鍙戠敓閮ㄤ綅")
+ private String position;
+
+ @Column(name = "PEST_TYPE_", length =30)
+ @PropertyDef(label = "铏绉嶇被")
+ private String pestType;
+
+ @Column(name = "PEST_LEVEL_", length =30)
+ @PropertyDef(label = "铏伯绛夌骇鍒ゅ畾")
+ private String pestLevel;
+
+ @Column(name = "PEST_ANALYSIS_", length =60)
+ @PropertyDef(label = "瀹宠櫕鎶楄嵂鎬у垎鏋�")
+ private String pestAnalysis;
+
+ @Column(name = "PEST_START_")
+ @PropertyDef(label = "铏閲囬泦鐐瑰紑濮�", description = "姘斾綋閰嶇疆淇℃伅")
+ private int pestStart;
+
+ @Column(name = "PEST_END_")
+ @PropertyDef(label = "铏閲囬泦鐐规埅鑷�", description = "姘斾綋閰嶇疆淇℃伅")
+ private int pestEnd;
+
+ @Column(name = "CHECK_NUM_")
+ @PropertyDef(label = "閲囬泦閫氶亾涓暟")
+ private int checkNum = 0;
+
+ @Column(name = "RECEIVE_DATE_")
+ @PropertyDef(label = "妫�娴嬫椂闂�")
+ private Date receiveDate;
+
+ @Column(name = "POINTS_", length = 2000)
+ @PropertyDef(label = "閲囬泦鐐逛俊鎭�", description = "鍥哄畾涓猴細passCode,num;passCode,num;")
+ private String points;
+
+ @Column(name = "CHECK_USER_", length = 30)
+ @PropertyDef(label = "妫�娴嬩汉")
+ private String checkUser;
+
+ @Column(name = "BATCH_TAG_", length = 2)
+ @PropertyDef(label = "鐢熸垚鏂瑰紡", description = "01-璁惧閲囬泦锛�02-鎵嬪姩琛ュ綍")
+ private String batchTag = "01";
+
+ @Column(name = "REMARK_", length = 200)
+ @PropertyDef(label = "澶囨敞淇℃伅")
+ private String remark;
+
+
+ @Override
+ public String toString() {
+ return "Pest [batchId=" + batchId + ", companyId=" + companyId
+ + ", depotId=" + depotId + ", pestMax=" + pestMax
+ + ", checkNum=" + checkNum + ", receiveDate="
+ + receiveDate + ", points=" + points + ", checkUser="
+ + checkUser + ", remark=" + remark + "]";
+ }
+
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61PestKey.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61PestKey.java
new file mode 100644
index 0000000..6b644d4
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61PestKey.java
@@ -0,0 +1,17 @@
+package com.fzzy.async.fzzy61.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+public class Fz61PestKey implements Serializable {
+ private String batchId;
+ private String companyId;
+ private String depotId;
+ public Fz61PestKey(){
+ super();
+ }
+ }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Quality.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Quality.java
new file mode 100644
index 0000000..143827e
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Quality.java
@@ -0,0 +1,173 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐ㄩ噺绠＄悊锛�2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮浼樺寲璋冩暣
+ *
+ * @author chen
+ */
+@Data
+@Entity
+@Table(name = "D_M_QUALITY")
+public class Fz61Quality implements Serializable {
+
+ public static String SORT_PROP = "id";
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "涓婚敭ID", description = "yyyyMMdd + 4浣嶉『搴忓彿")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "搴撳尯缂栫爜")
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撳簱缂栫爜")
+ private String depotId;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @PropertyDef(label = "鍏ュ簱鏃ユ湡")
+ @Column(name = "STORE_DATE_")
+ private Date storeDate;
+
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "妫�楠岀被鍒�", description = "01锛氬叆浠撻獙鏀� 02锛氬嚭浠撴楠� 03锛�3 鏈堟湯鏅04锛�9 鏈堟湯鏅 05锛氬叆浠撳垵妫� 06锛氭湀搴︽鏌� 07锛�3 鏈堟湯搴撳唴鏅煡 08锛�9 鏈堟湯搴撳唴鏅煡")
+ private String type;
+
+ @Column(name = "TIME_")
+ @PropertyDef(label = "妫�楠屾椂闂�")
+ private Date time;
+
+ @Column(name = "UNIT_", length = 50)
+ @PropertyDef(label = "妫�楠屽崟浣�")
+ private String unit;
+
+ @Column(name = "USER_", length = 50)
+ @PropertyDef(label = "妫�楠屼汉", description = "妫�楠屼汉鍛樺鍚嶏紝鑻ユ湁澶氫釜淇濈鍛�")
+ private String user;
+
+ @Column(name = "STANDARD_", length = 4)
+ @PropertyDef(label = "妫�楠屼緷鎹�", description = "1-鍥芥爣锛�0-鍏朵粬")
+ private String standard;
+
+
+ @PropertyDef(label = "鎸囨爣绫诲埆", description = "1: 璐ㄩ噺鎸囨爣妫�楠�2锛氬偍瀛樺搧璐ㄦ楠�3锛氶鍝佸畨鍏ㄦ楠� 濡傛灉鍚屾椂妫�楠屼簡澶氫釜锛岀敤#闅斿紑锛屼緥濡傦細1#2#3")
+ @Column(name = "zblb", length = 8)
+ private String zblb;
+
+ @Column(name = "RESULT_", length = 40)
+ @PropertyDef(label = "妫�楠岀粨璁�", description = "1銆佽川閲忔寚鏍囧～鍐�/杈炬爣/涓嶈揪鏍� 2銆佸偍瀛樺搧璐ㄦ寚鏍囧～鍐欌�滃疁瀛樷�濄�佽交搴︿笉瀹滃瓨鈥濄�佲�滈噸搴︿笉瀹滃瓨鈥�3銆侀鍝佸畨鍏ㄦ寚鏍囧～鍐欌�滃悎鏍尖�濄�佷笉鍚堟牸鈥� 澶氶」鎸囨爣鏃朵互#鍒嗛殧锛屼緥濡傦細杈炬爣|缁煎悎鍒ゅ畾#瀹滃瓨#鍚堟牸 ")
+ private String result;
+
+ @Column(name = "spaqzbsfhg", length = 40)
+ @PropertyDef(label = "椋熷搧瀹夊叏鎸囨爣鏄惁鍚堟牸", description = "0-涓嶅悎鏍硷紝1-鍚堟牸")
+ private String spaqzbsfhg;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "绛惧彂鏃ユ湡")
+ @Column(name = "qfrq")
+ private Date qfrq;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎶ュ憡鍑哄叿鏃堕棿")
+ @Column(name = "bgcjsj")
+ private Date bgcjsj;
+
+ @PropertyDef(label = "瀹℃牳浜哄鍚�")
+ @Column(name = "shrxm", length = 64)
+ private String shrxm;
+
+ @PropertyDef(label = "鎵︽牱鍗曠紪鍙�")
+ @Column(name = "qydbh", length = 64)
+ private String qydbh;
+
+ @Column(name = "CHECK_TIME_")
+ @PropertyDef(label = "鎵︽牱鏃堕棿", required = true)
+ private Date checkTime;
+
+ @Column(name = "CHECK_AREA_", length = 50)
+ @PropertyDef(label = "鎵︽牱鍖哄煙")
+ private String checkArea;
+
+ @Column(name = "CHECK_USER_", length = 50)
+ @PropertyDef(label = "鎵︽牱浜�", required = true)
+ private String checkUser;
+
+ @PropertyDef(label = "鐩戠潱浜哄鍚�")
+ @Column(name = "jdrxm", length = 64)
+ private String jdrxm;
+
+ @PropertyDef(label = "鏍峰搧缂栧彿")
+ @Column(name = "ypbh", length = 64)
+ private String ypbh;
+
+ @PropertyDef(label = "鏍峰搧鏁伴噺", required = true)
+ @Column(name = "ypsl", precision = 20, scale = 6)
+ private Double ypsl;
+
+ @PropertyDef(label = "浠ｈ〃鏁伴噺")
+ @Column(name = "dbsl", precision = 20, scale = 6)
+ private Double dbsl;
+
+ @PropertyDef(label = "鏍峰搧绛夌骇")
+ @Column(name = "ypdj", length = 2)
+ private String ypdj;
+
+ @Column(name = "NORMAL_YEAR_", length = 10)
+ @PropertyDef(label = "鏄惁姝ｅ父瀛樺偍骞撮檺")
+ private String normalYear;
+
+ @Column(name = "REMARK_", length = 200)
+ @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
+ private String remark;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+ @Column(name = "REPORT_TYPE_", length = 10)
+ @PropertyDef(label = "鎶ュ憡绫诲瀷", description = "1-鍗曚綅妫�楠岋紝2-鏁翠綋妫�楠�(鍔犳潈骞冲潎)锛�3-鍏朵粬")
+ private String reportType;
+
+ /**
+ * 鍖栭獙椤圭洰鏄庣粏
+ */
+ @Transient
+ private List<Fz61CheckItem> checkItems;
+
+ /**
+ * --------闄勪欢--------
+ **/
+ @Column(name = "FILE_ID_", length = 30)
+ @PropertyDef(label = "闄勪欢id")
+ private String fileId;
+
+ @Column(name = "FILE_NAME_", length = 50)
+ @PropertyDef(label = "闄勪欢鍚嶇О")
+ private String fileName;
+
+ @Column(name = "FILE_TIME_")
+ @PropertyDef(label = "闄勪欢涓婁紶鏃堕棿")
+ private Date fileTime;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61SecSnapDepot.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61SecSnapDepot.java
new file mode 100644
index 0000000..8f1d0bd
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61SecSnapDepot.java
@@ -0,0 +1,64 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+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 java.util.Date;
+
+/**
+ * 浠撳唴瑙嗛鍥惧儚鏁版嵁琛�
+ */
+@Data
+@Entity
+@Table(name = "D_SEC_SNAP_DEPOT")
+public class Fz61SecSnapDepot {
+
+ public static String SORT_PROP = "updateTime";
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "涓婚敭")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "鎵�灞炰粨搴�")
+ private String depotId;
+
+ @Column(name = "CAMERA_ID_", length = 50)
+ @PropertyDef(label = "鍏宠仈鎽勫儚澶�")
+ private String cameraId;
+
+ @Column(name = "RESULT_", length = 30)
+ @PropertyDef(label = "鎶撴媿缁撴灉")
+ private String result = "SUCCESS";
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鎶撴媿鏃堕棿")
+ private Date updateTime;
+
+ @Column(name = "FILE_SUFFIX_", length = 4)
+ @PropertyDef(label = "鍥惧儚鏂囦欢鍚庣紑鍚�")
+ private String fileSuffix = "jpg";
+
+ @Column(name = "FILE_NAME_", length = 100)
+ @PropertyDef(label = "鏂囦欢鍚嶇О")
+ private String fileName;
+
+ @Column(name = "PRESET_ ", length = 4)
+ @PropertyDef(label = "棰勭疆浣嶇紪鍙�")
+ private String preset;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1023.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1023.java
new file mode 100644
index 0000000..a5d5d81
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1023.java
@@ -0,0 +1,231 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.entity.*;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.async.fzzy61.entity.Fz61DrugLogApply;
+import com.fzzy.async.fzzy61.entity.Fz61DrugLogDtl;
+import com.fzzy.async.fzzy61.entity.Fz61DrugLogPeople;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1023Rep;
+import com.fzzy.async.fzzy61.repository.Fzzy61SyncDrugLogDtlRep;
+import com.fzzy.async.fzzy61.repository.Fzzy61SyncDrugLogPeopleRep;
+import com.fzzy.async.fzzy61.repository.Fzzy61SyncDrugLogWayRep;
+import com.fzzy.push.gd2022.ApiCodeConstant;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023Dtl;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023People;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023Way;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐔忚捀澶囨淇℃伅
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1023 {
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private Api1105Rep api1105Rep;
+ @Autowired
+ private Fzzy61Sync1023Rep fzzy61Sync1023Rep;
+ @Autowired
+ private Fzzy61SyncDrugLogPeopleRep drugLogPeopleRep;
+ @Autowired
+ private Fzzy61SyncDrugLogWayRep drugLogWayRep;
+ @Autowired
+ private Fzzy61SyncDrugLogDtlRep drugLogDtlRep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+
+
+ /**
+ * 鍚屾鐔忚捀澶囨淇℃伅
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1023鎺ュ彛鐔忚捀澶囨淇℃伅寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(ApiCodeConstant.API_9201);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61DrugLogApply> list = fzzy61Sync1023Rep.listDrugLogApply(deptId, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒扮啅钂稿妗堜俊鎭�------------------");
+ return;
+ }
+ List<Gd2022Api1023Dtl> dtlList;
+ List<Gd2022Api1023Way> wayList;
+ List<Gd2022Api1023People> peopleList;
+
+
+ Gd2022Api1023 GD2022Api1023;
+ Gd2022Api1023Dtl gd2022Api1023Dtl;
+ Gd2022Api1023Way gd2022Api1023Way;
+ Gd2022Api1023People gd2022Api1023People;
+
+ List<ApiInfoData> apiInfoList;
+ ApiInfoData infoData;
+ for (Fz61DrugLogApply data : list) {
+
+ GD2022Api1023 = new Gd2022Api1023();
+ BeanUtils.copyProperties(data, GD2022Api1023);
+ GD2022Api1023.setXzbm(data.getXzbm().substring(8));
+ GD2022Api1023.setKqdm(kqdm);
+ List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
+ if (null != api1102List && api1102List.size() > 0) {
+ GD2022Api1023.setKqmc(api1102List.get(0).getKqmc());
+ }
+
+ GD2022Api1023.setDwdm(kqdm.substring(0, 18));
+ List<Api1101> api1101List = api1101Rep.findPushData(kqdm);
+ if (null != api1101List && api1101List.size() > 0) {
+ GD2022Api1023.setDwmc(api1101List.get(0).getDwmc());
+ }
+ GD2022Api1023.setYjmc(data.getDrugName());
+ GD2022Api1023.setYjlx(data.getDrugType());
+ GD2022Api1023.setLqrq(data.getLqsj());
+ GD2022Api1023.setZhgxsj(data.getUpdateTime());
+ if (data.getLqr().contains("銆�")) {
+ GD2022Api1023.setLqr(data.getLqr().replace('銆�', '|'));
+ }
+
+ //鍌ㄧ伯绮儏鏄庣粏琛�
+ List<Fz61DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm());
+ Api1105 api1105 = commonService.getApi1105Cache(data.getDepotId());
+ gd2022Api1023Dtl = new Gd2022Api1023Dtl();
+ BeanUtils.copyProperties(data, gd2022Api1023Dtl);
+ if (null != api1105) {
+ gd2022Api1023Dtl.setCfmc(api1105.getHwmc());
+ gd2022Api1023Dtl.setCfdm(api1105.getHwdm().substring(0, 25));
+ }
+
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, data.getFoodVariety());
+ gd2022Api1023Dtl.setLspzdm(mappingCode);
+ gd2022Api1023Dtl.setLsxzdm(data.getFoodType());
+ gd2022Api1023Dtl.setLsdjdm(data.getFoodLevel());
+ gd2022Api1023Dtl.setLssl(data.getNumber());
+ gd2022Api1023Dtl.setSf(data.getPerWet());
+ gd2022Api1023Dtl.setZz(data.getPerImpurity());
+
+
+ dtlList = new ArrayList<>();
+ dtlList.add(gd2022Api1023Dtl);
+ GD2022Api1023.setDtls(dtlList);
+// if (null != dtls && dtls.size() > 0) {
+// dtlList = new ArrayList<>();
+// for (Fz61DrugLogDtl dtl : dtls) {
+// gdApi1023Dtl = new GdApi1023Dtl();
+// BeanUtils.copyProperties(dtl, gdApi1023Dtl);
+// gdApi1023Dtl.setCfdm(dtl.getDepotId());
+// gdApi1023Dtl.setLspzdm(dtl.getFoodVariety());
+// gdApi1023Dtl.setLsxzdm(dtl.getFoodType());
+// gdApi1023Dtl.setLsdjdm(dtl.getFoodLevel());
+// gdApi1023Dtl.setLssl(dtl.getNumber());
+// gdApi1023Dtl.setSf(dtl.getPerWet());
+// gdApi1023Dtl.setZz(dtl.getPerImpurity());
+// dtlList.add(gdApi1023Dtl);
+// }
+// gdApi1023.setDtls(dtlList);
+// }
+
+
+ gd2022Api1023Way = new Gd2022Api1023Way();
+ BeanUtils.copyProperties(data, gd2022Api1023Way);
+ wayList = new ArrayList<>();
+ wayList.add(gd2022Api1023Way);
+ GD2022Api1023.setWays(wayList);
+// List<Fz61DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm());
+// if (null != ways && ways.size() > 0) {
+// wayList = new ArrayList<>();
+// for (Fz61DrugLogWay way : ways) {
+// gdApi1023Way = new GdApi1023Way();
+// BeanUtils.copyProperties(way, gdApi1023Way);
+// wayList.add(gdApi1023Way);
+// }
+// gdApi1023.setWays(wayList);
+// }
+
+ List<Fz61DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm());
+ if (null != peoples && peoples.size() > 0) {
+ peopleList = new ArrayList<>();
+ for (Fz61DrugLogPeople people : peoples) {
+ gd2022Api1023People = new Gd2022Api1023People();
+ BeanUtils.copyProperties(people, gd2022Api1023People);
+ gd2022Api1023People.setXm(people.getMx());
+ if (StringUtils.isEmpty(people.getZyzg())) {
+ gd2022Api1023People.setZyzg("涓骇");
+ }
+ peopleList.add(gd2022Api1023People);
+ }
+ GD2022Api1023.setPeoples(peopleList);
+ }
+ //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
+ infoData = new ApiInfoData();
+
+ infoData.setKqdm(kqdm);
+ infoData.setInteType(Constant.API_CATEGORY_13);
+ infoData.setInteId(ApiCodeConstant.API_9201);
+ infoData.setBizType(PushProtocol.SB_GD_2023.getCode());
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getXzbm());
+ apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_9201, data.getXzbm(), kqdm);
+
+ if (null == apiInfoList || apiInfoList.isEmpty()) {
+ GD2022Api1023.setCzbz(Constant.CZBZ_I);
+ infoData.setCzbz(Constant.CZBZ_I);
+ infoData.setId(ContextUtil.getUUID());
+ } else {
+ GD2022Api1023.setCzbz(apiInfoList.get(0).getCzbz());
+ infoData.setCzbz(apiInfoList.get(0).getCzbz());
+ infoData.setId(apiInfoList.get(0).getId());
+ }
+
+ infoData.setData(JSON.toJSONString(GD2022Api1023));
+
+ //淇濆瓨鏁版嵁
+ apiInfoDataRep.save(infoData);
+ log.info("1023---鍚屾鏁版嵁锛歿}", GD2022Api1023.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---鐔忚捀澶囨鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("鐔忚捀澶囨淇℃伅鍚屾鎵ц澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1302.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1302.java
new file mode 100644
index 0000000..7747828
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1302.java
@@ -0,0 +1,284 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1302;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1302Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61Grain;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1302Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 娓╂箍搴︽娴嬫暟鎹悓姝�
+ *
+ * @author czt
+ * @date 2022-09-07 14:41
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1302 {
+
+ @Autowired
+ private Fzzy61Sync1302Rep fzzySync1302Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private Api1302Rep api1302Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樻俯婀垮害妫�娴嬫暟鎹�
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1302鎺ュ彛娓╂箍搴︽暟鎹紑濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1302);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61Grain> list = fzzySync1302Rep.findByReceiveDate(start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("1302娓╂箍搴�---鍚屾鏁版嵁锛氭病鏈夋煡璇㈠埌闇�瑕佸悓姝ョ殑鏁版嵁");
+ return;
+ }
+
+ Date syncTime = new Date();
+ Api1302 api1302;
+ Api1105 api1105;
+ List<Api1302> api1302List;
+ for (Fz61Grain fz61Grain : list) {
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(fz61Grain.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+
+ //鐢辫揣浣嶄唬鐮�+妫�娴嬫棩鏈� 锛坹yyyMMdd锛� +4 浣嶉『搴忓彿缁勬垚 --2019 1128 0819
+ api1302 = new Api1302();
+ api1302.setWsdjcdh(api1105.getHwdm() + fz61Grain.getBatchId());
+ api1302.setJcsj(fz61Grain.getReceiveDate());
+ api1302.setHwdm(api1105.getHwdm());
+
+ api1302.setCfww(fz61Grain.getTempOut() == null ? 0.00 : fz61Grain.getTempOut());
+ if (null == fz61Grain.getHumidityOut() || fz61Grain.getHumidityOut() < 0) {
+ api1302.setCfws(-1);
+ } else {
+ api1302.setCfws(fz61Grain.getHumidityOut());
+ }
+
+ api1302.setCfnw(fz61Grain.getTempIn() == null ? 0.00 : fz61Grain.getTempIn());
+ if (null == fz61Grain.getHumidityIn() || fz61Grain.getHumidityIn() < 0) {
+ api1302.setCfns(0);
+ } else {
+ api1302.setCfns(fz61Grain.getHumidityIn());
+ }
+
+ api1302.setLszgw(fz61Grain.getTempMax() == null ? 0.00 : fz61Grain.getTempMax());
+ api1302.setLspjw(fz61Grain.getTempAve() == null ? 0.00 : fz61Grain.getTempAve());
+ api1302.setLszdw(fz61Grain.getTempMin() == null ? 0.00 : fz61Grain.getTempMin());
+
+ //鍒ゆ柇绮鏈�浣庢俯銆佸钩鍧囨俯銆佹渶楂樻俯鏄惁绗﹀悎閫昏緫
+ if (api1302.getLszdw() >= api1302.getLspjw()) {
+ continue;
+ }
+ if (api1302.getLspjw() >= api1302.getLszgw()) {
+ continue;
+ }
+
+ //娓╁害闆嗗悎
+ if (StringUtils.isEmpty(fz61Grain.getCableCir())) {
+ api1302.setLswdzjh(getTempPointList1(fz61Grain.getPoints(), fz61Grain.getCable()));
+ api1302.setLssdzjh(getHumPointList1(fz61Grain.getPoints(), fz61Grain.getCable()));
+ if(StringUtils.isEmpty(api1302.getLswdzjh())){
+ continue;
+ }
+ if(StringUtils.isEmpty(api1302.getLssdzjh())){
+ continue;
+ }
+ } else {
+ api1302.setLswdzjh(getTempPointList2(fz61Grain.getPoints(), fz61Grain.getCable(), fz61Grain.getCableCir()));
+ api1302.setLssdzjh(getHumPointList2(fz61Grain.getPoints(), fz61Grain.getCable(), fz61Grain.getCableCir()));
+ if(StringUtils.isEmpty(api1302.getLswdzjh())){
+ continue;
+ }
+ if(StringUtils.isEmpty(api1302.getLssdzjh())){
+ continue;
+ }
+ }
+
+ api1302.setZhgxsj(new Date());
+
+ api1302.setBizId(fz61Grain.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);
+ }
+
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+
+ }
+
+ public static void main(String[] args) {
+ String point = "31.8,20.0,15.1,18.6,28.2,14.3,11.3,16.1,28.1,15.6,13.3,18.4,28.8,16.6,10.2,14.4,27.8,14.3,10.8,16.0,27.5,14.5,11.7,17.1,26.5,13.6,10.1,15.0,29.7,17.4,13.8,17.8,29.7,18.6,15.0,18.6,26.4,13.5,9.2,13.1,27.6,11.8,8.9,13.5,28.1,12.0,8.6,12.8,27.8,11.6,7.6,12.4,26.1,10.8,7.5,12.6,27.8,10.3,7.1,12.0,26.1,11.3,8.5,12.7,28.6,16.9,12.9,17.7,29.1,12.3,8.8,12.1,27.4,11.9,8.6,12.8,29.0,11.5,7.6,11.1,26.9,10.2,8.0,12.7,27.0,9.6,7.7,13.5,26.7,9.5,7.1,12.3,26.3,10.7,8.4,13.4,27.6,15.9,11.5,15.8,28.7,12.6,8.7,12.2,28.1,12.2,8.8,12.5,30.3,11.9,8.0,12.0,27.9,11.1,7.8,11.5,26.3,10.1,7.8,12.0,27.2,10.5,6.9,11.1,27.1,11.6,9.5,13.6,27.4,14.8,10.7,16.6,27.7,12.4,9.1,13.0,27.7,13.2,9.0,12.8,27.5,12.1,8.1,12.6,26.6,11.8,7.3,12.3,26.8,10.5,8.0,13.3,26.3,11.0,7.6,12.5,26.1,10.6,8.5,13.5,29.8,21.3,15.5,17.8,28.3,18.2,11.6,12.8,29.4,17.4,13.0,16.1,28.4,22.3,14.6,15.4,28.7,17.5,11.8,15.2,26.5,14.6,10.9,14.8,27.8,15.3,10.3,14.8,27.6,16.7,13.6,17.4";
+ String cable = "4-6-8";
+ String tempPointList1 = getTempPointList1(point, cable);
+ System.out.println(tempPointList1);
+ }
+
+ /**
+ * 鑾峰彇骞虫柟浠撶殑娓╁害鍊奸泦鍚堬紝鏍煎紡锛氭俯搴﹀��,灞傛暟,琛屾暟,鍒楁暟|娓╁害鍊�,灞傛暟,琛屾暟,鍒楁暟|娓╁害鍊�,灞傛暟,琛屾暟,鍒楁暟
+ *
+ * @return
+ */
+ private static String getTempPointList1(String point, String cable) {
+ String[] cab = cable.split("-");
+ int c = Integer.valueOf(cab[0]);
+ int h = Integer.valueOf(cab[1]);
+ int l = Integer.valueOf(cab[2]);
+
+ String[] points = point.split(",");
+ String result = "";
+ if (c * h * l > points.length) {
+ return result;
+ }
+ for (int i = 1; i <= l; i++) {
+ for (int j = 1; j <= h; j++) {
+ for (int z = 1; z <= c; z++) {
+ result += ("|" + points[((i-1)*h+j-1)*c + z -1] + "," + z + "," + j + "," + i);
+ }
+ }
+ }
+ if(result.length() > 0){
+ result = result.substring(1);
+ }
+ return result;
+ }
+
+ /**
+ * 鑾峰彇绛掍粨鐨勬俯搴﹀�奸泦鍚堬紝鏍煎紡锛氭俯搴﹀��,鍦堟暟,鐐规暟,灞傛暟|娓╁害鍊�,鍦堟暟,鐐规暟,灞傛暟|娓╁害鍊�,鍦堟暟,鐐规暟,灞傛暟
+ *
+ * @return
+ */
+ private String getTempPointList2(String point, String cable, String cableCir) {
+ String[] cab = cable.split("-");
+ String[] cabCir = cableCir.split("-");
+
+ int q = cab.length; //鍦堟暟
+ int c = Integer.valueOf(cabCir[0]); //灞傛暟
+ int g = 0; //鍦堟牴鏁�
+ int g1 = 1; //鍦堣捣濮嬫牴鏁�
+ int g2 = 0; //鍦堟埅姝㈡牴鏁�
+
+ String[] points = point.split(",");
+ String result = "";
+ for (int i = 1; i <= q; i++) {
+ g1 += g2;
+ g = Integer.valueOf(cab[i - 1]);
+ g2 += g;
+ for (int j = g1; j <= g2; j++) {
+ for (int z = 1; z <= c; z++) {
+ result += ("|" + points[(j - 1) * c + z - 1] + "," + i + "," + j + "," + z);
+ }
+ }
+
+ }
+ if(result.length() > 0){
+ result = result.substring(1);
+ }
+ return result;
+ }
+
+ /**
+ * 鑾峰彇骞虫柟浠撶殑婀垮害鍊奸泦鍚堬紝鏍煎紡锛氭箍搴�,灞傛暟,琛屾暟,鍒楁暟|婀垮害,灞傛暟,琛屾暟,鍒楁暟|婀垮害,灞傛暟,琛屾暟,鍒楁暟
+ *
+ * @return
+ */
+ private String getHumPointList1(String point, String cable) {
+ String[] cab = cable.split("-");
+ int c = Integer.valueOf(cab[0]);
+ int h = Integer.valueOf(cab[1]);
+ int l = Integer.valueOf(cab[2]);
+
+ // String[] points = point.split(",");
+ String result = "";
+ for (int i = 1; i <= l; i++) {
+ for (int j = 1; j <= h; j++) {
+ for (int z = 1; z <= c; z++) {
+ result += ("|" + "-1" + "," + z + "," + j + "," + i);
+ }
+ }
+ }
+ if(result.length() > 0){
+ result = result.substring(1);
+ }
+ return result;
+ }
+
+ /**
+ * 鑾峰彇绛掍粨鐨勬箍搴﹀�奸泦鍚堬紝鏍煎紡锛氭箍搴�,鍦堟暟,鐐规暟,灞傛暟|婀垮害,鍦堟暟,鐐规暟,灞傛暟|婀垮害,鍦堟暟,鐐规暟,灞傛暟
+ *
+ * @return
+ */
+ private String getHumPointList2(String point, String cable, String cableCir) {
+ String[] cab = cable.split("-");
+ String[] cabCir = cableCir.split("-");
+
+ int q = cab.length; //鍦堟暟
+ int c = Integer.valueOf(cabCir[0]); //灞傛暟
+ int g = 0; //鍦堟牴鏁�
+ int g1 = 1; //鍦堣捣濮嬫牴鏁�
+ int g2 = 0; //鍦堟埅姝㈡牴鏁�
+
+ // String[] points = point.split(",");
+ String result = "";
+ for (int i = 1; i <= q; i++) {
+ g1 += g2;
+ g = Integer.valueOf(cab[i - 1]);
+ g2 += g;
+ for (int j = g1; j <= g2; j++) {
+ for (int z = 1; z <= c; z++) {
+ result += ("|" + "-1" + "," + i + "," + j + "," + z);
+ }
+ }
+
+ }
+ if(result.length() > 0){
+ result = result.substring(1);
+ }
+ return result;
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1303.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1303.java
new file mode 100644
index 0000000..c9664ac
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1303.java
@@ -0,0 +1,152 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1303;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1303Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61Pest;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1303Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 铏妫�娴嬫暟鎹悓姝�
+ *
+ * @author chen
+ * @date 2022-09-08 09:51
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1303 {
+
+
+ @Autowired
+ private Fzzy61Sync1303Rep fzzy61Sync1303Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private Api1303Rep api1303Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿櫕瀹虫娴嬫暟鎹�
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1303铏妫�娴嬫暟鎹帴鍙ｆ暟鎹紑濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1303);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+
+ List<Fz61Pest> list = fzzy61Sync1303Rep.findPestByReceiveDate(start, end);
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Date syncTime = new Date();
+ Api1303 api1303;
+ Api1105 api1105;
+ List<Api1303> api1303List;
+ for (Fz61Pest fz61Pest : list) {
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(fz61Pest.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+
+ api1303 = new Api1303();
+ api1303.setHcjcdh(api1105.getHwdm() + fz61Pest.getBatchId());
+ api1303.setJcsj(fz61Pest.getReceiveDate());
+ api1303.setHwdm(api1105.getHwdm());
+
+ //妫�鏌ュ铏柟娉曪紝0-杩滅▼銆�1-浜哄伐銆�2-鍏朵粬
+ api1303.setJchcff("0");
+ //鍙戠敓閮ㄤ綅锛屽潗鏍囧～鍐欙細x,y,z
+ api1303.setFsbw("绮潰");//闈炲繀濉瓧娈�
+
+ //瀹宠櫕绉嶇被銆傚涓敤#闅斿紑#TODO >> 寰呬紭鍖栬皟鏁�
+ api1303.setHczl("21212");
+
+ //铏彛瀵嗗害鍊奸泦鍚�
+ String ckmdzjh = this.geeCkmdzjh(fz61Pest.getPestMax(), fz61Pest.getPoints());
+ api1303.setCkmdzjh(ckmdzjh);
+
+ //铏伯绛夌骇鍒ゅ畾锛�531-鍩烘湰鏃犺櫕绮��532-涓�鑸櫕绮��533涓ラ噸铏伯銆�534鍗卞铏伯
+ api1303.setCldjpd("531");
+ if (fz61Pest.getPestMax() > 5) {
+ api1303.setCldjpd("532");
+ }
+ if (fz61Pest.getPestMax() > 30) {
+ api1303.setCldjpd("533");
+ }
+
+ api1303.setZhgxsj(new Date());
+
+ api1303.setBizId(fz61Pest.getBatchId());
+ api1303.setKqdm(api1105.getKqdm());
+ api1303.setSyncTime(new Date());
+ 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);
+ }
+
+ } catch (Exception e) {
+ log.error("---1303铏妫�娴嬫暟鎹悓姝ュけ璐�----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+
+ }
+
+ /**
+ * 澶�/kg锛屾寚绮瀹宠櫕鍊奸泦鍚堬紝涓�
+ * 瀹宠櫕绉嶇被椤哄簭瀵瑰簲锛岀敤鈥渱鈥濆垎
+ * 闅旓紝澶氫釜鍙栨牱鐐圭敤鑻辨枃鍗婅鈥滐紝鈥�
+ * 鍒嗛殧锛屾寜鐓у彇鏍风偣绀烘剰鍥炬爣璇嗛『
+ * 搴忔帓鍒椼��
+ *
+ * @param pestMax
+ * @param points
+ * @return
+ */
+ private String geeCkmdzjh(int pestMax, String points) {
+
+ if (StringUtils.isEmpty(points)) return "0";
+
+ String[] attr = points.split(";");
+
+ String result = "";
+ for (String str : attr) {
+ result += str.split(",")[1] + ",";
+ }
+ return result.substring(0, result.length() - 1);
+ }
+
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1304.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1304.java
new file mode 100644
index 0000000..00867ae
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1304.java
@@ -0,0 +1,141 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1304;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1304Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61Gas;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1304Rep;
+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;
+
+/**
+ * 铏妫�娴嬫暟鎹悓姝�
+ *
+ * @author chen
+ * @date 2022-09-08 09:51
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1304 {
+
+ @Autowired
+ private Fzzy61Sync1304Rep fzzySync1304Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private Api1304Rep api1304Rep;
+
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樻皵浣撴娴嬫暟鎹�
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1304姘斾綋妫�娴嬫暟鎹帴鍙ｆ暟鎹紑濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1304);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61Gas> list = fzzySync1304Rep.findByReceiveDate(start, end);
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1304 api1304;
+ Api1105 api1105;
+ List<Api1304> api1304List;
+ for (Fz61Gas fz61Gas : list) {
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(fz61Gas.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+
+ api1304 = new Api1304();
+ api1304.setQtndjcdh(api1105.getHwdm() + fz61Gas.getBatchId());
+ api1304.setJcsj(fz61Gas.getReceiveDate());
+ api1304.setHwdm(api1105.getHwdm());
+ api1304.setZylx("5");
+
+ api1304 = updateGasInfo(api1304, fz61Gas.getPoints());
+
+ api1304.setZhgxsj(new Date());
+
+ api1304.setBizId(fz61Gas.getBatchId());
+ api1304.setKqdm(api1105.getKqdm());
+ api1304.setSyncTime(new Date());
+ 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);
+ }
+ } catch (Exception e) {
+ log.error("---1304姘斾綋妫�娴嬫暟鎹悓姝ュけ璐�----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+ /**
+ * 鑾峰彇瀵瑰簲姘斾綋娴撳害闆嗗悎锛歱assCode,co2,o2,ph3,n2;passCode,co2,o2,ph3,n2;
+ *
+ * @param points
+ * @return
+ */
+ private Api1304 updateGasInfo(Api1304 api1304, String points) {
+ String[] attr = points.split(";");
+
+ String[] arrt2;
+ String o2 = "", co2 = "", ph3 = "", n2 = "";
+ for (String temp : attr) {
+ arrt2 = temp.split(",");
+ o2 += "," + arrt2[2];
+ co2 += "," + arrt2[1];
+ ph3 += "," + arrt2[3];
+ n2 += "," + arrt2[4];
+ }
+
+ if(o2.length() > 0){
+ o2 = o2.substring(1);
+ }
+ if(co2.length() > 0){
+ co2 = co2.substring(1);
+ }
+ if(ph3.length() > 0){
+ ph3 = ph3.substring(1);
+ }
+ if(n2.length() > 0){
+ n2 = n2.substring(1);
+ }
+ co2 += "|ppm";
+ ph3 += "|ppm";
+ api1304.setYqhlzjh(o2);
+ api1304.setEyhthlzjh(co2);
+ api1304.setLhqndzjh(ph3);
+ api1304.setDqndzjh(n2);
+ return api1304;
+ }
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1305.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1305.java
new file mode 100644
index 0000000..b1bf090
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1305.java
@@ -0,0 +1,115 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1305;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1305Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61AreationData;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1305Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 閫氶鏁版嵁鍚屾
+ *
+ * @author chen
+ * @date 2022-09-08 09:51
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1305 {
+
+ @Autowired
+ private Fzzy61Sync1305Rep fzzySync1305Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private Api1305Rep api1305Rep;
+
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樻皵閫氶鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1305閫氶鏁版嵁鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1305);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61AreationData> list = fzzySync1305Rep.findByReceiveDate(start, end);
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1305 api1305;
+ Api1105 api1105;
+ List<Api1305> api1305List;
+ for (Fz61AreationData fzAreationData : list) {
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(fzAreationData.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+
+ api1305 = new Api1305();
+
+ BeanUtils.copyProperties(fzAreationData, api1305);
+
+ api1305.setTfzydh(api1105.getHwdm() + fzAreationData.getId());
+ api1305.setTfrq(fzAreationData.getStartTime());
+ api1305.setCfdm(api1105.getHwdm().substring(0,25));
+ api1305.setTfmd(fzAreationData.getObjective());
+ api1305.setTflx(fzAreationData.getType());
+ api1305.setFdxs(fzAreationData.getWindNetType());
+ api1305.setFdxs(fzAreationData.getWindNetType());
+ api1305.setSffs(fzAreationData.getAirSupplyMode());
+ api1305.setZhdl(fzAreationData.getTotalEs());
+ api1305.setZyqpjlw(fzAreationData.getBeforeTempAvg());
+ api1305.setJshpjlw(fzAreationData.getAfterTempAvg());
+ api1305.setZyhpjsf(fzAreationData.getBeforPerWetAvg());
+ api1305.setZyhpjsf(fzAreationData.getAfterPerWetAvg());
+ api1305.setTfzyfzr(fzAreationData.getChargeUser());
+ api1305.setTfzyry(fzAreationData.getOperators());
+ api1305.setTfsc(fzAreationData.getLongTime());
+ api1305.setZhgxsj(new Date());
+
+ api1305.setKqdm(kqdm);
+ api1305.setHwdm(api1105.getHwdm());
+ api1305.setBizId(fzAreationData.getId());
+ api1305List = api1305Rep.getDataById(api1305.getTfzydh());
+ if (null == api1305List || api1305List.isEmpty()) {
+ api1305.setCzbz(Constant.CZBZ_I);
+ } else {
+ api1305.setCzbz(api1305List.get(0).getCzbz());
+ }
+ api1305Rep.save(api1305);
+ }
+ } catch (Exception e) {
+ log.error("---閫氶鏁版嵁鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1306.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1306.java
new file mode 100644
index 0000000..4a2478b
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1306.java
@@ -0,0 +1,128 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1303;
+import com.fzzy.api.entity.Api1306;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1303Rep;
+import com.fzzy.api.view.repository.Api1306Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61DrugLog;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1306Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐔忚捀浣滀笟鏁版嵁鍚屾
+ *
+ * @author czt
+ * @date 2022-09-08 09:51
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1306 {
+
+ @Autowired
+ private Fzzy61Sync1306Rep fzzySync1306Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private Api1306Rep api1306Rep;
+ @Autowired
+ private Api1303Rep api1303Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樼啅钂告暟鎹�
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1306鐔忚捀鏁版嵁鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1306);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61DrugLog> list = fzzySync1306Rep.findByReceiveDate(start, end);
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1306 api1306;
+ Api1105 api1105;
+ List<Api1306> api1306List;
+ List<Api1303> api1303List;
+ for (Fz61DrugLog fz61DrugLog : list) {
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(fz61DrugLog.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+
+ api1306 = new Api1306();
+
+ BeanUtils.copyProperties(fz61DrugLog, api1306);
+ api1306.setXzzydh(api1105.getHwdm().substring(0,25) + fz61DrugLog.getId());
+ api1306.setCfdm(api1105.getHwdm().substring(0,25));
+ api1306.setXzkssj(fz61DrugLog.getStart());
+ api1306.setXzjssj(fz61DrugLog.getEnd());
+ //璁剧疆铏妫�娴嬪崟鍙�
+ api1306.setHcjcdh(api1105.getHwdm() + fz61DrugLog.getPestBatchId());
+ api1303List = api1303Rep.getDataByBizId(fz61DrugLog.getPestBatchId());
+ if (null != api1303List && api1303List.size() > 0) {
+ api1306.setHcjcdh(api1303List.get(0).getHcjcdh());
+ }
+
+ api1306.setDjcxz(fz61DrugLog.getNum());
+ api1306.setCgxzfs(fz61DrugLog.getMode());
+ api1306.setHlxzfs(fz61DrugLog.getRecirMode());
+ api1306.setYjmc(fz61DrugLog.getDrugName());
+ api1306.setNd(fz61DrugLog.getConcentration());
+ api1306.setLddwyyl(fz61DrugLog.getGrainDose());
+ api1306.setKjdwyyl(fz61DrugLog.getSpaceDose());
+ api1306.setSyff(StringUtils.isEmpty(fz61DrugLog.getSyff())?"0":fz61DrugLog.getSyff());
+ api1306.setZyyl(fz61DrugLog.getDose());
+ api1306.setSqrq(fz61DrugLog.getVentilateTime());
+ api1306.setSqff(fz61DrugLog.getVentilateMethod());
+ api1306.setSqjsslhqnd(fz61DrugLog.getAfterPh3());
+ api1306.setXzxgpj(fz61DrugLog.getEvaluate());
+ api1306.setZhgxsj(new Date());
+
+ api1306.setHwdm(api1105.getHwdm());
+ api1306.setKqdm(kqdm);
+ api1306.setBizId(fz61DrugLog.getId());
+ api1306List = api1306Rep.getDataById(api1306.getXzzydh());
+ if (null == api1306List || api1306List.isEmpty()) {
+ api1306.setCzbz(Constant.CZBZ_I);
+ } else {
+ api1306.setCzbz(api1306List.get(0).getCzbz());
+ }
+
+ api1306Rep.save(api1306);
+ }
+ } catch (Exception e) {
+ log.error("---1306鐔忚捀鏁版嵁鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1307.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1307.java
new file mode 100644
index 0000000..6fdc3d0
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1307.java
@@ -0,0 +1,161 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.entity.*;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.utils.FileUtils;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.async.fzzy61.entity.Fz61SecSnapDepot;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1307Rep;
+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;
+
+/**
+ * 浠撳唴瑙嗛鍥惧儚
+ * @author czt
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1307 {
+
+ @Autowired
+ private Fzzy61Sync1307Rep fzzySync1307Rep;
+ @Autowired
+ private Api1109Rep api1109Rep;
+ @Autowired
+ private Api1111Rep api1111Rep;
+ @Autowired
+ private Api1307Rep api1307Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private FileUtils fileUtil;
+ @Autowired
+ private ApiConfsRep apiConfsRep;
+
+ /**
+ * 鍚屾浠撳唴鎶撴媿鏂囦欢淇℃伅
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1307浠撳唴瑙嗛鍥惧儚鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1109);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ //鑾峰彇浠撳唴鎶撴媿鍥剧墖
+ List<Fz61SecSnapDepot> list = fzzySync1307Rep.listSnapDepotData(deptId, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒版枃浠朵俊鎭�------------------");
+ return;
+ }
+ Api1105 api1105;
+ Api1307 apiData;
+ List<Api1307> api1307List;
+ List<Api1111> api1111List;
+ Api1109 api1109;
+ List<Api1109> api1109List;
+ for (Fz61SecSnapDepot sysData : list) {
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(sysData.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+ api1111List = api1111Rep.getApi1111ByBizId(sysData.getCameraId());
+ if (null == api1111List || api1111List.isEmpty()) {
+ log.error("-------------娌℃湁鑾峰彇鍒颁粨鍐呰棰戠偣浣嶄俊鎭�------------------");
+ return;
+ }
+
+ apiData = new Api1307();
+ //涓婚敭id
+ apiData.setId(sysData.getFileName().replace(sysData.getDepotId() + "_", api1105.getHwdm()).replace(".jpg", ""));
+
+ //鏌ヨ鎽勫儚澶村搴旂洃鎺ц澶嘔D
+ apiData.setSpjksbid(api1111List.get(0).getSpjksbid());
+ apiData.setCfdm(api1105.getHwdm().substring(0,25));
+
+ apiData.setHwdm(api1105.getHwdm());
+ apiData.setZpsj(sysData.getUpdateTime());
+ apiData.setTxwjhzm("jpg");
+ apiData.setYzwbh(apiData.getHwdm() + "01");
+ //鏂囦欢璺緞
+ apiData.setWjdz(fileUtil.getSnapFilePath(sysData.getUpdateTime()) + sysData.getFileName());
+
+ //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+ apiData.setZhgxsj(new Date());
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+
+ //涓婃捣鐪佸钩鍙颁娇鐢ㄥ粧闂翠唬鐮併�佸浘鍍忕紪鐮佷袱涓瓧娈�
+ apiData.setAjdh(api1105.getHwdm().substring(0,28));
+ apiData.setTxbh(sysData.getFileName().replace(sysData.getDepotId() + "_", api1105.getHwdm()));
+
+ api1307List = api1307Rep.getDataByBizId(apiData.getBizId());
+ if (null == api1307List || api1307List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1307List.get(0).getCzbz());
+ }
+
+ //淇濆瓨鏁版嵁
+ api1307Rep.save(apiData);
+ log.info("1307---鍚屾鏁版嵁锛歿}", apiData.toString());
+
+ //鑻ヤ负涓婃捣鐪佸钩鍙板崗璁紝鍒欓渶鍚屾椂鍚屾鏂囦欢淇℃伅
+ List<ApiConfs> apiConfs = apiConfsRep.getDataByKqdm(kqdm);
+ if(null != apiConfs && PushProtocol.SB_SH_2023.getCode().equals(apiConfs.get(0).getPushProtocol())){
+ api1109 = new Api1109();
+ //涓婚敭id
+ api1109.setId(apiData.getId());
+ //鏂囦欢璺緞
+ api1109.setWjdz(apiData.getWjdz());
+ //鏂囦欢鍚嶇О
+ api1109.setWjmc(apiData.getTxbh());
+ //鏂囦欢绫诲瀷
+ api1109.setWjlx("7"); //7-浠撳唴瑙嗛鍥惧儚
+ //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+ api1109.setZhgxsj(new Date());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ api1109.setBizId(apiData.getBizId());
+ api1109.setKqdm(kqdm);
+ api1109.setSyncTime(new Date());
+ api1109List = api1109Rep.getDataByBizId(api1109.getBizId());
+ if (null == api1109List || api1109List.isEmpty()) {
+ api1109.setCzbz(Constant.CZBZ_I);
+ } else {
+ api1109.setCzbz(api1109List.get(0).getCzbz());
+ }
+ //淇濆瓨鏁版嵁
+ api1109Rep.save(api1109);
+ }
+
+ }
+ } catch (Exception e) {
+ log.error("---浠撳唴鎶撴媿鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾浠撳唴鎶撴媿澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1310.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1310.java
new file mode 100644
index 0000000..62ee66f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1310.java
@@ -0,0 +1,186 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1310;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.GbCheckItem;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1310Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.api.view.repository.GbCheckItemRep;
+import com.fzzy.async.fzzy61.entity.Fz61CheckItem;
+import com.fzzy.async.fzzy61.entity.Fz61Quality;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1203Rep;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1310Rep;
+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;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐ㄦ鍚屾
+ *
+ * @author czt
+ * @date 2023-05-14 19:51
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1310 {
+
+ @Autowired
+ private Fzzy61Sync1310Rep fzzySync1310Rep;
+ @Autowired
+ private Fzzy61Sync1203Rep fzzySync1203Rep;
+ @Autowired
+ private GbCheckItemRep gbCheckItemRep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1310Rep api1310Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1310璐ㄦ鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1304);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61Quality> list = fzzySync1310Rep.findDateByTime(deptId, start, end);
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1310 api1310;
+ Api1105 api1105;
+ List<Fz61CheckItem> fz61CheckItems;
+ List<GbCheckItem> gbCheckList;
+ String jyxm;
+ String jyz;
+ List<Api1310> api1310List;
+
+ for (Fz61Quality fz61Quality : list) {
+ api1105 = commonService.getApi1105Cache(fz61Quality.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+ api1310 = new Api1310();
+ if (fz61Quality.getId().contains("ZJ_")) {
+ api1310.setZjbgdh(fz61Quality.getType() + fz61Quality.getId().substring(3));
+ } else {
+ api1310.setZjbgdh(fz61Quality.getType() + fz61Quality.getId());
+ }
+ api1310.setHwdm(api1105.getHwdm());
+ api1310.setKqdm(kqdm);
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz61Quality.getFoodVariety().substring(0, 3));
+ api1310.setLspzdm(mappingCode);
+
+ //绮绛夌骇
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, fz61Quality.getFoodLevel());
+ api1310.setLsdjdm(mappingCode);
+ api1310.setRkrq(fz61Quality.getStoreDate());
+ api1310.setJylb(fz61Quality.getType());
+ api1310.setJysj(fz61Quality.getTime());
+ api1310.setJydw(StringUtils.isEmpty(fz61Quality.getUnit()) ? "妫�楠屽崟浣�" : fz61Quality.getUnit());
+ api1310.setJyr(StringUtils.isEmpty(fz61Quality.getUser()) ? "妫�楠屼汉" : fz61Quality.getUser());
+ api1310.setJyyj(fz61Quality.getStandard());
+ if (StringUtils.isEmpty(fz61Quality.getZblb())) {
+ api1310.setZblb("2");
+ } else {
+ api1310.setZblb(fz61Quality.getZblb());
+ }
+
+ //妫�娴嬮」锛屾娴嬪��
+ jyxm = "";
+ jyz = "";
+ fz61CheckItems = fzzySync1203Rep.listInoutCheckItem(fz61Quality.getId(), deptId.substring(0, 4));
+ if (null != fz61CheckItems && fz61CheckItems.size() > 0) {
+
+ for (Fz61CheckItem fz61CheckItem : fz61CheckItems) {
+ if (StringUtils.isEmpty(fz61CheckItem.getValue())) {
+ continue;
+ }
+ gbCheckList = gbCheckItemRep.findByBizCode(fz61CheckItem.getStandardId());
+ if (gbCheckList == null || gbCheckList.isEmpty()) {
+ continue;
+ }
+ jyxm += "," + gbCheckList.get(0).getCode();
+ jyz += "," + fz61CheckItem.getValue();
+ }
+ }
+ if(jyxm.length() > 0){
+ jyxm = jyxm.substring(1);
+ }
+ if(jyz.length() > 0){
+ jyz = jyz.substring(1);
+ }
+ api1310.setJyxm(jyxm);
+ api1310.setJyxmz(jyz);
+
+ api1310.setZbjgpd(fz61Quality.getResult());
+ api1310.setQfrq(fz61Quality.getTime());
+ api1310.setBgcjsj(fz61Quality.getTime());
+ api1310.setShrxm(fz61Quality.getShrxm().contains("銆�")?fz61Quality.getShrxm().replace('銆�','|'):fz61Quality.getShrxm());
+ if (null == fz61Quality.getCheckTime()) {
+ fz61Quality.setCheckTime(DateUtils.addDays(fz61Quality.getTime(), -1));
+ }
+ if (!fz61Quality.getCheckTime().before(fz61Quality.getTime())) {
+ fz61Quality.setCheckTime(DateUtils.addDays(fz61Quality.getTime(), -1));
+ }
+ api1310.setSpaqzbsfhg(fz61Quality.getSpaqzbsfhg());
+ api1310.setQysj(fz61Quality.getCheckTime());
+ api1310.setQyqy(fz61Quality.getCheckArea());
+ api1310.setQyrxm(fz61Quality.getCheckUser().contains("銆�") ? fz61Quality.getCheckUser().replace('銆�', '|') : fz61Quality.getCheckUser());
+ api1310.setJdrxm(fz61Quality.getCheckUser().contains("銆�") ? fz61Quality.getCheckUser().replace('銆�', '|') : fz61Quality.getCheckUser());
+
+
+ api1310.setYpsl(fz61Quality.getYpsl() == null ? 0.0 : fz61Quality.getYpsl());
+ api1310.setDbsl(fz61Quality.getDbsl() == null ? 0.0 : fz61Quality.getDbsl());
+ api1310.setYpdj(StringUtils.isEmpty(fz61Quality.getYpdj()) ? "0" : fz61Quality.getYpdj());
+ api1310.setSfzcccnx(StringUtils.isEmpty(fz61Quality.getNormalYear()) ? "0" : fz61Quality.getNormalYear());
+ api1310.setBz(fz61Quality.getRemark());
+ api1310.setYpbh(fz61Quality.getYpbh());
+ api1310.setQydbh(fz61Quality.getQydbh());
+ api1310.setZhgxsj(new Date());
+ api1310.setBizId(fz61Quality.getId());
+
+ api1310List = api1310Rep.getDataByBizId(api1310.getBizId());
+ if (null == api1310List || api1310List.isEmpty()) {
+ api1310.setCzbz(Constant.CZBZ_I);
+ } else {
+ api1310.setCzbz(api1310List.get(0).getCzbz());
+ api1310.setBglx(api1310List.get(0).getBglx());
+ }
+
+ api1310Rep.save(api1310);
+ }
+ } catch (Exception e) {
+ log.error("---璐ㄦ鍚屾鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1311.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1311.java
new file mode 100644
index 0000000..c05fc95
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1311.java
@@ -0,0 +1,161 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1102Rep;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61SecCamera;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1311Rep;
+import com.fzzy.push.sh2023.SH2023Constant;
+import com.fzzy.push.sh2023.dto.SH2023Api1311;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 瑙嗛鐩戞帶
+ *
+ * @Author:YAN
+ */
+@Component
+@Slf4j
+public class Fzzy61Sync1311 {
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private Fzzy61Sync1311Rep fzzy61Sync1311Rep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1311鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(SH2023Constant.SH_2023_API_CODE_1311);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61SecCamera> list = fzzy61Sync1311Rep.findDateByDeptId(deptId);
+ if (list.isEmpty() || null == list) {
+ log.debug("-------------娌℃湁鑾峰彇鍒拌棰戠洃鎺т俊鎭�------------------");
+ return;
+ }
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+ SH2023Api1311 sh2023Api1311;
+ SH2023Api1311 sh1311;
+ List<ApiInfoData> apiInfoDataList;
+ for (Fz61SecCamera sysData : list) {
+ sh2023Api1311 = new SH2023Api1311();
+ sh2023Api1311.setSpjksbid(sysData.getId());
+ sh2023Api1311.setTdbh(sysData.getChanNum());
+ sh2023Api1311.setJksbmc(sysData.getName());
+ sh2023Api1311.setKqdm(kqdm);
+
+ //鐩戞帶鍘傚晢
+ sh2023Api1311.setJkcs(getBrandId(sysData.getBrand()));
+
+ sh2023Api1311.setJkxh(sysData.getSn());
+
+ sh2023Api1311.setSpjklx(StringUtils.isEmpty(sysData.getSpjklx()) ? "3" : sysData.getSpjklx());
+ sh2023Api1311.setSblxbm("1");
+
+ sh2023Api1311.setAzwz(sysData.getName());
+ sh2023Api1311.setAzwzlx(StringUtils.isEmpty(sysData.getSpdwlx()) ? "7" : sysData.getSpdwlx());
+ if (sh2023Api1311.getAzwzlx().length() == 1) {
+ sh2023Api1311.setAzwzlx("0" + sh2023Api1311.getAzwzlx());
+ }
+ if ("12".equals(sh2023Api1311.getAzwzlx()) || "13".equals(sh2023Api1311.getAzwzlx())
+ || "14".equals(sh2023Api1311.getAzwzlx()) || "15".equals(sh2023Api1311.getAzwzlx())) {
+ sh2023Api1311.setAzwzlx("99");
+ }
+ if ("16".equals(sh2023Api1311.getAzwzlx())) {
+ sh2023Api1311.setAzwzlx("12");
+ }
+ sh2023Api1311.setSfazbgd("Y");
+
+ if (StringUtils.isEmpty(sysData.getType())) {
+ sysData.setType("01");
+ }
+ if (sysData.getType().equals("02")) {
+ sh2023Api1311.setJkjlxbm("2");
+ }
+ if (sysData.getType().equals("01")) {
+ sh2023Api1311.setJkjlxbm("1");
+ }
+ sh2023Api1311.setJktyzw(12);
+ sh2023Api1311.setSbipdz(sysData.getIp());
+ sh2023Api1311.setSbdkh(sysData.getControlPort());
+ sh2023Api1311.setSbdlmc(sysData.getLoginId());
+ sh2023Api1311.setSbdlmm(sysData.getPwd());
+ sh2023Api1311.setBz(sysData.getRemark());
+ sh2023Api1311.setZhgxsj(sysData.getUpdateTime() == null ? new Date() : sysData.getUpdateTime());
+
+ //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(sh2023Api1311.getSpjksbid());
+ infoData.setKqdm(kqdm);
+ infoData.setInteType(Constant.API_CATEGORY_13);
+ infoData.setInteId(SH2023Constant.SH_2023_API_CODE_1311);
+ infoData.setUpdateTime(sh2023Api1311.getZhgxsj());
+ infoData.setDataId(sh2023Api1311.getSpjksbid());
+ infoData.setRemarks("瑙嗛鐩戞帶淇℃伅");
+ //璁剧疆鎿嶄綔鏍囧織
+ apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, infoData.getDataId(), kqdm);
+ if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
+ sh2023Api1311.setCzbz(Constant.CZBZ_I);
+ infoData.setCzbz(Constant.CZBZ_I);
+ } else {
+ sh2023Api1311.setCzbz(apiInfoDataList.get(0).getCzbz());
+ infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
+ sh1311 = JSONObject.parseObject(apiInfoDataList.get(0).getData(), SH2023Api1311.class);
+ if (null != sh1311 && StringUtils.isNotEmpty(sh1311.getAjdm())) {
+ sh2023Api1311.setAjdm(sh1311.getAjdm());
+ }
+ if (null != sh1311 && StringUtils.isNotEmpty(sh1311.getHwdm())) {
+ sh2023Api1311.setHwdm(sh1311.getHwdm());
+ }
+ }
+
+ infoData.setData(JSON.toJSONString(sh2023Api1311));
+ apiInfoDataRep.save(infoData);
+ log.info("1311---瑙嗛鐩戞帶-鍚屾鏁版嵁锛歿}", sh2023Api1311);
+ }
+
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+ private String getBrandId(String brandName) {
+ if (StringUtils.isEmpty(brandName)) {
+ return "9";
+ }
+ if (brandName.contains("娴峰悍")) {
+ return "1";
+ }
+ if (brandName.contains("澶у崕")) {
+ return "2";
+ }
+ if (brandName.contains("瀹囪")) {
+ return "3";
+ }
+ return "9";
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1403.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1403.java
new file mode 100644
index 0000000..8960c37
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1403.java
@@ -0,0 +1,111 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1101;
+import com.fzzy.api.entity.Api1403;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.utils.FileUtils;
+import com.fzzy.api.view.repository.Api1101Rep;
+import com.fzzy.api.view.repository.Api1403Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61InoutPlan;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1403Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 杞崲璁″垝鍚屾
+ *
+ * @author czt
+ * @date 2023-10-30 09:55
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1403 {
+
+ @Autowired
+ private Fzzy61Sync1403Rep fzzy61Sync1403Rep;
+ @Autowired
+ private FileUtils fileUtil;
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private Api1403Rep api1403Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿疆鎹㈣鍒掓暟鎹�
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1403杞崲璁″垝鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1403);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61InoutPlan> list = fzzy61Sync1403Rep.findDateByTime(deptId, start, end);
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1403 api1403;
+ List<Api1101> api1101List;
+ List<Api1403> api1403List;
+ for (Fz61InoutPlan fz61Plan : list) {
+ api1403 = new Api1403();
+ api1403.setLhjhdh(kqdm.substring(0, 18) + fz61Plan.getId().split("_")[1] + fz61Plan.getId().split("_")[2]);
+ api1403.setJhwh(fz61Plan.getReferenceNumber());
+ api1403.setJhmc(fz61Plan.getName());
+ api1403.setJhnd(fz61Plan.getYear());
+ api1403.setKszxrq(fz61Plan.getBeginTime());
+ api1403.setJzzxrq(fz61Plan.getEndTime());
+ api1101List = api1101Rep.findPushData(kqdm);
+ if (null != api1101List && api1101List.size() > 0) {
+ api1403.setJhxddw(api1101List.get(0).getDwdm());
+ }
+ api1403.setJhxdsj(fz61Plan.getCreateTime());
+ api1403.setManageWay("1"); //榛樿鐩村偍
+ api1403.setRotationType("1"); //榛樿闈欐�佽疆鎹�
+
+ //鑻ラ檮浠秈d涓嶄负绌猴紝鍒欏垽鏂槸鍚︿负骞夸笢鐪佸钩鍙板崗璁紝骞夸笢鐪佸钩鍙板崗璁椂锛岄渶鍚屾椂鍚屾璁″垝闄勪欢淇℃伅
+ if (StringUtils.isNotEmpty(fz61Plan.getFileId())) {
+ //鏂囦欢璺緞
+ api1403.setWjdz(fileUtil.getCommonFilePath(fz61Plan.getFileTime()) + fz61Plan.getFileId());
+ //鏂囦欢鍚嶇О
+ api1403.setFileName(fz61Plan.getFileName());
+ }
+
+ api1403.setZhgxsj(new Date());
+ api1403.setKqdm(kqdm);
+ api1403.setBizId(fz61Plan.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) {
+ log.error("---1403杞崲璁″垝鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1404.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1404.java
new file mode 100644
index 0000000..e2bc363
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1404.java
@@ -0,0 +1,123 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1404;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1404Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61InoutPlan;
+import com.fzzy.async.fzzy61.entity.Fz61InoutPlanDetail;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1403Rep;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1404Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 杞崲璁″垝鏄庣粏
+ *
+ * @author czt
+ * @date 2023-10-30 09:55
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1404 {
+
+ @Autowired
+ private Fzzy61Sync1403Rep fzzy61Sync1403Rep;
+ @Autowired
+ private Fzzy61Sync1404Rep fzzy61Sync1404Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1404Rep api1404Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿疆鎹㈣鍒掓槑缁�
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1404杞崲璁″垝鏄庣粏鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1304);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61InoutPlan> list = fzzy61Sync1403Rep.findDateByTime(deptId, start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1404 api1404;
+ List<Fz61InoutPlanDetail> fz61PlanDetails;
+ Api1105 api1105;
+ List<Api1404> api1404List;
+ for (Fz61InoutPlan fz61Plan : list) {
+
+ fz61PlanDetails = fzzy61Sync1404Rep.findDate(fz61Plan.getId());
+ if (null == fz61PlanDetails || fz61PlanDetails.isEmpty()) {
+ continue;
+ }
+ int index = 10001;
+ for (Fz61InoutPlanDetail fz61PlanDetail : fz61PlanDetails) {
+ api1105 = commonService.getApi1105Cache(fz61PlanDetail.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+ api1404 = new Api1404();
+ api1404.setLhjhdh(kqdm.substring(0, 18) + fz61PlanDetail.getPlanId().split("_")[1] + fz61PlanDetail.getPlanId().split("_")[2]);
+ api1404.setJhmxdh(api1404.getLhjhdh() + kqdm + String.valueOf(index).substring(1));
+
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz61PlanDetail.getFoodVariety().substring(0,3));
+ api1404.setLspzdm(mappingCode);
+ api1404.setLsdjdm(fz61PlanDetail.getFoodLevel());
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, fz61PlanDetail.getFoodType());
+ api1404.setLsxzdm(mappingCode);
+ api1404.setShnd(StringUtils.isEmpty(fz61PlanDetail.getYear())?fz61Plan.getYear():fz61PlanDetail.getYear());
+ api1404.setLhhwdm(api1105.getHwdm());
+ if(null == fz61PlanDetail.getPlanNum()){
+ fz61PlanDetail.setPlanNum(0.0);
+ }
+ api1404.setLhsl(fz61PlanDetail.getPlanNum()/1000);
+ api1404.setLhlx(fz61PlanDetail.getType());
+ api1404.setZhgxsj(new Date());
+ api1404.setKqdm(kqdm);
+ api1404.setBizId(fz61PlanDetail.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);
+ index ++;
+ }
+ }
+ } catch (Exception e) {
+ log.error("---杞崲璁″垝鏄庣粏鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1504.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1504.java
new file mode 100644
index 0000000..6eb3053
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1504.java
@@ -0,0 +1,82 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1504;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1504Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61Api1504;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1504Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-璐﹀淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 18:55
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1504 {
+
+ @Autowired
+ private Fzzy61Sync1504Rep fzzy61Sync1504Rep;
+ @Autowired
+ private Api1504Rep api1504Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1504璐﹀淇℃伅鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1504);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61Api1504> list = fzzy61Sync1504Rep.findDateByTime(start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1504 api1504;
+ List<Api1504> api1504List;
+ for (Fz61Api1504 sysData : list) {
+ api1504 = new Api1504();
+ BeanUtils.copyProperties(sysData, api1504);
+ api1504.setKqdm(kqdm);
+
+ api1504List = api1504Rep.findDateById(api1504.getNacctid());
+ if (null == api1504List || api1504List.isEmpty()) {
+ api1504.setCzbz(Constant.CZBZ_I);
+ } else {
+ api1504.setCzbz(api1504List.get(0).getCzbz());
+ }
+ api1504Rep.save(api1504);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1505.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1505.java
new file mode 100644
index 0000000..5ef0db9
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1505.java
@@ -0,0 +1,82 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1505;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1505Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61Api1504;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1505Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-绉戠洰淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 18:55
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1505 {
+
+ @Autowired
+ private Fzzy61Sync1505Rep fzzy61Sync1505Rep;
+ @Autowired
+ private Api1505Rep api1505Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1505鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1505);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61Api1504> list = fzzy61Sync1505Rep.findDateByTime(start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1505 api1505;
+ List<Api1505> api1505List;
+ for (Fz61Api1504 sysData : list) {
+ api1505 = new Api1505();
+ BeanUtils.copyProperties(sysData, api1505);
+ api1505.setKqdm(kqdm);
+
+ api1505List = api1505Rep.findDateById(api1505.getId());
+ if(null == api1505List || api1505List.isEmpty()){
+ api1505.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1505.setCzbz(api1505List.get(0).getCzbz());
+ }
+ api1505Rep.save(api1505);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1506.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1506.java
new file mode 100644
index 0000000..5b92c89
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1506.java
@@ -0,0 +1,82 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1506;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1506Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61Api1506;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1506Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-绉戠洰浣欓琛�
+ *
+ * @author czt
+ * @date 2024-01-12 18:55
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1506 {
+
+ @Autowired
+ private Fzzy61Sync1506Rep fzzy61Sync1506Rep;
+ @Autowired
+ private Api1506Rep api1506Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1506鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1506);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61Api1506> list = fzzy61Sync1506Rep.findDateByTime(start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1506 api1506;
+ List<Api1506> api1506List;
+ for (Fz61Api1506 sysData : list) {
+ api1506 = new Api1506();
+ BeanUtils.copyProperties(sysData, api1506);
+ api1506.setKqdm(kqdm);
+
+ api1506List = api1506Rep.findDateById(api1506.getId());
+ if(null == api1506List || api1506List.isEmpty()){
+ api1506.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1506.setCzbz(api1506List.get(0).getCzbz());
+ }
+ api1506Rep.save(api1506);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1507.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1507.java
new file mode 100644
index 0000000..e938fd9
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1507.java
@@ -0,0 +1,82 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1507;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1507Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61Api1507;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1507Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-浼氳鍑瘉淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 18:55
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1507 {
+
+ @Autowired
+ private Fzzy61Sync1507Rep fzzy61Sync1507Rep;
+ @Autowired
+ private Api1507Rep api1507Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1507浼氳鍑瘉淇℃伅鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1507);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61Api1507> list = fzzy61Sync1507Rep.findDateByTime(start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1507 api1507;
+ List<Api1507> api1507List;
+ for (Fz61Api1507 sysData : list) {
+ api1507 = new Api1507();
+ BeanUtils.copyProperties(sysData, api1507);
+ api1507.setKqdm(kqdm);
+
+ api1507List = api1507Rep.findDateById(api1507.getId());
+ if(null == api1507List || api1507List.isEmpty()){
+ api1507.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1507.setCzbz(api1507List.get(0).getCzbz());
+ }
+ api1507Rep.save(api1507);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1508.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1508.java
new file mode 100644
index 0000000..1bc66d8
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1508.java
@@ -0,0 +1,82 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1508;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1508Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61Api1508;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1508Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-鐜伴噾娴侀噺鍒嗛厤淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 18:55
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1508 {
+
+ @Autowired
+ private Fzzy61Sync1508Rep fzzy61Sync1508Rep;
+ @Autowired
+ private Api1508Rep api1508Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1508鐜伴噾娴侀噺鍒嗛厤淇℃伅鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1508);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61Api1508> list = fzzy61Sync1508Rep.findDateByTime(start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1508 api1508;
+ List<Api1508> api1508List;
+ for (Fz61Api1508 sysData : list) {
+ api1508 = new Api1508();
+ BeanUtils.copyProperties(sysData, api1508);
+ api1508.setKqdm(kqdm);
+
+ api1508List = api1508Rep.findDateById(api1508.getId());
+ if(null == api1508List || api1508List.isEmpty()){
+ api1508.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1508.setCzbz(api1508List.get(0).getCzbz());
+ }
+ api1508Rep.save(api1508);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1509.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1509.java
new file mode 100644
index 0000000..6d9e023
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1509.java
@@ -0,0 +1,82 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1509;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1509Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61Api1508;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1509Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-鍒╂鼎
+ *
+ * @author czt
+ * @date 2024-01-12 18:55
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1509 {
+
+ @Autowired
+ private Fzzy61Sync1509Rep fzzy61Sync1509Rep;
+ @Autowired
+ private Api1509Rep api1509Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1509鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1509);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61Api1508> list = fzzy61Sync1509Rep.findDateByTime(start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1509 api1509;
+ List<Api1509> api1509List;
+ for (Fz61Api1508 sysData : list) {
+ api1509 = new Api1509();
+ BeanUtils.copyProperties(sysData, api1509);
+ api1509.setKqdm(kqdm);
+
+ api1509List = api1509Rep.findDateById(api1509.getId());
+ if(null == api1509List || api1509List.isEmpty()){
+ api1509.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1509.setCzbz(api1509List.get(0).getCzbz());
+ }
+ api1509Rep.save(api1509);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1510.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1510.java
new file mode 100644
index 0000000..eff7dd7
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1510.java
@@ -0,0 +1,82 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1510;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1510Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61Api1510;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1510Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-璧勪骇鎶樻棫淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 18:55
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1510 {
+
+ @Autowired
+ private Fzzy61Sync1510Rep fzzy61Sync1510Rep;
+ @Autowired
+ private Api1510Rep api1510Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1510璧勪骇鎶樻棫淇℃伅鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1510);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61Api1510> list = fzzy61Sync1510Rep.findDateByTime(start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1510 api1510;
+ List<Api1510> api1510List;
+ for (Fz61Api1510 sysData : list) {
+ api1510 = new Api1510();
+ BeanUtils.copyProperties(sysData, api1510);
+ api1510.setKqdm(kqdm);
+
+ api1510List = api1510Rep.findDateById(api1510.getId());
+ if (null == api1510List || api1510List.isEmpty()) {
+ api1510.setCzbz(Constant.CZBZ_I);
+ } else {
+ api1510.setCzbz(api1510List.get(0).getCzbz());
+ }
+ api1510Rep.save(api1510);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync2103.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync2103.java
new file mode 100644
index 0000000..b2036fc
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync2103.java
@@ -0,0 +1,205 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiConfsRep;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61Depot;
+import com.fzzy.async.fzzy61.entity.Fz61DepotConf;
+import com.fzzy.async.fzzy61.repository.Fzzy61SyncDepotConfRep;
+import com.fzzy.async.fzzy61.repository.Fzzy61SyncDepotRep;
+import com.fzzy.push.sh2023.SH2023Constant;
+import com.fzzy.push.sh2023.dto.SH2023Api2103;
+import com.fzzy.push.sh2023.dto.SH2023Api2103Item;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绮儏妫�娴嬭澶囦俊鎭悓姝�
+ *
+ * @author czt
+ * @date 2023-08-21
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync2103 {
+
+ @Autowired
+ private Fzzy61SyncDepotRep fzzy61SyncDepotRep;
+ @Autowired
+ private Fzzy61SyncDepotConfRep fzzy61SyncDepotConfRep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiConfsRep apiConfsRep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樻俯婀垮害妫�娴嬫暟鎹�
+ *
+ * @param kqdm
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1302鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1302);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ //鐢变簬depotConf琛ㄤ腑娌℃湁搴撳尯缂栫爜锛屽厛鏌ヨ浠撳簱琛�
+ List<Fz61Depot> list = fzzy61SyncDepotRep.listDepotList(deptId);
+
+ if (null == list || list.isEmpty()) {
+ log.info("2103---绮儏璁惧閰嶇疆鍚屾鏁版嵁锛氭病鏈夋煡璇㈠埌浠撳簱淇℃伅");
+ return;
+ }
+ List<ApiConfs> apiConf = apiConfsRep.getDataByKqdm(kqdm);
+ String bjw = "";
+ if (null != apiConf && apiConf.size() > 0) {
+ bjw = apiConf.get(0).getUserName();
+ }
+
+ SH2023Api2103 sh2023Api2103;
+ Api1105 api1105;
+ List<Fz61DepotConf> depotConfList;
+ Fz61DepotConf depotConf;
+
+ List<ApiInfoData> apiInfoDataList;
+ SH2023Api2103Item sh2023Api2103Item;
+ List<SH2023Api2103Item> listItem;
+ for (Fz61Depot fz61Depot : list) {
+ //鏍规嵁浠撳簱缂栫爜鑾峰彇閰嶇疆淇℃伅
+ depotConfList = fzzy61SyncDepotConfRep.findDataByDepotId(fz61Depot.getId());
+ if (null == depotConfList || depotConfList.isEmpty()) {
+ continue;
+ }
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(fz61Depot.getId());
+ if (null == api1105) {
+ continue;
+ }
+
+ sh2023Api2103 = new SH2023Api2103();
+ sh2023Api2103.setHwdm(api1105.getHwdm());
+ depotConf = depotConfList.get(0);
+ String[] strs = depotConf.getCableRule().split("-");
+
+ sh2023Api2103.setDlcs(strs[0]);
+ sh2023Api2103.setDlhs(strs[1]);
+ sh2023Api2103.setDlls(strs[2]);
+
+ //鍒ゆ柇鏄惁鏈夊眰琛岃浆鎹�
+ if(null != depotConf.getStartConvert() && !"default".equals(depotConf.getStartConvert())){
+ sh2023Api2103.setDlcs(strs[1]);
+ sh2023Api2103.setDlhs(strs[0]);
+ }
+
+ // 1-3-5
+ // 8-8-8
+ //绛掍粨瑙勫垯
+ sh2023Api2103.setDlqs("0");
+ if (StringUtils.isNotEmpty(depotConf.getCableCir())) {
+ sh2023Api2103.setDlqs(String.valueOf(strs.length));
+ sh2023Api2103.setDlhs("0");
+ sh2023Api2103.setDlls("0");
+
+ //鐢电紗鍦堟帓鍒楄鎯�
+ listItem = new ArrayList<>();
+ String[] cableCir = depotConf.getCableCir().split("-");
+ int num1 = 0; //璧峰鏍�
+ int num2 = 0; //鎴鏍�
+ for (int i = 0; i < cableCir.length; i++) {
+ sh2023Api2103.setDlcs(cableCir[i]);
+
+ sh2023Api2103Item = new SH2023Api2103Item();
+ sh2023Api2103Item.setQh(i + 1 + "");
+ if (i == 0) {
+ num1 += 1;
+ } else {
+ num1 = num2 + 1;
+ }
+ num2 += Integer.valueOf(strs[i]);
+ sh2023Api2103Item.setQsdlbh(num1 + "");
+ sh2023Api2103Item.setJsdlbh(num2 + "");
+ sh2023Api2103Item.setCs(cableCir[i]);
+ sh2023Api2103Item.setYbj((i + 1) * 4 + "");
+ sh2023Api2103Item.setRowId(i + "");
+ listItem.add(sh2023Api2103Item);
+ }
+ sh2023Api2103.setDlqplxq(JSON.toJSONString(listItem));
+ }
+
+ sh2023Api2103.setScqd("1");
+ sh2023Api2103.setSczd(Integer.valueOf(strs[1]) * Integer.valueOf(strs[2]) + "");
+
+ sh2023Api2103.setZcqd("1");
+ sh2023Api2103.setZczd(Integer.valueOf(strs[1]) * Integer.valueOf(strs[2]) + "");
+
+ sh2023Api2103.setXcqd("1");
+ sh2023Api2103.setXczd(Integer.valueOf(strs[1]) * Integer.valueOf(strs[2]) + "");
+
+ sh2023Api2103.setYxfwqsc("1");
+ sh2023Api2103.setYxfwjsc(sh2023Api2103.getDlcs());
+
+ sh2023Api2103.setBjw(bjw);
+ sh2023Api2103.setZhgxsj(new Date());
+
+ //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(sh2023Api2103.getHwdm());
+ infoData.setKqdm(kqdm);
+ infoData.setInteType(Constant.API_CATEGORY_13);
+ infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2103);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(sh2023Api2103.getHwdm());
+ infoData.setRemarks("绮儏璁惧閰嶇疆淇℃伅");
+
+ //璁剧疆鎿嶄綔鏍囧織
+ apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2103, infoData.getDataId(),kqdm);
+ if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
+ infoData.setCzbz(Constant.CZBZ_I);
+ sh2023Api2103.setCzbz(Constant.CZBZ_I);
+ } else {
+ infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
+ sh2023Api2103.setCzbz(apiInfoDataList.get(0).getCzbz());
+ }
+
+ infoData.setData(JSON.toJSONString(sh2023Api2103));
+ apiInfoDataRep.save(infoData);
+
+ log.info("2103---绮儏璁惧閰嶇疆-鍚屾鏁版嵁锛歿}", sh2023Api2103.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync9201.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync9201.java
new file mode 100644
index 0000000..ee6283d
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync9201.java
@@ -0,0 +1,211 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.alibaba.fastjson2.JSON;
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.*;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1101Rep;
+import com.fzzy.api.view.repository.Api1102Rep;
+import com.fzzy.api.view.repository.Api9201Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61DrugLogApply;
+import com.fzzy.async.fzzy61.entity.Fz61DrugLogDtl;
+import com.fzzy.async.fzzy61.entity.Fz61DrugLogPeople;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync9201Rep;
+import com.fzzy.async.fzzy61.repository.Fzzy61SyncDrugLogDtlRep;
+import com.fzzy.async.fzzy61.repository.Fzzy61SyncDrugLogPeopleRep;
+import com.fzzy.push.gd2022.ApiCodeConstant;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023Dtl;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023People;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023Way;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐔忚捀澶囨淇℃伅
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync9201 {
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private Fzzy61Sync9201Rep fzzy61Sync9201Rep;
+ @Autowired
+ private Fzzy61SyncDrugLogPeopleRep drugLogPeopleRep;
+ @Autowired
+ private Fzzy61SyncDrugLogDtlRep drugLogDtlRep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+
+ @Autowired
+ private Api9201Rep api9201Rep;
+
+
+ /**
+ * 鍚屾鐔忚捀澶囨淇℃伅
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------9201鎺ュ彛鐔忚捀澶囨淇℃伅寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(ApiCodeConstant.API_9201);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61DrugLogApply> list = fzzy61Sync9201Rep.listDrugLogApply(deptId, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒扮啅钂稿妗堜俊鎭�------------------");
+ return;
+ }
+ List<Gd2022Api1023Dtl> dtlList;
+ List<Gd2022Api1023Way> wayList;
+ List<Gd2022Api1023People> peopleList;
+
+ List<Api9201> api9201List;
+
+ Api1105 api1105;
+ Api9201 api9201;
+ Gd2022Api1023Dtl api9201Dtl;
+ Gd2022Api1023Way api9201Way;
+ Gd2022Api1023People api9201People;
+
+ for (Fz61DrugLogApply data : list) {
+
+ api9201 = new Api9201();
+ BeanUtils.copyProperties(data, api9201);
+ api9201.setBizId(data.getXzbm());
+ api9201.setId(data.getXzbm());
+ api9201.setXzbm(data.getXzbm().substring(8));
+ api9201.setKqdm(kqdm);
+ List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
+ if (null != api1102List && api1102List.size() > 0) {
+ api9201.setKqmc(api1102List.get(0).getKqmc());
+ }
+
+ api9201.setDwdm(kqdm.substring(0, 18));
+ List<Api1101> api1101List = api1101Rep.findPushData(kqdm);
+ if (null != api1101List && api1101List.size() > 0) {
+ api9201.setDwmc(api1101List.get(0).getDwmc());
+ }
+ api9201.setYjmc(data.getDrugName().trim());
+ api9201.setYjlx(data.getDrugType().trim());
+ api9201.setLqrq(data.getLqsj());
+ api9201.setZhgxsj(data.getUpdateTime());
+ api9201.setXcfzr(data.getXcfzr().trim());
+ if (data.getLqr().contains("銆�")) {
+ api9201.setLqr(data.getLqr().replace('銆�', '|').trim());
+ }
+
+ //鍌ㄧ伯绮儏鏄庣粏琛�
+ List<Fz61DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm());
+
+ if (null != dtls && dtls.size() > 0) {
+ dtlList = new ArrayList<>();
+ for (Fz61DrugLogDtl dtl : dtls) {
+ api9201Dtl = new Gd2022Api1023Dtl();
+ BeanUtils.copyProperties(dtl, api9201Dtl);
+ api1105 = commonService.getApi1105Cache(dtl.getDepotId());
+ if (null != api1105) {
+ api9201Dtl.setCfmc(api1105.getHwmc());
+ api9201Dtl.setCfdm(api1105.getHwdm().substring(0, 25));
+ }
+
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, dtl.getFoodVariety());
+ api9201Dtl.setLspzdm(mappingCode);
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, dtl.getFoodType());
+ api9201Dtl.setLsxzdm(mappingCode);
+ api9201Dtl.setLsdjdm(dtl.getFoodLevel());
+ api9201Dtl.setLssl(dtl.getNumber());
+ api9201Dtl.setSf(dtl.getPerWet());
+ api9201Dtl.setZz(dtl.getPerImpurity());
+ dtlList.add(api9201Dtl);
+ }
+ api9201.setDtl(JSON.toJSONString(dtlList));
+ api9201List = api9201Rep.getDataByBizId(api9201.getBizId());
+ if (null == api9201List || api9201List.isEmpty()) {
+ api9201.setCzbz(Constant.CZBZ_I);
+ } else {
+ api9201.setCzbz(api9201List.get(0).getCzbz());
+ }
+ }
+// BeanUtils.copyProperties(data, api9201Dtl);
+// dtlList = new ArrayList<>();
+// dtlList.add(api9201Dtl);
+// api9201.setDtl(JSON.toJSONString(dtlList));
+
+
+ api9201Way = new Gd2022Api1023Way();
+ BeanUtils.copyProperties(data, api9201Way);
+ wayList = new ArrayList<>();
+ api9201Way.setSqfs(data.getSqfs().trim());
+ api9201Way.setXzfs(data.getXzfs().trim());
+ wayList.add(api9201Way);
+ api9201.setWay(JSON.toJSONString(wayList));
+
+ List<Fz61DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm());
+ if (null != peoples && peoples.size() > 0) {
+ peopleList = new ArrayList<>();
+ for (Fz61DrugLogPeople people : peoples) {
+ api9201People = new Gd2022Api1023People();
+ BeanUtils.copyProperties(people, api9201People);
+ api9201People.setXm(people.getMx().trim());
+ api9201People.setZw(people.getZw().trim());
+ api9201People.setXzrwfg(people.getXzrwfg().trim());
+ api9201People.setStzk(people.getStzk().trim());
+ if (StringUtils.isEmpty(people.getZyzg())) {
+ people.setZyzg("鍩硅鍚堟牸");
+ }
+ if (StringUtils.isEmpty(people.getSfwb())) {
+ people.setSfwb("鍚�");
+ }
+ api9201People.setZyzg(people.getZyzg().trim());
+ peopleList.add(api9201People);
+ }
+ api9201.setPeople(JSON.toJSONString(peopleList));
+
+ api9201List = api9201Rep.getDataByBizId(api9201.getBizId());
+ if (null == api9201List || api9201List.isEmpty()) {
+ api9201.setCzbz(Constant.CZBZ_I);
+ } else {
+ api9201.setCzbz(api9201List.get(0).getCzbz());
+ }
+ }
+ api9201Rep.save(api9201);
+ log.info("9201---鍚屾鏁版嵁锛歿}", api9201.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---鐔忚捀澶囨鍚屾鎵ц澶辫触----{}", e);
+ apiLog.setResult("鐔忚捀澶囨淇℃伅鍚屾鎵ц澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1023Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1023Rep.java
new file mode 100644
index 0000000..c71efce
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1023Rep.java
@@ -0,0 +1,22 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61DrugLogApply;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐔忚捀澶囨淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fzzy61Sync1023Rep extends JpaRepository<Fz61DrugLogApply, String> {
+
+ //鏌ヨ鐔忚捀澶囨涓昏〃
+ @Query("from Fz61DrugLogApply where deptId =:deptId and updateTime >=:start and updateTime <=:end")
+ List<Fz61DrugLogApply> listDrugLogApply(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+
+ }
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1302Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1302Rep.java
new file mode 100644
index 0000000..4c447f1
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1302Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61Grain;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鏌ヨ绮儏妫�娴嬫暟鎹�
+ *
+ * @author chen
+ * @date 2022-09-07 14:35
+ */
+public interface Fzzy61Sync1302Rep extends JpaRepository<Fz61Grain, String> {
+
+ /**
+ * 鏍规嵁鏃堕棿娈垫煡璇㈢伯鎯呮暟鎹�
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61Grain where receiveDate >=:start and receiveDate <:end order by receiveDate ")
+ List<Fz61Grain> findByReceiveDate(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1303Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1303Rep.java
new file mode 100644
index 0000000..7591f5a
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1303Rep.java
@@ -0,0 +1,28 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61Pest;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鏌ヨ铏妫�娴嬫暟鎹�
+ *
+ * @author chen
+ * @date 2022-09-08 09:51
+ */
+public interface Fzzy61Sync1303Rep extends JpaRepository<Fz61Pest, String> {
+
+ /**
+ * 鏍规嵁鏃堕棿娈垫煡璇㈢伯鎯呮暟鎹�
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61Pest where receiveDate >=:start and receiveDate <:end order by receiveDate ")
+ List<Fz61Pest> findPestByReceiveDate(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1304Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1304Rep.java
new file mode 100644
index 0000000..767230c
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1304Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61Gas;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鏌ヨ姘斾綋妫�娴嬫暟鎹�
+ *
+ * @author chen
+ * @date 2022-09-08 10:42
+ */
+public interface Fzzy61Sync1304Rep extends JpaRepository<Fz61Gas, String> {
+
+ /**
+ * 鏍规嵁鏃堕棿娈垫煡璇㈢伯鎯呮暟鎹�
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61Gas where receiveDate >=:start and receiveDate <:end order by receiveDate ")
+ List<Fz61Gas> findByReceiveDate(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1305Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1305Rep.java
new file mode 100644
index 0000000..2e17f58
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1305Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61AreationData;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鏌ヨ閫氶浣滀笟鏁版嵁
+ *
+ * @author chen
+ * @date 2022-09-08 10:42
+ */
+public interface Fzzy61Sync1305Rep extends JpaRepository<Fz61AreationData, String> {
+
+ /**
+ * 鏍规嵁鏃堕棿娈垫煡璇㈤�氶鏁版嵁
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61AreationData where updateTime >=:start and updateTime <:end order by updateTime ")
+ List<Fz61AreationData> findByReceiveDate(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1306Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1306Rep.java
new file mode 100644
index 0000000..32b13b9
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1306Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61DrugLog;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鏌ヨ閫氶浣滀笟鏁版嵁
+ *
+ * @author chen
+ * @date 2022-09-08 10:42
+ */
+public interface Fzzy61Sync1306Rep extends JpaRepository<Fz61DrugLog, String> {
+
+ /**
+ * 鏍规嵁鏃堕棿娈垫煡璇㈤�氶鏁版嵁
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61DrugLog where updateTime >=:start and updateTime <:end order by updateTime ")
+ List<Fz61DrugLog> findByReceiveDate(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1307Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1307Rep.java
new file mode 100644
index 0000000..81fcaf3
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1307Rep.java
@@ -0,0 +1,30 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61SecSnapDepot;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 浠撳唴瑙嗛鍥惧儚
+ *
+ * @author czt
+ * @date 2024-01-02
+ */
+public interface Fzzy61Sync1307Rep extends JpaRepository<Fz61SecSnapDepot, String> {
+
+ /**
+ * 鏍规嵁淇℃伅鑾峰彇浠撳唴鎶撴媿淇℃伅
+ *
+ * @param deptId
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ @Query("from Fz61SecSnapDepot where deptId=:deptId and updateTime >=:startTime and updateTime <=:endTime order by id ")
+ List<Fz61SecSnapDepot> listSnapDepotData(@Param("deptId") String deptId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1310Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1310Rep.java
new file mode 100644
index 0000000..c70a7e5
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1310Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61Quality;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鏌ヨ璐ㄦ鏁版嵁
+ *
+ * @author czt
+ * @date 2023-05-14 19:55
+ */
+public interface Fzzy61Sync1310Rep extends JpaRepository<Fz61Quality, String> {
+
+ /**
+ * 鏍规嵁鏃堕棿娈垫煡璇㈢伯鎯呮暟鎹�
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61Quality where deptId =:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
+ List<Fz61Quality> findDateByTime(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1311Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1311Rep.java
new file mode 100644
index 0000000..ca94201
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1311Rep.java
@@ -0,0 +1,22 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61SecCamera;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * @Author:YAN
+ */
+public interface Fzzy61Sync1311Rep extends JpaRepository<Fz61SecCamera, String> {
+ /**
+ * 鏍规嵁鏃堕棿娈垫煡璇㈢伯鎯呮暟鎹�
+ *
+ * @param deptId
+ * @return
+ */
+ @Query("from Fz61SecCamera where deptId =:deptId ")
+ List<Fz61SecCamera> findDateByDeptId(@Param("deptId") String deptId);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1403Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1403Rep.java
new file mode 100644
index 0000000..416f3b6
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1403Rep.java
@@ -0,0 +1,36 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61InoutPlan;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鏌ヨ杞崲璁″垝璇︾粏
+ *
+ * @author czt
+ * @date 2023-10-30 09:55
+ */
+public interface Fzzy61Sync1403Rep extends JpaRepository<Fz61InoutPlan, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61InoutPlan where type =:planType and createTime >=:start and createTime <:end order by createTime ")
+ List<Fz61InoutPlan> findDate(@Param("planType") String planType, @Param("start") Date start, @Param("end") Date end);
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61InoutPlan where deptId =:deptId and createTime >=:start and createTime <:end order by createTime ")
+ List<Fz61InoutPlan> findDateByTime(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1404Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1404Rep.java
new file mode 100644
index 0000000..0e7bdea
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1404Rep.java
@@ -0,0 +1,25 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40InoutPlanDetail;
+import com.fzzy.async.fzzy61.entity.Fz61InoutPlanDetail;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 鏌ヨ杞崲璁″垝璇︾粏
+ *
+ * @author czt
+ * @date 2023-10-30 09:55
+ */
+public interface Fzzy61Sync1404Rep extends JpaRepository<Fz61InoutPlanDetail, String> {
+
+ /**
+ *
+ * @return
+ */
+ @Query("from Fz61InoutPlanDetail where planId =:planId ")
+ List<Fz61InoutPlanDetail> findDate(@Param("planId") String planId);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1504Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1504Rep.java
new file mode 100644
index 0000000..30bbec2
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1504Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61Api1504;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-鍒╂鼎
+ *
+ * @author czt
+ * @date 2024-01-12 09:55
+ */
+public interface Fzzy61Sync1504Rep extends JpaRepository<Fz61Api1504, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61Api1504 where zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz61Api1504> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1505Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1505Rep.java
new file mode 100644
index 0000000..a160341
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1505Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61Api1504;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-鍒╂鼎
+ *
+ * @author czt
+ * @date 2024-01-12 09:55
+ */
+public interface Fzzy61Sync1505Rep extends JpaRepository<Fz61Api1504, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61Api1504 where zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz61Api1504> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1506Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1506Rep.java
new file mode 100644
index 0000000..f29e143
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1506Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61Api1506;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-鍒╂鼎
+ *
+ * @author czt
+ * @date 2024-01-12 09:55
+ */
+public interface Fzzy61Sync1506Rep extends JpaRepository<Fz61Api1506, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61Api1506 where zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz61Api1506> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1507Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1507Rep.java
new file mode 100644
index 0000000..fd339a7
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1507Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61Api1507;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-浼氳鍑瘉淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 09:55
+ */
+public interface Fzzy61Sync1507Rep extends JpaRepository<Fz61Api1507, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61Api1507 where zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz61Api1507> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1508Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1508Rep.java
new file mode 100644
index 0000000..ec689be
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1508Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61Api1508;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-鐜伴噾娴侀噺鍒嗛厤淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 09:55
+ */
+public interface Fzzy61Sync1508Rep extends JpaRepository<Fz61Api1508, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61Api1508 where zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz61Api1508> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1509Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1509Rep.java
new file mode 100644
index 0000000..8ca34ed
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1509Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61Api1508;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-鍥哄畾璧勪骇鍗＄墖淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 09:55
+ */
+public interface Fzzy61Sync1509Rep extends JpaRepository<Fz61Api1508, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61Api1508 where zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz61Api1508> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1510Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1510Rep.java
new file mode 100644
index 0000000..4979e37
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1510Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61Api1510;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-璧勪骇鎶樻棫淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 09:55
+ */
+public interface Fzzy61Sync1510Rep extends JpaRepository<Fz61Api1510, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61Api1510 where zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz61Api1510> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync9201Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync9201Rep.java
new file mode 100644
index 0000000..fa59fb6
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync9201Rep.java
@@ -0,0 +1,22 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61DrugLogApply;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐔忚捀澶囨淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fzzy61Sync9201Rep extends JpaRepository<Fz61DrugLogApply, String> {
+
+ //鏌ヨ鐔忚捀澶囨涓昏〃
+ @Query("from Fz61DrugLogApply where deptId =:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
+ List<Fz61DrugLogApply> listDrugLogApply(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+
+ }
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDepotConfRep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDepotConfRep.java
new file mode 100644
index 0000000..aee51b8
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDepotConfRep.java
@@ -0,0 +1,26 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61DepotConf;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 鏌ヨ绮儏妫�娴嬫暟鎹�
+ *
+ * @author czt
+ *
+ * @date 2023-08-21
+ */
+public interface Fzzy61SyncDepotConfRep extends JpaRepository<Fz61DepotConf, String> {
+
+ /**
+ * 鏍规嵁浠撳簱缂栫爜鑾峰彇绮儏鍙傛暟閰嶇疆淇℃伅
+ * @param depotId
+ * @return
+ */
+ @Query("from Fz61DepotConf where depotId =:depotId order by depotId ")
+ List<Fz61DepotConf> findDataByDepotId(@Param("depotId") String depotId);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDepotRep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDepotRep.java
new file mode 100644
index 0000000..87fe925
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDepotRep.java
@@ -0,0 +1,26 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61Depot;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 鑾峰彇浠撳簱淇℃伅
+ *
+ * @author czt
+ * @date 2023-08-21
+ */
+public interface Fzzy61SyncDepotRep extends JpaRepository<Fz61Depot, String> {
+
+ /**
+ * 鏍规嵁搴撳尯缂栫爜鑾峰彇璐т綅鍒楄〃
+ * @param deptId
+ * @return
+ */
+ @Query("from Fz61Depot where deptId=:deptId order by id ")
+ List<Fz61Depot> listDepotList(@Param("deptId") String deptId);
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDrugLogDtlRep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDrugLogDtlRep.java
new file mode 100644
index 0000000..5a9f263
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDrugLogDtlRep.java
@@ -0,0 +1,21 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61DrugLogDtl;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 鐔忚捀澶囨瀛愯〃 - 绮儏淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fzzy61SyncDrugLogDtlRep extends JpaRepository<Fz61DrugLogDtl, String> {
+
+
+ @Query("from Fz61DrugLogDtl where drugLogId =:id")
+ List<Fz61DrugLogDtl> listDrugLogDtl(@Param("id") String id );
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDrugLogPeopleRep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDrugLogPeopleRep.java
new file mode 100644
index 0000000..86dd6ea
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDrugLogPeopleRep.java
@@ -0,0 +1,19 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61DrugLogPeople;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 璁惧淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fzzy61SyncDrugLogPeopleRep extends JpaRepository<Fz61DrugLogPeople, String> {
+
+ @Query("from Fz61DrugLogPeople where drugLogId =:id")
+ List<Fz61DrugLogPeople> listDrugLogPeople(@Param("id") String id);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDrugLogWayRep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDrugLogWayRep.java
new file mode 100644
index 0000000..de69be9
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncDrugLogWayRep.java
@@ -0,0 +1,19 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61DrugLogWay;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 璁惧淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fzzy61SyncDrugLogWayRep extends JpaRepository<Fz61DrugLogWay, String> {
+
+ @Query("from Fz61DrugLogWay where drugLogId =:id")
+ List<Fz61DrugLogWay> listDrugLogWay(@Param("id") String id );
+}
--
Gitblit v1.9.3