From 667d24748171a032c55910c0dc1bb1ac340b9521 Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期二, 22 八月 2023 18:52:14 +0800
Subject: [PATCH] 提交熏蒸备案同步
---
src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml | 530 ++++++++++++++++++++++
src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023People.java | 21
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java | 71 +++
src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java | 42 +
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogDtl.java | 146 ++++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java | 158 ++++++
src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Way.java | 20
src/main/java/com/fzzy/api/entity/ApiInfoData.java | 4
src/main/java/com/fzzy/api/view/pr/Api1109PR.java | 1
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogWay.java | 65 ++
src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java | 1
src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java | 44 +
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1023Rep.java | 22
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java | 3
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApplyKey.java | 18
src/main/java/com/fzzy/async/fzzy40/entity/Fz4DrugLogApply.java | 170 +++++++
src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java | 52 ++
17 files changed, 1,365 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/ApiInfoData.java b/src/main/java/com/fzzy/api/entity/ApiInfoData.java
index c17e759..8e0d7b5 100644
--- a/src/main/java/com/fzzy/api/entity/ApiInfoData.java
+++ b/src/main/java/com/fzzy/api/entity/ApiInfoData.java
@@ -42,6 +42,10 @@
@Column(name = "inteType", length = 10)
private String inteType;
+ @PropertyDef(label = "涓氬姟绫诲瀷" , description = "鍗忚缂栫爜")
+ @Column(name = "BIZ_Type", length = 20)
+ private String bizType;
+
@PropertyDef(label = "鎺ュ彛缂栧彿")
@Column(name = "inteId", length = 10)
private String inteId;
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1109PR.java b/src/main/java/com/fzzy/api/view/pr/Api1109PR.java
index c8d1101..404ba5c 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1109PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1109PR.java
@@ -24,6 +24,7 @@
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
import sun.misc.BASE64Encoder;
+
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
index 13f0fc2..2377849 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
@@ -29,6 +29,8 @@
private Fzzy40Sync1306 fzzySync1306;
@Autowired
private Fzzy40Sync1310 fzzySync1310;
+ @Autowired
+ private Fzzy40Sync1023 fzzySync1023;
@Override
public String getProtocol() {
@@ -57,6 +59,7 @@
fzzySync1306.syncData(param.getDeptId(), param.getStart(), param.getEnd());
//鐔忚捀澶囨鏁版嵁鍚屾
+ fzzySync1023.syncData(param.getDeptId(), param.getStart(), param.getEnd());
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApplyKey.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApplyKey.java
new file mode 100644
index 0000000..1ff7447
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApplyKey.java
@@ -0,0 +1,18 @@
+package com.fzzy.async.fzzy40.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+public class Fz40DrugLogApplyKey implements Serializable {
+ private String id;
+ private String deptId;
+ private String standardId;
+
+ public Fz40DrugLogApplyKey(){
+ super();
+ }
+ }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogDtl.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogDtl.java
new file mode 100644
index 0000000..464046d
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogDtl.java
@@ -0,0 +1,146 @@
+package com.fzzy.async.fzzy40.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+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 Fz40DrugLogDtl implements Serializable {
+
+ @Id
+ @Column(name = "DTL_ID_", length = 40)
+ @PropertyDef(label = "dtlId")
+ private String dtlId;
+
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "id")
+ @JSONField
+ private String id;
+
+ @Column(name = "DRUG_LOG_ID_", length = 4)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ @JSONField
+ private String drugLogId;
+
+ @Column(name = "DEPT_ID_", length = 21)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ @JSONField
+ private String deptId;
+
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
+
+ @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/fzzy40/entity/Fz40DrugLogPeople.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java
new file mode 100644
index 0000000..6dc8635
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java
@@ -0,0 +1,71 @@
+package com.fzzy.async.fzzy40.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+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
+ */
+@Data
+@Entity
+@Table(name = "D_DRUG_LOG_PEOPLE")
+public class Fz40DrugLogPeople implements Serializable {
+
+ @Id
+ @Column(name = "PEOPLE_ID_", length = 40)
+ @PropertyDef(label = "propleId")
+ private String propleId;
+
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "id")
+ private String id;
+
+ @Column(name = "DRUG_LOG_ID_", length = 4)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ private String drugLogId;
+
+ @Column(name = "DEPT_ID_", length = 21)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String deptId;
+
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
+
+ @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/fzzy40/entity/Fz40DrugLogWay.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogWay.java
new file mode 100644
index 0000000..50efdb5
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogWay.java
@@ -0,0 +1,65 @@
+package com.fzzy.async.fzzy40.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+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
+ */
+@Data
+@Entity
+@Table(name = "D_DRUG_LOG_WAY")
+public class Fz40DrugLogWay implements Serializable {
+
+ @Id
+ @Column(name = "WAY_ID_", length = 40)
+ @PropertyDef(label = "wayId")
+ private String wayId;
+
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "id")
+ @JSONField
+ private String id;
+
+ @Column(name = "DRUG_LOG_ID_", length = 4)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ @JSONField
+ private String drugLogId;
+
+ @Column(name = "DEPT_ID_", length = 21)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ @JSONField
+ private String deptId;
+
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
+
+ @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/fzzy40/entity/Fz4DrugLogApply.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz4DrugLogApply.java
new file mode 100644
index 0000000..35d20fd
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz4DrugLogApply.java
@@ -0,0 +1,170 @@
+package com.fzzy.async.fzzy40.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+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;
+import java.util.List;
+
+/**
+ * 鐔忚捀澶囨涓昏〃淇℃伅
+ *
+ * @Author:YAN
+ */
+@Entity
+@Data
+@Table(name = "D_DRUG_LOG_APPLY")
+public class Fz4DrugLogApply implements Serializable {
+
+ @Id
+ @Column(name = "xzbm", length = 4)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ private String xzbm;
+
+ @Id
+ @Column(name = "DEPT_ID_", length = 21)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String deptId;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Id
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
+
+ @Column(name = "dwdm", length = 18)
+ @PropertyDef(label = "鍗曚綅浠ｇ爜", description = "浼佷笟淇＄敤浠ｇ爜")
+ private String dwdm;
+
+ @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 = "FILE_STORAGE_ID_", length = 19)
+ @PropertyDef(label = "鏂囦欢瀛樺偍ID")
+ private String fileStorageId;
+
+ @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<Fz40DrugLogDtl> drugLogDtls;
+
+ /**
+ * 鐔忚捀澶囨鏂瑰紡
+ */
+ @Transient
+ private List<Fz40DrugLogWay> drugLogWays;
+
+ /**
+ * 鐔忚捀浣滀笟浜哄憳
+ */
+ @Transient
+ private List<Fz40DrugLogPeople> drugLogPeople;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
new file mode 100644
index 0000000..1df9693
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -0,0 +1,158 @@
+package com.fzzy.async.fzzy40.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.utils.ContextUtil;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.async.fzzy40.entity.*;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1023Rep;
+import com.fzzy.async.fzzy40.repository.Fzzy40SyncDrugLogDtlRep;
+import com.fzzy.async.fzzy40.repository.Fzzy40SyncDrugLogPeopleRep;
+import com.fzzy.async.fzzy40.repository.Fzzy40SyncDrugLogWayRep;
+import com.fzzy.otherview.gd2022.dto.GdApi1023;
+import com.fzzy.otherview.gd2022.dto.GdApi1023Dtl;
+import com.fzzy.otherview.gd2022.dto.GdApi1023People;
+import com.fzzy.otherview.gd2022.dto.GdApi1023Way;
+import com.fzzy.push.gd2022.ApiCodeConstant;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐔忚捀澶囨淇℃伅
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1023 {
+ @Autowired
+ private Fzzy40Sync1023Rep fzzy40Sync1023Rep;
+ @Autowired
+ private Fzzy40SyncDrugLogPeopleRep drugLogPeopleRep;
+ @Autowired
+ private Fzzy40SyncDrugLogWayRep drugLogWayRep;
+ @Autowired
+ private Fzzy40SyncDrugLogDtlRep drugLogDtlRep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+
+ /**
+ * 鍚屾鐔忚捀澶囨淇℃伅
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(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(Constant.API_CODE_1107);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz4DrugLogApply> list = fzzy40Sync1023Rep.listDrugLogApply(deptId);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒扮啅钂稿妗堜俊鎭�------------------");
+ return;
+ }
+
+ List<GdApi1023Dtl> dtlList = new ArrayList<>();
+ List<GdApi1023Way> wayList = new ArrayList<>();
+ List<GdApi1023People> peopleList = new ArrayList<>();
+ for (Fz4DrugLogApply data : list) {
+ //鍌ㄧ伯绮儏鏄庣粏琛�
+ String tbrq = "";
+ if(null != data.getTbrq()){
+ tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
+ }
+ List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm()+data.getDeptId()+tbrq);
+ for (Fz40DrugLogDtl dtl : dtls) {
+ GdApi1023Dtl 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);
+ }
+ List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm()+data.getDeptId()+tbrq);
+ for (Fz40DrugLogWay way : ways) {
+ GdApi1023Way gdApi1023Way = new GdApi1023Way();
+ BeanUtils.copyProperties(way, gdApi1023Way);
+ wayList.add(gdApi1023Way);
+ }
+ List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm()+data.getDeptId()+tbrq);
+ for (Fz40DrugLogPeople people : peoples) {
+ GdApi1023People gdApi1023People = new GdApi1023People();
+ BeanUtils.copyProperties(people, gdApi1023People);
+ peopleList.add(gdApi1023People);
+
+ }
+
+ GdApi1023 gdApi1023 = new GdApi1023();
+ BeanUtils.copyProperties(data , gdApi1023);
+ gdApi1023.setXzbm(data.getXzbm());
+ gdApi1023.setKqdm(data.getDeptId());
+ gdApi1023.setYjmc(data.getDrugName());
+ gdApi1023.setYjlx(data.getDrugType());
+ gdApi1023.setZhgxsj(data.getUpdateTime());
+
+ gdApi1023.setDtls(dtlList);
+ gdApi1023.setWays(wayList);
+ gdApi1023.setPeoples(peopleList);
+
+ //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(ContextUtil.getUUID());
+ infoData.setKqdm(data.getDeptId());
+ infoData.setInteType(Constant.API_CATEGORY_13);
+ infoData.setInteId(ApiCodeConstant.API_1023);
+ infoData.setBizType(PushProtocol.SB_GD_2022.getCode());
+ infoData.setUpdateTime(data.getUpdateTime());
+ infoData.setDataId(data.getXzbm() + data.getDeptId() + DateFormatUtils.format(data.getTbrq(), "yyMMdd"));
+
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByDataId(data.getXzbm() + data.getDeptId() + DateFormatUtils.format(data.getTbrq(), "yyMMdd"));
+ if (null == apiInfoList || apiInfoList.isEmpty()) {
+ gdApi1023.setCzbz(Constant.CZBZ_I);
+ infoData.setCzbz(Constant.CZBZ_I);
+ } else {
+ gdApi1023.setCzbz(apiInfoList.get(0).getCzbz());
+ infoData.setCzbz(apiInfoList.get(0).getCzbz());
+ }
+
+ infoData.setData(JSON.toJSONString(gdApi1023));
+
+ //淇濆瓨鏁版嵁
+ apiInfoDataRep.save(infoData);
+ log.info("1023---鍚屾鏁版嵁锛歿}", gdApi1023.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---璁惧淇℃伅鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("璁惧淇℃伅鍚屾鎵ц澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1023Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1023Rep.java
new file mode 100644
index 0000000..207f07c
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1023Rep.java
@@ -0,0 +1,22 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.*;
+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 Fzzy40Sync1023Rep extends JpaRepository<Fz40DeptDevice, String> {
+
+ //鏌ヨ鐔忚捀澶囨涓昏〃
+ @Query("from Fz4DrugLogApply where deptId =:deptId")
+ List<Fz4DrugLogApply> listDrugLogApply(@Param("deptId") String deptId);
+
+ }
diff --git a/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml b/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
index 360037f..11991fa 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
+++ b/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
@@ -3,9 +3,535 @@
<Arguments/>
<Context/>
<Model>
-
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.otherview.gd2022.dto.GdApi1023</Property>
+ <PropertyDef name="xzbm">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="kqdm">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="tbrq">
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="dwdm">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="sqxzrq">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="fzr">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="fzrdh">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="xcfzr">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="xcfzrzw">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="xcfzrdh">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="tbr">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="tbrdh">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="sfszjjxd">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="sfszjjxx">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="sfszjjxn">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="sfszjjxb">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="ssxzzystqybqk">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="xzssgcap">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="aqfhjyjcccs">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="xzzysx">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="fileStorageId">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="yjmc">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="yjlx">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="yjyxqz">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="lqsl">
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="sysbjfs">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="zcdd">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="lqr">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="lqrq">
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="zhgxsj">
+ <Property/>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtGBArea">
+ <Property name="creationType">com.fzzy.api.entity.GbArea</Property>
+ </DataType>
</Model>
<View layout="regionPadding:10">
-
+ <DataSet id="dsMain">
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="dataProvider">whjlApi1101PR#listData</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="height">55</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").insert();
+view.get("#dialogMain").show();</ClientEvent>
+ <Property name="iconClass">fa fa-plus</Property>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">缂栬緫</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ <Property name="exClassName">btn-warm</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#ajaxDel").set("parameter",cur).execute(function(result){
+ if(result){
+ $alert(result);
+ } else{
+ cur.remove();
+ }
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佸垹闄ょ殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();</ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var select = view.get("#dgMain").get("selection");
+if(select && select.length > 0){
+ view.get("#ajaxPush").set("parameter",select).execute(function(result){
+ view.get("#dsMain").flushAsync();
+ $notify(result);
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷笂鎶ョ殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">鎵嬪姩涓婁紶</Property>
+ <Property name="iconClass">fa fa-hand-o-up</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">//鏄剧ず璁板綍
+view.get("#iFrame").reload();
+view.get("#dialogLog").show();</ClientEvent>
+ <Property name="caption">涓婁紶璁板綍</Property>
+ <Property name="iconClass">fa fa-bars</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ </Container>
+ <Container layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <DataGrid id="dgMain">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
+if(data){
+ view.get("#dialogMain").show();
+}</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="selectionMode">multiRows</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <RowSelectorColumn>
+ <Property name="caption">涓婁紶</Property>
+ </RowSelectorColumn>
+ <DataColumn name="jlqybh">
+ <Property name="property">jlqybh</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="jlqymc">
+ <Property name="property">jlqymc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="jlqytyshxydm">
+ <Property name="property">jlqytyshxydm</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="jlqylx">
+ <Property name="property">jlqylx</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="qyxz">
+ <Property name="property">qyxz</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="gsdjzch">
+ <Property name="property">gsdjzch</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="sfjbjlcbzg">
+ <Property name="property">sfjbjlcbzg</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="fddbr">
+ <Property name="property">fddbr</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="sfyx">
+ <Property name="property">sfyx</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="width">85%</Property>
+ <Property name="closeable">false</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Property name="caption">鍐涚伯浼佷笟淇℃伅</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+view.get("#updateSave").execute(function(){
+ self.get("parent").hide();
+ view.get("#dsMain").flushAsync();
+});</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+self.get("parent").hide();
+if(cur) cur.cancel();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="labelPosition">top</Property>
+ <Property name="labelSeparator">:</Property>
+ <AutoFormElement>
+ <Property name="name">jlqybh</Property>
+ <Property name="property">jlqybh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlqymc</Property>
+ <Property name="property">jlqymc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlqyjc</Property>
+ <Property name="property">jlqyjc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlzzjgdm</Property>
+ <Property name="property">jlzzjgdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlqytyshxydm</Property>
+ <Property name="property">jlqytyshxydm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlqylx</Property>
+ <Property name="property">jlqylx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qyjjlx</Property>
+ <Property name="property">qyjjlx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qyxz</Property>
+ <Property name="property">qyxz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">djzclx</Property>
+ <Property name="property">djzclx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">gsdjzch</Property>
+ <Property name="property">gsdjzch</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfjbjlcbzg</Property>
+ <Property name="property">sfjbjlcbzg</Property>
+ <Property name="trigger">listDropYN</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fddbr</Property>
+ <Property name="property">fddbr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qydz</Property>
+ <Property name="property">qydz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qydh</Property>
+ <Property name="property">qydh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qycz</Property>
+ <Property name="property">qycz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qydzyx</Property>
+ <Property name="property">qydzyx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qywz</Property>
+ <Property name="property">qywz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qyyzbm</Property>
+ <Property name="property">qyyzbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qyjd</Property>
+ <Property name="property">qyjd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qywd</Property>
+ <Property name="property">qywd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qyxzqhmc</Property>
+ <Property name="property">qyxzqhmc</Property>
+ <Property name="trigger">cddGbArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qyxzqhdm</Property>
+ <Property name="property">qyxzqhdm</Property>
+ <Property name="trigger">cddGbArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">khyh</Property>
+ <Property name="property">khyh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yhzh</Property>
+ <Property name="property">yhzh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yhxydj</Property>
+ <Property name="property">yhxydj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">gdzc</Property>
+ <Property name="property">gdzc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zczb</Property>
+ <Property name="property">zczb</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zc</Property>
+ <Property name="property">zc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qycyrys</Property>
+ <Property name="property">qycyrys</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfyx</Property>
+ <Property name="property">sfyx</Property>
+ <Property name="trigger">listDropYN</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="updateSave">
+ <Property name="dataResolver">whjlApi1101PR#saveData</Property>
+ <UpdateItem>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="dataSet">dsMain</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
+ <Property name="service">whjlApi1101PR#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPush">
+ <Property name="service">whjlApi1101PR#pushData</Property>
+ </AjaxAction>
+ <CustomDropDown id="cddGbArea">
+ <Property name="assignmentMap">qyxzqhdm=code,qyxzqhmc=name</Property>
+ <Property name="height">500</Property>
+ <Property name="minHeight">500</Property>
+ <Property name="maxHeight">500</Property>
+ <Property name="width">400</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsGBArea">
+ <Property name="dataProvider">gbAreaPR#findByCode</Property>
+ <Property name="dataType">[dtGBArea]</Property>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key2">
+ <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key2.value");
+view.get("#dsGBArea").set("parameter",{key:key}).flushAsync();</ClientEvent>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="caption">鏌ヨ</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsGBArea.data:#");
+if (data) {
+ view.get("#cddGbArea").close(data.toJSON());
+}</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsGBArea.data:#");
+if(data){
+ view.get("#cddGbArea").close(data.toJSON());
+}</ClientEvent>
+ <Property name="dataSet">dsGBArea</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="code">
+ <Property name="property">code</Property>
+ </DataColumn>
+ <DataColumn name="name">
+ <Property name="property">name</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ </CustomDropDown>
+ <Dialog id="dialogLog">
+ <Property name="width">90%</Property>
+ <Property name="height">90%</Property>
+ <Property name="caption">涓婁紶璁板綍</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍏抽棴</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <Container>
+ <IFrame id="iFrame">
+ <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
+ <Property name="userData">
+ <Entity>
+ <Property name="deptId">deptId</Property>
+ </Entity>
+ </Property>
+ </IFrame>
+ </Container>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <ListDropDown id="listDropYN">
+ <Property name="items">鏄�,鍚�</Property>
+ </ListDropDown>
</View>
</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
index 9ff21d9..ebab59f 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
@@ -1,12 +1,15 @@
package com.fzzy.otherview.gd2022.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
/**
- * 骞夸笢鐪佹帴鍙�-1023 鐔忚捀澶囨
+ * 骞夸笢鐪佹帴鍙�-1023 鐔忚捀澶囨(涓昏〃)
*
* @author czt
* @date 2023/8/17
@@ -19,5 +22,52 @@
*/
private static final long serialVersionUID = 1L;
+ private String xzbm; //鐔忚捀缂栫爜
+ private String kqdm; //搴撳尯浠ｇ爜
+
+ @JSONField(format = "yyyy-MM-dd")
+ private Date tbrq; //濉姤鏃ユ湡
+
+ private String dwdm; //鍗曚綅浠ｇ爜
+
+ @JSONField(format = "yyyy-MM-dd")
+ private Date sqxzrq; //鐢宠鐔忚捀鏃ユ湡
+
+ private String fzr; //璐熻矗浜�
+ private String fzrdh; //璐熻矗浜虹數璇�
+ private String xcfzr; //鐜板満璐熻矗浜�
+ private String xcfzrzw; //鐜板満璐熻矗浜鸿亴鍔�
+ private String xcfzrdh; //鐜板満璐熻矗浜虹數璇�
+ private String tbr; //濉〃浜�
+ private String tbrdh; //濉〃浜虹數璇�
+ private String sfszjjxd; //鏄惁璁剧疆璀︽垝绾�(涓�)
+ private String sfszjjxx; //鏄惁璁剧疆璀︽垝绾�(瑗�)
+ private String sfszjjxn; //鏄惁璁剧疆璀︽垝绾�(鍗�)
+ private String sfszjjxb; //鏄惁璁剧疆璀︽垝绾�(鍖�)
+ private String ssxzzystqybqk; //瀹炴柦鐔忚捀浣滀笟鏃跺ぉ姘旈鎶ユ儏鍐�
+ private String xzssgcap; //鐔忚捀瀹夋帓鍙婂疄鏂借繃绋�
+ private String aqfhjyjcccs; //瀹夊叏闃叉姢鍙婂簲鎬ュ缃帾鏂�
+ private String xzzysx; //鐔忚捀娉ㄦ剰浜嬮」
+ private String fileStorageId; //鏂囦欢瀛樺偍 ID
+ private String yjmc; //鑽墏鍚嶇О
+ private String yjlx; //鑽墏绫诲瀷/鍨嬪彿
+ private String yjyxqz; //鑽墏鏈夋晥鏈熻嚦
+ private Double lqsl; //棰嗗彇鏁伴噺(鍏枻)
+ private String sysbjfs; //鏂借嵂璁惧鍙婃柟寮�
+ private String zcdd; //鏆傚瓨鍦扮偣
+ private String lqr; //棰嗗彇浜�
+ private Date lqrq; //棰嗗彇鏃堕棿
+ private String czbz; //鎿嶄綔鏍囧織
+ private Date zhgxsj; //鏈�鍚庢洿鏂版椂闂�
+
+
+ private List<GdApi1023Dtl> dtls; //瀹炴柦鐔忚捀浣滀笟鐨勫偍绮伯鎯呮槑缁�
+ private List<GdApi1023People> peoples; //鐔忚捀浣滀笟浜哄憳淇℃伅
+ private List<GdApi1023Way> ways; //鐔忚捀澶囨鏂瑰紡
+
+
+
+
+
}
diff --git a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java
new file mode 100644
index 0000000..93a980a
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java
@@ -0,0 +1,42 @@
+package com.fzzy.otherview.gd2022.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 瀹炴柦鐔忚捀浣滀笟鐨勫偍绮伯鎯呮槑缁嗚〃(dtl)锛�
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GdApi1023Dtl implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String cfdm; //浠撴埧/娌圭綈浠ｇ爜
+ private String lspzdm; //绮鍝佺浠ｇ爜
+ private String lsxzdm; //绮鎬ц川浠ｇ爜
+ private String lsdjdm; //绮绛夌骇浠ｇ爜
+ private Double lssl; //绮鏁伴噺(鍚�)
+ private Double sf; //姘翠唤
+ private Double zz; //鏉傚織
+ private Double lw; //绮俯
+ private Double cw; //浠撴俯
+ private Double cnsd; //浠撳唴婀垮害
+ private String clfs; //鍌ㄧ伯鏂瑰紡
+ private Date rkrq; //鍏ュ簱鏃ユ湡
+ private String hc; //瀹宠櫕
+ private String cldjpd; //铏伯绛夌骇鍒ゅ畾
+ private Double ldtj; //绮爢浣撶Н(m3)
+ private Double kjtj; //绌洪棿浣撶Н(m3)
+ private Double lddwyyl; //绮爢鍗曚綅鐢ㄨ嵂閲�
+ private Double kjdwyyl; //绌洪棿鍗曚綅鐢ㄨ嵂閲�
+ private Double zyyl; //鎬荤敤鑽噺
+ private String qmx; //姘斿瘑鎬�
+ private Date jhxzksrq; //璁″垝鐔忚捀寮�濮嬫棩鏈�
+ private Date jhxzjsrq; //璁″垝鐔忚捀缁撴潫鏃ユ湡
+
+
+}
diff --git a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023People.java b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023People.java
new file mode 100644
index 0000000..5c773dc
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023People.java
@@ -0,0 +1,21 @@
+package com.fzzy.otherview.gd2022.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GdApi1023People implements Serializable {
+
+
+ private static final long serialVersionUID = 1L;
+
+ private String xm; //濮撳悕
+ private String zw; //鑱屽姟
+ private String zyzg; //鑱屼笟璧勬牸
+ private String stzk; //韬綋鐘跺喌
+ private String xzrwfg; //鐔忚捀浠诲姟鍒嗗伐
+ private String sfwb; //鏄惁澶栧寘
+}
diff --git a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Way.java b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Way.java
new file mode 100644
index 0000000..6cac77f
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Way.java
@@ -0,0 +1,20 @@
+package com.fzzy.otherview.gd2022.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GdApi1023Way implements Serializable {
+
+
+ private static final long serialVersionUID = 1L;
+
+ private String xznd; //璁惧畾鐔忚捀娴撳害(ml/m3)
+ private String mbsj; //瀵嗛棴鏃堕棿(澶�)
+ private String xzfs; //鐔忚捀鏂瑰紡
+ private String sqfs; //鏁ｆ皵鏂瑰紡
+
+}
diff --git a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
index 26923c6..fb3bca6 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
@@ -1,6 +1,19 @@
package com.fzzy.otherview.gd2022.pr;
+import com.alibaba.fastjson.JSONObject;
+import com.bstek.dorado.annotation.DataProvider;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.gd2022.dto.GdApi1023;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1101;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 骞夸笢鐪佹帴鍙�-1023 鐔忚捀澶囨
@@ -11,5 +24,36 @@
@Component
public class GDApi1023PR {
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1101PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public List<GdApi1023> listData() {
+ List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1101);
+ if(null == result ||result.isEmpty()){
+ return null;
+ }
+ List<GdApi1023> list = new ArrayList<>();
+ GdApi1023 gbApi1023;
+ for (ApiInfoData infoData : result) {
+// GdApi1023 gdApi1023= JSONObject.parseObject(infoData.getData(), GdApi1023.class);
+// gdApi1023.setKqdm(infoData.getKqdm());
+// gdApi1023.setCzbz(infoData.getCzbz());
+// gdApi1023.setUpdateTime(infoData.getUpdateTime());
+// gdApi1023.setBizId(infoData.getDataId());
+// list.add(GdApi1023);
+ }
+ return list;
+ }
}
diff --git a/src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java b/src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java
index 07f0480..347eaff 100644
--- a/src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java
+++ b/src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java
@@ -6,6 +6,7 @@
public class ApiCodeConstant {
+ public static String API_1023 = "1023";
/**
* 鎺ュ彛缂栫爜-1001 韬唤璁よ瘉鎺ュ彛
*/
--
Gitblit v1.9.3