From 246752d298f9955b1112c3028f271d546fd3bc3b Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 18 十月 2023 16:39:44 +0800
Subject: [PATCH] 调整单位、库区、仓房、廒间、货位等基础信息
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java | 2
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java | 12
src/main/java/com/fzzy/push/gd2020/v2/GranaryWebService.java | 1
src/main/java/com/fzzy/api/entity/Api1105.java | 39
src/main/java/com/fzzy/api/view/Api1104.view.xml | 209 +-
src/main/java/com/fzzy/api/entity/Api1102.java | 70
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java | 32
src/main/java/com/fzzy/api/view/Api1101.view.xml | 504 +++++---
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1103.java | 190 +++
src/main/java/com/fzzy/api/view/SecCamera.view.xml | 978 +++++++++++++++
src/main/java/com/fzzy/api/entity/Api1104.java | 77
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 21
src/main/java/com/fzzy/api/entity/Api1101.java | 110 +
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java | 18
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 18
src/main/java/com/fzzy/api/view/Api1103.view.xml | 623 +++++----
src/main/java/com/fzzy/api/view/ApiConfs.view.xml | 8
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1104.java | 59
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 43
src/main/java/com/fzzy/api/view/Api1102.view.xml | 315 +++-
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1102.java | 78 +
src/main/java/com/fzzy/api/entity/Api1103.java | 43
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java | 8
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java | 8
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1105.java | 50
src/main/java/com/fzzy/api/view/Api1105.view.xml | 155 +-
26 files changed, 2,685 insertions(+), 986 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1101.java b/src/main/java/com/fzzy/api/entity/Api1101.java
index ca41c52..f6dfcf5 100644
--- a/src/main/java/com/fzzy/api/entity/Api1101.java
+++ b/src/main/java/com/fzzy/api/entity/Api1101.java
@@ -3,69 +3,65 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
-
import org.springframework.format.annotation.DateTimeFormat;
-
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 chen
- * @date 2022-09-02 14:18
+ * @author czt
+ * @date 2023-10-18
*/
@Data
@Entity
@Table(name = "API_1101")
@EqualsAndHashCode(callSuper = false)
-public class Api1101 extends ApiParent implements Serializable {
- /**
- *
- */
+public class Api1101 implements Serializable {
+
private static final long serialVersionUID = 9157617424050247565L;
+
+ /*----------鍥芥爣瀛楁----------*/
@Id
@PropertyDef(label = "鍗曚綅浠ｇ爜")
- @Column(name = "dwdm", length = 18, nullable = false)
+ @Column(name = "dwdm", length = 18)
private String dwdm;
@PropertyDef(label = "鍗曚綅鍚嶇О")
- @Column(name = "dwmc", length = 256, nullable = false)
+ @Column(name = "dwmc", length = 256)
private String dwmc;
@PropertyDef(label = "鍗曚綅绫诲瀷")
- @Column(name = "dwlx", length = 2, nullable = false)
+ @Column(name = "dwlx", length = 2)
private String dwlx;
@PropertyDef(label = "娉ㄥ唽鏃ユ湡")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@JSONField(format = "yyyy-MM-dd")
- @Column(name = "zcrq", nullable = false)
+ @Column(name = "zcrq")
private Date zcrq;
@PropertyDef(label = "娉ㄥ唽璧勬湰")
@Column(name = "zczb", precision = 20, scale = 6)
- private double zczb;
+ private Double zczb;
@PropertyDef(label = "璧勪骇鎬婚")
@Column(name = "zcze", precision = 20, scale = 6)
- private double zcze;
+ private Double zcze;
@PropertyDef(label = "娉曞畾浠ｈ〃浜�")
- @Column(name = "fddbr", length = 100, nullable = false)
+ @Column(name = "fddbr", length = 100)
private String fddbr;
@PropertyDef(label = "娉曚汉韬唤璇佸彿")
- @Column(name = "frsfzh", length = 18, nullable = false)
+ @Column(name = "frsfzh", length = 18)
private String frsfzh;
@PropertyDef(label = "娉曚汉鑱旂郴鏂瑰紡")
@@ -73,15 +69,15 @@
private String frlxfs;
@PropertyDef(label = "浼佷笟鑱旂郴浜�")
- @Column(name = "qylxr", length = 100, nullable = false)
+ @Column(name = "qylxr", length = 100)
private String qylxr;
@PropertyDef(label = "鍔炲叕鐢佃瘽")
- @Column(name = "bgdh", length = 50, nullable = false)
+ @Column(name = "bgdh", length = 50)
private String bgdh;
@PropertyDef(label = "娉ㄥ唽鍦板潃")
- @Column(name = "zcdz", length = 512, nullable = false)
+ @Column(name = "zcdz", length = 512)
private String zcdz;
@PropertyDef(label = "鐢靛瓙閭")
@@ -97,17 +93,12 @@
private String czhm;
@PropertyDef(label = "閭斂缂栫爜")
- @Column(name = "yzbm", length = 6, nullable = false)
+ @Column(name = "yzbm", length = 6)
private String yzbm;
@PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
- @Column(name = "xzqhdm", length = 6, nullable = false)
+ @Column(name = "xzqhdm", length = 6)
private String xzqhdm;
-
- @JSONField(serialize = false)
- @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞")
- @Column(name = "xzqhmc", length = 20)
- private String xzqhmc;
@PropertyDef(label = "涓婄骇鍗曚綅鍚嶇О")
@Column(name = "sjdwmc", length = 256)
@@ -118,29 +109,40 @@
private String sjdwdm;
@PropertyDef(label = "搴撳尯鏁�")
- @Column(name = "kqs", nullable = false)
+ @Column(name = "kqs")
private Integer kqs;
@PropertyDef(label = "浠撴埧鏁�")
- @Column(name = "cfs", nullable = false)
+ @Column(name = "cfs")
private Integer cfs;
@PropertyDef(label = "娌圭綈鏁�")
- @Column(name = "ygs", nullable = false)
+ @Column(name = "ygs")
private Integer ygs;
@PropertyDef(label = "缁忓害")
- @Column(name = "jd", precision = 20, scale = 6, nullable = false)
- private double jd;
+ @Column(name = "jd", precision = 20, scale = 6)
+ private Double jd;
@PropertyDef(label = "绾害")
- @Column(name = "wd", precision = 20, scale = 6, nullable = false)
- private double wd;
+ @Column(name = "wd", precision = 20, scale = 6)
+ private Double wd;
@PropertyDef(label = "鍗曚綅鐘舵��")
@Column(name = "dwzt",length = 1)
private String dwzt;
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @Column(name = "czbz", length = 1)
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+
+ /*----------骞夸笢鐪佸钩鍙拌鑼冨瓧娈�----------*/
@Column(name = "balx", length = 1)
@PropertyDef(label = "澶囨绫诲瀷", description = "0:鍒濇澶囨 1:鍙樻洿澶囨 2:閲嶆柊澶囨")
private String balx;
@@ -157,13 +159,35 @@
@PropertyDef(label = "澶囨鐘舵��")
private String bazt;
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- @Column(name = "czbz", length = 1, nullable = false)
- private String czbz;
- @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @Column(name = "zhgxsj", nullable = false)
- private Date zhgxsj;
+ /*----------涓婃捣甯傚钩鍙拌鑼冨瓧娈�----------*/
+ @PropertyDef(label = "寤掗棿鏁�")
+ @Column(name = "ajs")
+ private Integer ajs;
+ @PropertyDef(label = "鏍囪浣�")
+ @Column(name = "bjw", length = 40)
+ private String bjw;
+
+
+ /*----------鎺ュ彛绯荤粺鑷畾涔夊瓧娈�----------*/
+ @JSONField(serialize = false)
+ @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞")
+ @Column(name = "xzqhmc", length = 20)
+ private String xzqhmc;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ @Column(name = "bizId", length = 40)
+ private String bizId;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ @Column(name = "kqdm", length = 21)
+ private String kqdm;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
+ @Column(name = "syncTime")
+ private Date syncTime;
}
diff --git a/src/main/java/com/fzzy/api/entity/Api1102.java b/src/main/java/com/fzzy/api/entity/Api1102.java
index 801c79d..92a190f 100644
--- a/src/main/java/com/fzzy/api/entity/Api1102.java
+++ b/src/main/java/com/fzzy/api/entity/Api1102.java
@@ -22,21 +22,13 @@
@Table(name = "API_1102")
public class Api1102 implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 6597930270077627879L;
-
+ /*----------鍥芥爣瀛楁----------*/
@Id
@PropertyDef(label = "搴撳尯浠ｇ爜")
@Column(name = "kqdm", length = 21)
private String kqdm;
-
- @JsonIgnore
- @PropertyDef(label = "涓氬姟id")
- @Column(name = "bizId", length = 40)
- private String bizId;
@PropertyDef(label = "鍗曚綅浠ｇ爜")
@Column(name = "dwdm", length = 18)
@@ -54,26 +46,21 @@
@Column(name = "xzqhdm", length = 6)
private String xzqhdm;
- @JSONField(serialize = false)
- @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞")
- @Column(name = "xzqhmc", length = 20)
- private String xzqhmc;
-
@PropertyDef(label = "搴撳尯浜ф潈", description = "1锛� 鑷湁 2锛氱璧� 3锛氬叡鏈� 4锛氭贩鍚� 9锛氬叾浠�")
@Column(name = "kqcq", length = 1)
private String kqcq;
@PropertyDef(label = "鏈夋晥浠撳")
@Column(name = "yxcr", precision = 20, scale = 6)
- private double yxcr;
+ private Double yxcr;
@PropertyDef(label = "鏈夋晥缃愬")
@Column(name = "yxgr", precision = 20, scale = 6)
- private double yxgr;
+ private Double yxgr;
@PropertyDef(label = "鍗犲湴闈㈢Н")
@Column(name = "zdmj", precision = 20, scale = 6)
- private double zdmj;
+ private Double zdmj;
@PropertyDef(label = "浠撴埧鏁�")
@Column(name = "cfs")
@@ -85,23 +72,15 @@
@PropertyDef(label = "搴撳尯缁忓害")
@Column(name = "jd", precision = 20, scale = 6)
- private double jd;
+ private Double jd;
@PropertyDef(label = "搴撳尯绾害")
@Column(name = "wd", precision = 20, scale = 6)
- private double wd;
+ private Double wd;
@PropertyDef(label = "搴撳尯鐘舵��", description = "1:姝ｅ父锛堥粯璁わ級 2:閫�鍑哄偍澶囩伯鎵垮偍")
@Column(name = "kqzt", length = 1)
private String kqzt;
-
- @PropertyDef(label = "娴峰悍鍖哄煙ID", description = "瀵瑰簲娴峰悍瑙嗛骞冲彴regionIndexCode瀛楁")
- @Column(name = "hkRegionId", length = 36)
- private String hkRegionId;
-
- @PropertyDef(label = "浜ф潈鏂瑰簱鍖轰唬鐮�", description = "鑷湁浜ф潈鏃跺簱鍖轰唬鐮佸繀椤荤瓑浜庝骇鏉冩柟搴撳尯浠ｇ爜,闈炶嚜鏈変骇鏉冩椂搴撳尯浠ｇ爜涓嶈兘绛変簬浜ф潈鏂瑰簱鍖轰唬鐮�")
- @Column(name = "cqfkqdm", length = 21)
- private String cqfkqdm;
@PropertyDef(label = "鎿嶄綔鏍囧織")
@Column(name = "czbz", length = 1)
@@ -112,9 +91,44 @@
@Column(name = "zhgxsj", nullable = false)
private Date zhgxsj;
+
+ /*----------骞夸笢鐪佸钩鍙拌鑼冨瓧娈�----------*/
+ @PropertyDef(label = "娴峰悍鍖哄煙ID", description = "瀵瑰簲娴峰悍瑙嗛骞冲彴regionIndexCode瀛楁")
+ @Column(name = "hkRegionId", length = 36)
+ private String hkRegionId;
+
+ @PropertyDef(label = "浜ф潈鏂瑰簱鍖轰唬鐮�", description = "鑷湁浜ф潈鏃跺簱鍖轰唬鐮佸繀椤荤瓑浜庝骇鏉冩柟搴撳尯浠ｇ爜,闈炶嚜鏈変骇鏉冩椂搴撳尯浠ｇ爜涓嶈兘绛変簬浜ф潈鏂瑰簱鍖轰唬鐮�")
+ @Column(name = "cqfkqdm", length = 21)
+ private String cqfkqdm;
+
+
+ /*----------涓婃捣甯傚钩鍙拌鑼冨瓧娈�----------*/
@PropertyDef(label = "搴撳尯灞炴��", description = "1:甯傜骇鐩村睘锛�2:鍖虹骇鐩村睘锛�3:绀句細浠撳锛�4:鍏朵粬")
- @JSONField(serialize = false)
@Column(name = "kqsx", length = 1)
private String kqsx;
+ @PropertyDef(label = "寤掗棿鏁�")
+ @Column(name = "ajs")
+ private Integer ajs;
+
+ @PropertyDef(label = "鏍囪浣�")
+ @Column(name = "bjw", length = 40)
+ private String bjw;
+
+ @PropertyDef(label = "鍌ㄥ浠撳")
+ @Column(name = "cbcr")
+ private Double cbcr;
+
+
+ /*----------鎺ュ彛绯荤粺鑷畾涔夊瓧娈�----------*/
+ @JsonIgnore
+ @PropertyDef(label = "涓氬姟id")
+ @Column(name = "bizId", length = 40)
+ private String bizId;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞")
+ @Column(name = "xzqhmc", length = 20)
+ private String xzqhmc;
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/api/entity/Api1103.java b/src/main/java/com/fzzy/api/entity/Api1103.java
index 20404f8..d510e2e 100644
--- a/src/main/java/com/fzzy/api/entity/Api1103.java
+++ b/src/main/java/com/fzzy/api/entity/Api1103.java
@@ -4,7 +4,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -21,22 +20,9 @@
@EqualsAndHashCode(callSuper=false)
public class Api1103 implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 8095346227076335949L;
- @JSONField(serialize = false)
- @PropertyDef(label = "涓氬姟id")
- @Column(name = "bizId", length = 40)
- private String bizId;
-
-
- @JSONField(serialize = false)
- @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
- @Column(name = "syncTime")
- private Date syncTime;
-
+ /*----------鍥芥爣瀛楁----------*/
@Id
@PropertyDef(label = "浠撴埧浠ｇ爜" )
@Column(name = "cfdm", length = 25)
@@ -56,7 +42,7 @@
@PropertyDef(label = "浜や粯浣跨敤鏃ユ湡" )
@JSONField(format = "yyyy-MM-dd")
- @Column(name = "jfsyrq", nullable = false)
+ @Column(name = "jfsyrq")
private Date jfsyrq;
@PropertyDef(label = "寤鸿鍗曚綅" )
@@ -249,11 +235,11 @@
@PropertyDef(label = "浠撴埧缁忓害" )
@Column(name = "jd", precision = 20, scale = 6)
- private double jd;
+ private Double jd;
@PropertyDef(label = "浠撴埧绾害" )
@Column(name = "wd", precision = 20, scale = 6)
- private double wd;
+ private Double wd;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
@Column(name = "czbz", length = 1)
@@ -261,10 +247,29 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
+ /*----------涓婃捣甯傚钩鍙拌鑼冨瓧娈�----------*/
+ @PropertyDef(label = "寤掗棿鏁�")
+ @Column(name = "ajs")
+ private Integer ajs;
+ @PropertyDef(label = "鏍囪浣�")
+ @Column(name = "bjw", length = 40)
+ private String bjw;
+
+
+ /*----------鎺ュ彛绯荤粺鑷畾涔夊瓧娈�----------*/
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ @Column(name = "bizId", length = 40)
+ private String bizId;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
+ @Column(name = "syncTime")
+ private Date syncTime;
}
diff --git a/src/main/java/com/fzzy/api/entity/Api1104.java b/src/main/java/com/fzzy/api/entity/Api1104.java
index 0a356b8..f93ac1f 100644
--- a/src/main/java/com/fzzy/api/entity/Api1104.java
+++ b/src/main/java/com/fzzy/api/entity/Api1104.java
@@ -2,13 +2,10 @@
import java.io.Serializable;
import java.util.Date;
-
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
-
import javax.persistence.*;
/**
@@ -21,50 +18,39 @@
@Entity
@Table(name = "API_1104")
@EqualsAndHashCode(callSuper = false)
-public class Api1104 extends ApiParent implements Serializable {
+public class Api1104 implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 9157617424050247565L;
+ /*----------鍥芥爣瀛楁----------*/
@Id
@PropertyDef(label = "寤掗棿浠ｇ爜")
- @Column(name = "ajdh", length = 28, nullable = false)
+ @Column(name = "ajdh", length = 28)
private String ajdh;
@PropertyDef(label = "寤掗棿鍚嶇О")
- @Column(name = "ajmc", length = 256, nullable = false)
+ @Column(name = "ajmc", length = 256)
private String ajmc;
@PropertyDef(label = "浠撴埧(鎴栨补缃�)缂栫爜")
- @Column(name = "cfbh", length = 25, nullable = false)
+ @Column(name = "cfbh", length = 25)
private String cfbh;
@PropertyDef(label = "寤掗棿闀垮害")
- @Column(name = "ajcd", precision = 8, scale = 4, nullable = false)
- private double ajcd;
+ @Column(name = "ajcd", precision = 8, scale = 4)
+ private Double ajcd;
@PropertyDef(label = "寤掗棿瀹藉害")
- @Column(name = "ajkd", precision = 8, scale = 4, nullable = false)
- private double ajkd;
+ @Column(name = "ajkd", precision = 8, scale = 4)
+ private Double ajkd;
@PropertyDef(label = "寤掗棿楂樺害")
- @Column(name = "ajgd", precision = 8, scale = 4, nullable = false)
- private double ajgd;
+ @Column(name = "ajgd", precision = 8, scale = 4)
+ private Double ajgd;
@PropertyDef(label = "寤掗棿璁捐浠撳")
- @Column(name = "ajsjcr", precision = 20, scale = 3, nullable = false)
- private double ajsjcr;
-
- @JSONField(serialize = false)
- @PropertyDef(label = "寤掗棿瀹為檯浠撳", description = "闈炲浗鏍囧瓧娈�")
- @Column(name = "ajsjcrong", precision = 20, scale = 3, nullable = false)
- private double ajsjcrong;
-
- @PropertyDef(label = "寤掗棿鑱旂郴鐢佃瘽")
- @Column(name = "ajlxdh", length = 20)
- private String ajlxdh;
+ @Column(name = "ajsjcr", precision = 20, scale = 3)
+ private Double ajsjcr;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "寤掗棿鍚敤鏃ユ湡")
@@ -72,16 +58,47 @@
private Date ajqyrq;
@PropertyDef(label = "寤掗棿鐘舵��")
- @Column(name = "ajzt", length = 1, nullable = false)
+ @Column(name = "ajzt", length = 1)
private String ajzt;
@PropertyDef(label = "鎿嶄綔鏍囧織")
- @Column(name = "czbz", length = 1, nullable = false)
+ @Column(name = "czbz", length = 1)
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
+
+ /*----------涓婃捣甯傚钩鍙拌鑼冨瓧娈�----------*/
+ @PropertyDef(label = "浣跨敤搴撳尯浠ｇ爜")
+ @Column(name = "sykqdm", length = 21)
+ private String sykqdm;
+
+ @PropertyDef(label = "寤掗棿鑱旂郴鐢佃瘽")
+ @Column(name = "ajlxdh", length = 20)
+ private String ajlxdh;
+
+ @PropertyDef(label = "鏍囪浣�")
+ @Column(name = "bjw", length = 40)
+ private String bjw;
+
+
+ /*----------鎺ュ彛绯荤粺鑷畾涔夊瓧娈�----------*/
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ @Column(name = "bizId", length = 40)
+ private String bizId;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ @Column(name = "kqdm", length = 21)
+ private String kqdm;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
+ @Column(name = "syncTime")
+ private Date syncTime;
+
}
diff --git a/src/main/java/com/fzzy/api/entity/Api1105.java b/src/main/java/com/fzzy/api/entity/Api1105.java
index 06c73aa..c7d13ec 100644
--- a/src/main/java/com/fzzy/api/entity/Api1105.java
+++ b/src/main/java/com/fzzy/api/entity/Api1105.java
@@ -2,16 +2,12 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-
import java.io.Serializable;
import java.util.Date;
@@ -22,13 +18,11 @@
@Entity
@Table(name = "API_1105")
@EqualsAndHashCode(callSuper=false)
-public class Api1105 extends ApiParent implements Serializable {
+public class Api1105 implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = -6967028172020353365L;
+ /*----------鍥芥爣瀛楁----------*/
@Id
@PropertyDef(label = "璐т綅浠ｇ爜" )
@Column(name = "hwdm", length = 30)
@@ -44,12 +38,12 @@
@PropertyDef(label = "璐т綅鍚敤鏃ユ湡" )
@JSONField(format = "yyyy-MM-dd")
- @Column(name = "hwqyrq", nullable = false)
+ @Column(name = "hwqyrq")
private Date hwqyrq;
@PropertyDef(label = "璐т綅瀹归噺" )
@Column(name = "hwrl", precision = 20, scale = 6)
- private double hwrl;
+ private Double hwrl;
@PropertyDef(label = "淇濈鍗曚綅" )
@Column(name = "bgdw", length = 128)
@@ -65,7 +59,30 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
+
+ /*----------涓婃捣甯傚钩鍙拌鑼冨瓧娈�----------*/
+ @PropertyDef(label = "鏍囪浣�")
+ @Column(name = "bjw", length = 40)
+ private String bjw;
+
+
+ /*----------鎺ュ彛绯荤粺鑷畾涔夊瓧娈�----------*/
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ @Column(name = "bizId", length = 40)
+ private String bizId;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ @Column(name = "kqdm", length = 21)
+ private String kqdm;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
+ @Column(name = "syncTime")
+ private Date syncTime;
+
}
diff --git a/src/main/java/com/fzzy/api/view/Api1101.view.xml b/src/main/java/com/fzzy/api/view/Api1101.view.xml
index 921af6c..6bb2923 100644
--- a/src/main/java/com/fzzy/api/view/Api1101.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1101.view.xml
@@ -119,6 +119,26 @@
<Property name="dataType">double</Property>
<Property name="label">绾害</Property>
</PropertyDef>
+ <PropertyDef name="dwzt">
+ <Property></Property>
+ <Property name="label">鍗曚綅鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">姝ｅ父</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">閫�鍑哄偍澶囩伯鎵垮偍</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
<PropertyDef name="czbz">
<Property></Property>
<Property name="label">鎿嶄綔鏍囧織</Property>
@@ -148,29 +168,85 @@
<Property></Property>
<Property name="label">浠撳偍鍝佺</Property>
</PropertyDef>
- <PropertyDef name="bazt">
+ <PropertyDef name="balx">
<Property></Property>
- <Property name="label">澶囨鐘舵��</Property>
- </PropertyDef>
- <PropertyDef name="dwzt">
- <Property></Property>
- <Property name="label">鍗曚綅鐘舵��</Property>
+ <Property name="label">澶囨绫诲瀷</Property>
<Property name="mapping">
<Property name="keyProperty">key</Property>
<Property name="valueProperty">value</Property>
<Property name="mapValues">
<Collection>
<Entity>
+ <Property name="key">0</Property>
+ <Property name="value">0-鍒濇澶囨</Property>
+ </Entity>
+ <Entity>
<Property name="key">1</Property>
- <Property name="value">姝ｅ父</Property>
+ <Property name="value">1-鍙樻洿澶囨</Property>
</Entity>
<Entity>
<Property name="key">2</Property>
- <Property name="value">閫�鍑哄偍澶囩伯鎵垮偍</Property>
+ <Property name="value">2-閲嶆柊澶囨</Property>
</Entity>
</Collection>
</Property>
</Property>
+ </PropertyDef>
+ <PropertyDef name="bazt">
+ <Property></Property>
+ <Property name="label">澶囨鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">0</Property>
+ <Property name="value">0-澶囨寰呭彈鐞�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1-宸插妗�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2-鍙樻洿寰呭彈鐞�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3-宸插彉鏇�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4-鍋滀笟寰呭彈鐞�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">5</Property>
+ <Property name="value">5-宸插仠涓�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">6</Property>
+ <Property name="value">6-澶囨瀹℃牳涓嶉�氳繃</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">7</Property>
+ <Property name="value">7-鍙樻洿瀹℃牳涓嶉�氳繃</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">8</Property>
+ <Property name="value">8-鍋滀笟瀹℃牳涓嶉�氳繃</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="bjw">
+ <Property></Property>
+ <Property name="label">鏍囪浣�</Property>
+ </PropertyDef>
+ <PropertyDef name="ajs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">寤掗棿鏁�</Property>
</PropertyDef>
</DataType>
<DataType name="dtGBArea">
@@ -422,7 +498,7 @@
<Property name="property">zhgxsj</Property>
</DataColumn>
</DataGrid>
- <Dialog id="dialogMain">
+ <Dialog id="dialogMain" layout="padding:5;regionPadding:5">
<Property name="width">1000</Property>
<Property name="caption">鍗曚綅淇℃伅</Property>
<Property name="iconClass">fa fa-sliders</Property>
@@ -450,189 +526,233 @@
</Button>
</Buttons>
<Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelWidth">100</Property>
- <Property name="labelAlign">left</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelPosition">top</Property>
- <AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
- <Property name="hideMode">display</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dwdm</Property>
- <Property name="property">dwdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dwmc</Property>
- <Property name="property">dwmc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dwlx</Property>
- <Property name="property">dwlx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zcrq</Property>
- <Property name="property">zcrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zczb</Property>
- <Property name="property">zczb</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zcze</Property>
- <Property name="property">zcze</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">fddbr</Property>
- <Property name="property">fddbr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">frsfzh</Property>
- <Property name="property">frsfzh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">frlxfs</Property>
- <Property name="property">frlxfs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qylxr</Property>
- <Property name="property">qylxr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bgdh</Property>
- <Property name="property">bgdh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zcdz</Property>
- <Property name="property">zcdz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dzyx</Property>
- <Property name="property">dzyx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qygfwzdz</Property>
- <Property name="property">qygfwzdz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czhm</Property>
- <Property name="property">czhm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">yzbm</Property>
- <Property name="property">yzbm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">xzqhdm</Property>
- <Property name="property">xzqhdm</Property>
- <Property name="hideMode">display</Property>
- <Property name="trigger">cddGbArea</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">xzqhmc</Property>
- <Property name="property">xzqhmc</Property>
- <Property name="hideMode">display</Property>
- <Property name="trigger">cddGbArea</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">sjdwmc</Property>
- <Property name="property">sjdwmc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">sjdwdm</Property>
- <Property name="property">sjdwdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kqs</Property>
- <Property name="property">kqs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cfs</Property>
- <Property name="property">cfs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ygs</Property>
- <Property name="property">ygs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jd</Property>
- <Property name="property">jd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">wd</Property>
- <Property name="property">wd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bizId</Property>
- <Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">balx</Property>
- <Property name="property">balx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ccywlx</Property>
- <Property name="property">ccywlx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ccpz</Property>
- <Property name="property">ccpz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bazt</Property>
- <Property name="property">bazt</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dwzt</Property>
- <Property name="property">dwzt</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
+ <GroupBox>
+ <Property name="caption">鍩虹淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Property name="hideMode">display</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwdm</Property>
+ <Property name="property">dwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwmc</Property>
+ <Property name="property">dwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwlx</Property>
+ <Property name="property">dwlx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zcrq</Property>
+ <Property name="property">zcrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zczb</Property>
+ <Property name="property">zczb</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zcze</Property>
+ <Property name="property">zcze</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fddbr</Property>
+ <Property name="property">fddbr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">frsfzh</Property>
+ <Property name="property">frsfzh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">frlxfs</Property>
+ <Property name="property">frlxfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qylxr</Property>
+ <Property name="property">qylxr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bgdh</Property>
+ <Property name="property">bgdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zcdz</Property>
+ <Property name="property">zcdz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dzyx</Property>
+ <Property name="property">dzyx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qygfwzdz</Property>
+ <Property name="property">qygfwzdz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czhm</Property>
+ <Property name="property">czhm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yzbm</Property>
+ <Property name="property">yzbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzqhdm</Property>
+ <Property name="property">xzqhdm</Property>
+ <Property name="hideMode">display</Property>
+ <Property name="trigger">cddGbArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzqhmc</Property>
+ <Property name="property">xzqhmc</Property>
+ <Property name="hideMode">display</Property>
+ <Property name="trigger">cddGbArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sjdwmc</Property>
+ <Property name="property">sjdwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sjdwdm</Property>
+ <Property name="property">sjdwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqs</Property>
+ <Property name="property">kqs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cfs</Property>
+ <Property name="property">cfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ygs</Property>
+ <Property name="property">ygs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jd</Property>
+ <Property name="property">jd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wd</Property>
+ <Property name="property">wd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwzt</Property>
+ <Property name="property">dwzt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ <GroupBox>
+ <Property name="caption">骞夸笢鐪佸钩鍙�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">balx</Property>
+ <Property name="property">balx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ccywlx</Property>
+ <Property name="property">ccywlx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ccpz</Property>
+ <Property name="property">ccpz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bazt</Property>
+ <Property name="property">bazt</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ <GroupBox>
+ <Property name="caption">涓婃捣甯傚钩鍙�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">ajs</Property>
+ <Property name="property">ajs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bjw</Property>
+ <Property name="property">bjw</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
</Children>
<Tools/>
</Dialog>
diff --git a/src/main/java/com/fzzy/api/view/Api1102.view.xml b/src/main/java/com/fzzy/api/view/Api1102.view.xml
index d0fe9a1..dceeb13 100644
--- a/src/main/java/com/fzzy/api/view/Api1102.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1102.view.xml
@@ -90,14 +90,6 @@
</Property>
</Property>
</PropertyDef>
- <PropertyDef name="hkRegionId">
- <Property></Property>
- <Property name="label">娴峰悍鍖哄煙ID</Property>
- </PropertyDef>
- <PropertyDef name="cqfkqdm">
- <Property></Property>
- <Property name="label">浜ф潈鏂瑰簱鍖轰唬鐮�</Property>
- </PropertyDef>
<PropertyDef name="czbz">
<Property></Property>
<Property name="label">鎿嶄綔鏍囧織</Property>
@@ -110,6 +102,36 @@
<PropertyDef name="zhgxsj">
<Property name="dataType">DateTime</Property>
<Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="hkRegionId">
+ <Property></Property>
+ <Property name="label">娴峰悍鍖哄煙ID</Property>
+ </PropertyDef>
+ <PropertyDef name="cqfkqdm">
+ <Property></Property>
+ <Property name="label">浜ф潈鏂瑰簱鍖轰唬鐮�</Property>
+ </PropertyDef>
+ <PropertyDef name="kqsx">
+ <Property></Property>
+ <Property name="label">搴撳尯灞炴��</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("KQSX")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="ajs">
+ <Property></Property>
+ <Property name="label">寤掗棿鏁�</Property>
+ <Property name="dataType">Integer</Property>
+ </PropertyDef>
+ <PropertyDef name="bjw">
+ <Property></Property>
+ <Property name="label">鏍囪浣�</Property>
+ </PropertyDef>
+ <PropertyDef name="cbcr">
+ <Property name="dataType">double</Property>
+ <Property name="label">鍌ㄥ浠撳</Property>
</PropertyDef>
</DataType>
<DataType name="dtGBArea">
@@ -319,11 +341,12 @@
<Property name="align">center</Property>
</DataColumn>
</DataGrid>
- <Dialog id="dialogMain">
+ <Dialog id="dialogMain" layout="padding:5;regionPadding:5">
<Property name="width">1000</Property>
<Property name="caption">搴撳尯淇℃伅</Property>
<Property name="iconClass">fa fa-sliders</Property>
<Property name="closeable">false</Property>
+ <Property name="height">80%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
@@ -345,116 +368,170 @@
</Button>
</Buttons>
<Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelWidth">120</Property>
- <Property name="labelAlign">left</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelPosition">top</Property>
- <AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dwdm</Property>
- <Property name="property">dwdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kqmc</Property>
- <Property name="property">kqmc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kqdz</Property>
- <Property name="property">kqdz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">xzqhdm</Property>
- <Property name="property">xzqhdm</Property>
- <Property name="trigger">cddGbArea</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">xzqhmc</Property>
- <Property name="property">xzqhmc</Property>
- <Property name="trigger">cddGbArea</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kqcq</Property>
- <Property name="property">kqcq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">yxcr</Property>
- <Property name="property">yxcr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">yxgr</Property>
- <Property name="property">yxgr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zdmj</Property>
- <Property name="property">zdmj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cfs</Property>
- <Property name="property">cfs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ygs</Property>
- <Property name="property">ygs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jd</Property>
- <Property name="property">jd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">wd</Property>
- <Property name="property">wd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kqzt</Property>
- <Property name="property">kqzt</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hkRegionId</Property>
- <Property name="property">hkRegionId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cqfkqdm</Property>
- <Property name="property">cqfkqdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bizId</Property>
- <Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
+ <GroupBox>
+ <Property name="caption">鍩虹淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwdm</Property>
+ <Property name="property">dwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqmc</Property>
+ <Property name="property">kqmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdz</Property>
+ <Property name="property">kqdz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzqhdm</Property>
+ <Property name="property">xzqhdm</Property>
+ <Property name="trigger">cddGbArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzqhmc</Property>
+ <Property name="property">xzqhmc</Property>
+ <Property name="trigger">cddGbArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqcq</Property>
+ <Property name="property">kqcq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yxcr</Property>
+ <Property name="property">yxcr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yxgr</Property>
+ <Property name="property">yxgr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zdmj</Property>
+ <Property name="property">zdmj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cfs</Property>
+ <Property name="property">cfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ygs</Property>
+ <Property name="property">ygs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jd</Property>
+ <Property name="property">jd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wd</Property>
+ <Property name="property">wd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqzt</Property>
+ <Property name="property">kqzt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ <GroupBox>
+ <Property name="caption">骞夸笢鐪佸钩鍙�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">hkRegionId</Property>
+ <Property name="property">hkRegionId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cqfkqdm</Property>
+ <Property name="property">cqfkqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ <GroupBox>
+ <Property name="caption">涓婃捣甯傚钩鍙�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">kqsx</Property>
+ <Property name="property">kqsx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajs</Property>
+ <Property name="property">ajs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bjw</Property>
+ <Property name="property">bjw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cbcr</Property>
+ <Property name="property">cbcr</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
</Children>
<Tools/>
</Dialog>
diff --git a/src/main/java/com/fzzy/api/view/Api1103.view.xml b/src/main/java/com/fzzy/api/view/Api1103.view.xml
index 5cc9e60..3860d10 100644
--- a/src/main/java/com/fzzy/api/view/Api1103.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1103.view.xml
@@ -368,6 +368,13 @@
<Property name="dataType">DateTime</Property>
<Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
</PropertyDef>
+ <PropertyDef name="ajs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">寤掗棿鏁�</Property>
+ </PropertyDef>
+ <PropertyDef name="bjw">
+ <Property name="label">鏍囪浣�</Property>
+ </PropertyDef>
</DataType>
</Model>
<View layout="regionPadding:10">
@@ -793,299 +800,329 @@
</Button>
</Buttons>
<Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelWidth">140</Property>
- <Property name="labelAlign">left</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelPosition">top</Property>
- <AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cfdm</Property>
- <Property name="property">cfdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cfmc</Property>
- <Property name="property">cfmc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cflxdm</Property>
- <Property name="property">cflxdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jfsyrq</Property>
- <Property name="property">jfsyrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jsdw</Property>
- <Property name="property">jsdw</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">sjsynx</Property>
- <Property name="property">sjsynx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">sjdw</Property>
- <Property name="property">sjdw</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jldw</Property>
- <Property name="property">jldw</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qtjg</Property>
- <Property name="property">qtjg</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">fdjg</Property>
- <Property name="property">fdjg</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">fjjg</Property>
- <Property name="property">fjjg</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dmjg</Property>
- <Property name="property">dmjg</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">sjcr</Property>
- <Property name="property">sjcr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cwc</Property>
- <Property name="property">cwc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cwk</Property>
- <Property name="property">cwk</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cwyg</Property>
- <Property name="property">cwyg</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cwdg</Property>
- <Property name="property">cwdg</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">tcwj</Property>
- <Property name="property">tcwj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cnc</Property>
- <Property name="property">cnc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cnk</Property>
- <Property name="property">cnk</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cnyg</Property>
- <Property name="property">cnyg</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cnzlxg</Property>
- <Property name="property">cnzlxg</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">tcnj</Property>
- <Property name="property">tcnj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cntj</Property>
- <Property name="property">cntj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cmsl</Property>
- <Property name="property">cmsl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cmwz</Property>
- <Property name="property">cmwz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cmgd</Property>
- <Property name="property">cmgd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cmkd</Property>
- <Property name="property">cmkd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dlmxs</Property>
- <Property name="property">dlmxs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cfsfwh</Property>
- <Property name="property">cfsfwh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">clgx</Property>
- <Property name="property">clgx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">nfgrbw</Property>
- <Property name="property">nfgrbw</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">grbwcs</Property>
- <Property name="property">grbwcs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">grxn</Property>
- <Property name="property">grxn</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jgcl</Property>
- <Property name="property">jgcl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qmx</Property>
- <Property name="property">qmx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">sfyjxxxhgz</Property>
- <Property name="property">sfyjxxxhgz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">lqjs</Property>
- <Property name="property">lqjs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">nfszcc</Property>
- <Property name="property">nfszcc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ywfsfqfczz</Property>
- <Property name="property">ywfsfqfczz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ywfhfbfdss</Property>
- <Property name="property">ywfhfbfdss</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ywjxtfss</Property>
- <Property name="property">ywjxtfss</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">tfxtxs</Property>
- <Property name="property">tfxtxs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">tfjs</Property>
- <Property name="property">tfjs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">nfhlxzsc</Property>
- <Property name="property">nfhlxzsc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">scjs</Property>
- <Property name="property">scjs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">nffddyqtcl</Property>
- <Property name="property">nffddyqtcl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kwjs</Property>
- <Property name="property">kwjs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hcjcfs</Property>
- <Property name="property">hcjcfs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cfzt</Property>
- <Property name="property">cfzt</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bgr</Property>
- <Property name="property">bgr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jd</Property>
- <Property name="property">jd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">wd</Property>
- <Property name="property">wd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bizId</Property>
- <Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
+ <GroupBox>
+ <Property name="caption">鍩虹淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">140</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cfdm</Property>
+ <Property name="property">cfdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cfmc</Property>
+ <Property name="property">cfmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cflxdm</Property>
+ <Property name="property">cflxdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jfsyrq</Property>
+ <Property name="property">jfsyrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jsdw</Property>
+ <Property name="property">jsdw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sjsynx</Property>
+ <Property name="property">sjsynx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sjdw</Property>
+ <Property name="property">sjdw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jldw</Property>
+ <Property name="property">jldw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qtjg</Property>
+ <Property name="property">qtjg</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fdjg</Property>
+ <Property name="property">fdjg</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fjjg</Property>
+ <Property name="property">fjjg</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dmjg</Property>
+ <Property name="property">dmjg</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sjcr</Property>
+ <Property name="property">sjcr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cwc</Property>
+ <Property name="property">cwc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cwk</Property>
+ <Property name="property">cwk</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cwyg</Property>
+ <Property name="property">cwyg</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cwdg</Property>
+ <Property name="property">cwdg</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tcwj</Property>
+ <Property name="property">tcwj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cnc</Property>
+ <Property name="property">cnc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cnk</Property>
+ <Property name="property">cnk</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cnyg</Property>
+ <Property name="property">cnyg</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cnzlxg</Property>
+ <Property name="property">cnzlxg</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tcnj</Property>
+ <Property name="property">tcnj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cntj</Property>
+ <Property name="property">cntj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cmsl</Property>
+ <Property name="property">cmsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cmwz</Property>
+ <Property name="property">cmwz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cmgd</Property>
+ <Property name="property">cmgd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cmkd</Property>
+ <Property name="property">cmkd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dlmxs</Property>
+ <Property name="property">dlmxs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cfsfwh</Property>
+ <Property name="property">cfsfwh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">clgx</Property>
+ <Property name="property">clgx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">nfgrbw</Property>
+ <Property name="property">nfgrbw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">grbwcs</Property>
+ <Property name="property">grbwcs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">grxn</Property>
+ <Property name="property">grxn</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jgcl</Property>
+ <Property name="property">jgcl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qmx</Property>
+ <Property name="property">qmx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfyjxxxhgz</Property>
+ <Property name="property">sfyjxxxhgz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lqjs</Property>
+ <Property name="property">lqjs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">nfszcc</Property>
+ <Property name="property">nfszcc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ywfsfqfczz</Property>
+ <Property name="property">ywfsfqfczz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ywfhfbfdss</Property>
+ <Property name="property">ywfhfbfdss</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ywjxtfss</Property>
+ <Property name="property">ywjxtfss</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfxtxs</Property>
+ <Property name="property">tfxtxs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjs</Property>
+ <Property name="property">tfjs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">nfhlxzsc</Property>
+ <Property name="property">nfhlxzsc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">scjs</Property>
+ <Property name="property">scjs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">nffddyqtcl</Property>
+ <Property name="property">nffddyqtcl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kwjs</Property>
+ <Property name="property">kwjs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hcjcfs</Property>
+ <Property name="property">hcjcfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cfzt</Property>
+ <Property name="property">cfzt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bgr</Property>
+ <Property name="property">bgr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jd</Property>
+ <Property name="property">jd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wd</Property>
+ <Property name="property">wd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ <GroupBox>
+ <Property name="caption">涓婃捣甯傚钩鍙�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">140</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">ajs</Property>
+ <Property name="property">ajs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bjw</Property>
+ <Property name="property">bjw</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
</Children>
<Tools/>
</Dialog>
diff --git a/src/main/java/com/fzzy/api/view/Api1104.view.xml b/src/main/java/com/fzzy/api/view/Api1104.view.xml
index 993584d..ebf54e1 100644
--- a/src/main/java/com/fzzy/api/view/Api1104.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1104.view.xml
@@ -33,14 +33,6 @@
<Property name="dataType">double</Property>
<Property name="label">璁捐浠撳</Property>
</PropertyDef>
- <PropertyDef name="ajsjcrong">
- <Property name="dataType">double</Property>
- <Property name="label">寤掗棿瀹為檯浠撳</Property>
- </PropertyDef>
- <PropertyDef name="ajlxdh">
- <Property></Property>
- <Property name="label">鑱旂郴鐢佃瘽</Property>
- </PropertyDef>
<PropertyDef name="ajqyrq">
<Property></Property>
<Property name="label">鍚敤鏃ユ湡</Property>
@@ -80,6 +72,16 @@
<PropertyDef name="syncTime">
<Property name="dataType">Date</Property>
<Property name="label">鍚屾鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="sykqdm">
+ <Property></Property>
+ <Property name="label">浣跨敤搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="ajlxdh">
+ <Property name="label">寤掗棿鑱旂郴鐢佃瘽</Property>
+ </PropertyDef>
+ <PropertyDef name="bjw">
+ <Property name="label">鏍囪浣�</Property>
</PropertyDef>
</DataType>
</Model>
@@ -283,89 +285,114 @@
</Button>
</Buttons>
<Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelWidth">100</Property>
- <Property name="labelAlign">left</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelPosition">top</Property>
- <AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajdh</Property>
- <Property name="property">ajdh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajmc</Property>
- <Property name="property">ajmc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cfbh</Property>
- <Property name="property">cfbh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajcd</Property>
- <Property name="property">ajcd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajkd</Property>
- <Property name="property">ajkd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajgd</Property>
- <Property name="property">ajgd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajsjcr</Property>
- <Property name="property">ajsjcr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajsjcrong</Property>
- <Property name="property">ajsjcrong</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajlxdh</Property>
- <Property name="property">ajlxdh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajqyrq</Property>
- <Property name="property">ajqyrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajzt</Property>
- <Property name="property">ajzt</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bizId</Property>
- <Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
+ <GroupBox>
+ <Property name="caption">鍩虹淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">ajdh</Property>
+ <Property name="property">ajdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajmc</Property>
+ <Property name="property">ajmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cfbh</Property>
+ <Property name="property">cfbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajcd</Property>
+ <Property name="property">ajcd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajkd</Property>
+ <Property name="property">ajkd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajgd</Property>
+ <Property name="property">ajgd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajsjcr</Property>
+ <Property name="property">ajsjcr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajqyrq</Property>
+ <Property name="property">ajqyrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajzt</Property>
+ <Property name="property">ajzt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ <GroupBox>
+ <Property name="caption">涓婃捣甯傚钩鍙�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">sykqdm</Property>
+ <Property name="property">sykqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajlxdh</Property>
+ <Property name="property">ajlxdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bjw</Property>
+ <Property name="property">bjw</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
</Children>
<Tools/>
</Dialog>
diff --git a/src/main/java/com/fzzy/api/view/Api1105.view.xml b/src/main/java/com/fzzy/api/view/Api1105.view.xml
index d86848c..6f43a8b 100644
--- a/src/main/java/com/fzzy/api/view/Api1105.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1105.view.xml
@@ -56,6 +56,10 @@
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
+ <PropertyDef name="bjw">
+ <Property></Property>
+ <Property name="label">鏍囪浣�</Property>
+ </PropertyDef>
</DataType>
</Model>
<View layout="regionPadding:10">
@@ -243,69 +247,94 @@
</Button>
</Buttons>
<Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelWidth">120</Property>
- <Property name="labelAlign">left</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelPosition">top</Property>
- <AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hwdm</Property>
- <Property name="property">hwdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hwmc</Property>
- <Property name="property">hwmc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajdm</Property>
- <Property name="property">ajdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hwqyrq</Property>
- <Property name="property">hwqyrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hwrl</Property>
- <Property name="property">hwrl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bgdw</Property>
- <Property name="property">bgdw</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bgy</Property>
- <Property name="property">bgy</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bizId</Property>
- <Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
+ <GroupBox>
+ <Property name="caption">鍩虹淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hwdm</Property>
+ <Property name="property">hwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hwmc</Property>
+ <Property name="property">hwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajdm</Property>
+ <Property name="property">ajdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hwqyrq</Property>
+ <Property name="property">hwqyrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hwrl</Property>
+ <Property name="property">hwrl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bgdw</Property>
+ <Property name="property">bgdw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bgy</Property>
+ <Property name="property">bgy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ <GroupBox>
+ <Property name="caption">涓婃捣甯傚钩鍙�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">bjw</Property>
+ <Property name="property">bjw</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
</Children>
<Tools/>
</Dialog>
diff --git a/src/main/java/com/fzzy/api/view/ApiConfs.view.xml b/src/main/java/com/fzzy/api/view/ApiConfs.view.xml
index 81de227..e07d98e 100644
--- a/src/main/java/com/fzzy/api/view/ApiConfs.view.xml
+++ b/src/main/java/com/fzzy/api/view/ApiConfs.view.xml
@@ -301,10 +301,14 @@
<DataColumn name="kqdm">
<Property name="property">kqdm</Property>
<Property name="align">center</Property>
+ <Property name="name">grade</Property>
+ <Property name="width">200</Property>
</DataColumn>
<DataColumn name="kqmc">
<Property name="property">kqmc</Property>
<Property name="align">center</Property>
+ <Property name="name">grade</Property>
+ <Property name="width">300</Property>
</DataColumn>
<DataColumn>
<Property name="property">grade</Property>
@@ -343,10 +347,14 @@
<DataColumn name="pushProtocol">
<Property name="property">pushProtocol</Property>
<Property name="align">center</Property>
+ <Property name="name">grade</Property>
+ <Property name="width">180</Property>
</DataColumn>
<DataColumn name="syncProtocol">
<Property name="property">syncProtocol</Property>
<Property name="align">center</Property>
+ <Property name="name">grade</Property>
+ <Property name="width">180</Property>
</DataColumn>
</ColumnGroup>
</DataGrid>
diff --git a/src/main/java/com/fzzy/api/view/SecCamera.view.xml b/src/main/java/com/fzzy/api/view/SecCamera.view.xml
new file mode 100644
index 0000000..1fb7fdf
--- /dev/null
+++ b/src/main/java/com/fzzy/api/view/SecCamera.view.xml
@@ -0,0 +1,978 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtSecCameraParam">
+ <Property name="creationType">com.ld.igds.models.SecCamera</Property>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="type">
+ <Property></Property>
+ <Property name="label">璁惧绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("CAMEAR_TYPE")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property></Property>
+ <Property name="label">鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="sn">
+ <Property></Property>
+ <Property name="label">璁惧搴忓垪鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="brand">
+ <Property></Property>
+ <Property name="label">璁惧鍝佺墝</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("CAMEAR_BRAND")}</Property>
+ <Property name="keyProperty">name</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtSecCamera">
+ <Property name="creationType">com.ld.igds.models.SecCamera</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">ID</Property>
+ </PropertyDef>
+ <PropertyDef name="sn">
+ <Property></Property>
+ <Property name="label">娴佸獟浣撳簭鍒楀彿</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="type">
+ <Property></Property>
+ <Property name="label">璁惧绫诲瀷</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("securityPR#triggerCameraType").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="playType">
+ <Property></Property>
+ <Property name="label">鎾斁鏂瑰紡</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#triggerPlayType").getResult()}</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="snapType">
+ <Property></Property>
+ <Property name="label">鎶撴媿鏂瑰紡</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#triggerSnapType").getResult()}</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property></Property>
+ <Property name="label">璁惧鍚嶇О</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="loginId">
+ <Property></Property>
+ <Property name="label">璁块棶甯愬彿</Property>
+ </PropertyDef>
+ <PropertyDef name="pwd">
+ <Property></Property>
+ <Property name="label">鐧诲綍瀵嗙爜</Property>
+ </PropertyDef>
+ <PropertyDef name="ipIn">
+ <Property></Property>
+ <Property name="label">鍐呯綉IP</Property>
+ </PropertyDef>
+ <PropertyDef name="portInC">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鎺у埗绔彛</Property>
+ <Property name="defaultValue">554</Property>
+ </PropertyDef>
+ <PropertyDef name="portInV">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">璁块棶绔彛</Property>
+ <Property name="defaultValue">80</Property>
+ </PropertyDef>
+ <PropertyDef name="chanNum">
+ <Property name="dataType">int</Property>
+ <Property name="label">閫氶亾鍙�</Property>
+ <Property name="defaultValue">1</Property>
+ </PropertyDef>
+ <PropertyDef name="brand">
+ <Property></Property>
+ <Property name="label">璁惧鍝佺墝</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("CAMEAR_BRAND")}</Property>
+ <Property name="keyProperty">name</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="mediaAddr">
+ <Property></Property>
+ <Property name="label">rtsp鍦板潃</Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property></Property>
+ <Property name="label">澶囨敞璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="posX">
+ <Property name="dataType">double</Property>
+ <Property name="label">椤甸潰涓殑鍧愭爣</Property>
+ </PropertyDef>
+ <PropertyDef name="posY">
+ <Property name="dataType">double</Property>
+ <Property name="label">椤甸潰涓殑鍧愭爣</Property>
+ </PropertyDef>
+ <PropertyDef name="screenShow">
+ <Property></Property>
+ <Property name="label">鐩戠澶у睆</Property>
+ <Property name="required">false</Property>
+ <Property name="defaultValue">锛�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="code">N</Property>
+ <Property name="name">閫夋嫨灞曠ず</Property>
+ </Entity>
+ <Entity>
+ <Property name="code">Y</Property>
+ <Property name="name">榛樿灞曠ず</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="snapTag">
+ <Property></Property>
+ <Property name="label">鐩戠鎶撴媿</Property>
+ <Property name="required">false</Property>
+ <Property name="defaultValue">锛�</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="code">N</Property>
+ <Property name="name">涓嶆姄鎷�</Property>
+ </Entity>
+ <Entity>
+ <Property name="code">Y</Property>
+ <Property name="name">鑷姩鎶撴媿</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="azwzlx">
+ <Property/>
+ <Property name="label">瀹夎浣嶇疆</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">01</Property>
+ <Property name="value">绮簱澶ч棬</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">02</Property>
+ <Property name="value">鎵︽牱鏈�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">03</Property>
+ <Property name="value">鍖栭獙瀹�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">04</Property>
+ <Property name="value">缁撶畻瀹�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">05</Property>
+ <Property name="value">鍦扮鎴�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">06</Property>
+ <Property name="value">搴撳尯涓诲共閬�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">07</Property>
+ <Property name="value">浠撻棿鐩戞帶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">08</Property>
+ <Property name="value">浠撳唴</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">09</Property>
+ <Property name="value">鑽搧搴�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">10</Property>
+ <Property name="value">鍣ㄦ潗搴�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">鍒堕珮鐐�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">鍛ㄧ晫</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">99</Property>
+ <Property name="value">鍏朵粬</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="padding:5;regionPadding:5">
+ <ClientEvent name="onClick">
+/**
+ * 璁块棶
+ */
+showWeb = function(){
+ var cur = view.get("#dsMain.data:#");
+ if(!cur.get("ipIn")){
+ $alert("娌℃湁閰嶇疆鍐呴儴璁块棶IP锛屾棤娉曡闂��");
+ return;
+ }
+ if(!cur.get("portInV")){
+ $alert("娌℃湁閰嶇疆鍐呴儴璁块棶绔彛锛屾棤娉曡闂��");
+ return;
+ }
+ var url = "http://"+cur.get("ipIn")+":"+cur.get("portInV");
+ window.open(url);
+};
+
+/**
+ * 棰勮
+ */
+showVideo = function(){
+ var cur = view.get("#dsMain.data:#");
+ var playType = cur.get("playType");
+ 
+ if(!playType){
+ $alert("娌℃湁閰嶇疆鎾斁鏂瑰紡锛屾棤娉曢瑙堛��");
+ return;
+ }
+ if(!cur.get("ipIn")){
+ $alert("娌℃湁閰嶇疆鍐呴儴璁块棶IP锛屾棤娉曡闂��");
+ return;
+ }
+ if(!cur.get("portInC")){
+ $alert("娌℃湁閰嶇疆鍐呴儴鎺у埗绔彛锛屾棤娉曡闂��");
+ return;
+ }
+ if(!cur.get("loginId")){
+ $alert("娌℃湁閰嶇疆鐢ㄦ埛鍚嶏紝鏃犳硶璁块棶銆�");
+ return;
+ }
+ if (!cur.get("pwd")) {
+ $alert("娌℃湁閰嶇疆瀵嗙爜锛屾棤娉曡闂��");
+ return;
+ }
+ 
+ var url = "./basic/security/video-play?cameraId="+cur.get("id")+"&playType="+playType+"&time="+ new Date().getTime();
+ 
+ view.get("#iFrameVideo").set("path",url);
+ view.get("#dialogVideo").show();
+};
+</ClientEvent>
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="loadMode">lazy</Property>
+ <Property name="dataProvider">securityPR#listCamera</Property>
+ <Property name="dataType">[dtSecCamera]</Property>
+ </DataSet>
+ <DataSet id="dsParam">
+ <ClientEvent name="onReady">self.insert({});</ClientEvent>
+ <Property name="dataType">dtSecCameraParam</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Property name="height">55</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="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+if(data){
+ view.get("#dialogMain").show();
+}</ClientEvent>
+ <Property name="caption">璋冩暣</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+if(!data){
+ return;
+}
+view.get("#ajaxDel").set("parameter",data).execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }else{
+ data.remove();
+ }
+});</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();
+</ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <Property name="caption">鍒锋柊缂撳瓨</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ <Property name="action">refreshCache</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+if(data){
+ var playType = data.get("playType");
+ view.get("#ajaxRemoteMedia").set("parameter",playType).execute(function(result){
+ if(result){
+ $alert(result);
+ }
+ });
+}else{
+ $alert("璇锋墜鍔ㄦ彃鍏ヤ竴鏉℃暟鎹紝骞堕�夋嫨鎾斁鏂瑰紡");
+}</ClientEvent>
+ <Property name="caption">鍚屾鎽勫儚澶撮厤缃�</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ </Button>
+ </Container>
+ <Container layout="regionPadding:10" layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <AutoForm>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="dataSet">dsParam</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">type</Property>
+ <Property name="property">type</Property>
+ <Property name="trigger">autoMappingDropDown2</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">brand</Property>
+ <Property name="property">brand</Property>
+ <Property name="trigger">autoMappingDropDown2</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var param = view.get("#dsParam.data");
+view.get("#dsMain").set("parameter",param.toJSON()).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ </Button>
+ </AutoForm>
+ <DataGrid layoutConstraint="center padding:5px">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
+if(data){
+ view.get("#dialogMain").show();
+}</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn>
+ <Property name="width">50</Property>
+ </RowNumColumn>
+ <DataColumn name="name">
+ <Property name="property">name</Property>
+ </DataColumn>
+ <DataColumn name="type">
+ <Property name="property">type</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">playType</Property>
+ <Property name="align">center</Property>
+ <Property name="name">playType</Property>
+ <Property name="width">160</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">snapType</Property>
+ <Property name="align">center</Property>
+ <Property name="name">snapType</Property>
+ <Property name="width">160</Property>
+ </DataColumn>
+ <DataColumn name="ipIn">
+ <Property name="property">ipIn</Property>
+ <Property name="align">center</Property>
+ <Property name="width">180</Property>
+ </DataColumn>
+ <DataColumn name="portInV">
+ <Property name="property">portInV</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn name="chanNum">
+ <Property name="property">chanNum</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn name="brand">
+ <Property name="property">brand</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn name="screenShow">
+ <Property name="property">screenShow</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">榛樿灞曠ず</Property>
+ <Property name="value">Y</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">閫夋嫨灞曠ず</Property>
+ <Property name="value">N</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </DataColumn>
+ <DataColumn name="snapTag">
+ <Property name="property">snapTag</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">鑷姩鎶撴媿</Property>
+ <Property name="value">Y</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">涓嶆姄鎷�</Property>
+ <Property name="value">N</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </DataColumn>
+ <DataColumn>
+ <ClientEvent name="onRenderCell">arg.dom.innerHTML = "<a href='javascript:;' onClick='showVideo()'>棰勮</a>&nbsp;|&nbsp;<a href='javascript:;' onClick='showWeb()'>璁块棶</a>";</ClientEvent>
+ <Property name="width">120</Property>
+ <Property name="caption">鎿嶄綔</Property>
+ <Property name="align">center</Property>
+ <Editor/>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Dialog id="dialogMain" layout="padding:5;regionPadding:5">
+ <Property name="width">800</Property>
+ <Property name="caption">鐩戞帶璁惧淇℃伅</Property>
+ <Property name="iconClass">fa fa-flag-o</Property>
+ <Property name="closeable">false</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+if(data.validate() != 'ok'){
+ $notify("鏁版嵁鏍￠獙澶辫触锛侊紒");
+ return;
+}
+view.get("#uaAction").set("parameter",data).execute(function(){
+ self.get("parent").hide();
+});</ClientEvent>
+ <Property name="caption">纭</Property>
+ <Property name="iconClass">fa fa-check-circle</Property>
+ <Property name="width">90</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
+self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times-circle</Property>
+ <Property name="width">90</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <GroupBox>
+ <Property name="caption">鍩烘湰淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <AutoFormElement>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">type</Property>
+ <Property name="property">type</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">brand</Property>
+ <Property name="property">brand</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">playType</Property>
+ <Property name="property">playType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">snapType</Property>
+ <Property name="property">snapType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">azwzlx</Property>
+ <Property name="property">azwzlx</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ <GroupBox layoutConstraint="colSpan:2">
+ <Property name="caption">鐩戠閰嶇疆</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <AutoFormElement>
+ <Property name="name">snapTag</Property>
+ <Property name="property">snapTag</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">鑷姩鎶撴媿</Property>
+ <Property name="value">Y</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">涓嶆姄鎷�</Property>
+ <Property name="value">N</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
+ <Label>
+ <Property name="text">璇存槑锛氭湁搴撳尯鎺ュ叆妯″潡璁惧锛岄厤缃湰鍦版挱鏀鹃厤缃�</Property>
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </Property>
+ </Label>
+ <AutoFormElement>
+ <Property name="name">screenShow</Property>
+ <Property name="property">screenShow</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">榛樿灞曠ず</Property>
+ <Property name="value">Y</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">閫夋嫨灞曠ず</Property>
+ <Property name="value">N</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ <GroupBox layoutConstraint="colSpan:2">
+ <Property name="caption">娴佸獟浣撴挱鏀鹃厤缃�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">sn</Property>
+ <Property name="property">sn</Property>
+ <Property name="labelWidth">120</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">-- 瑙勫垯锛氭牴鎹祦濯掍綋绫诲瀷杩涜閰嶇疆 --</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ <GroupBox layoutConstraint="colSpan:2">
+ <Property name="caption">鏈湴鎾斁閰嶇疆</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <AutoFormElement>
+ <Property name="name">loginId</Property>
+ <Property name="property">loginId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">pwd</Property>
+ <Property name="property">pwd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ipIn</Property>
+ <Property name="property">ipIn</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">portInV</Property>
+ <Property name="property">portInV</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">chanNum</Property>
+ <Property name="property">chanNum</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">portInC</Property>
+ <Property name="property">portInC</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">mediaAddr</Property>
+ <Property name="property">mediaAddr</Property>
+ <Property name="trigger">triggerMedia</Property>
+ <Editor>
+ <TextEditor id="mediaAddr">
+ <Property name="blankText"> -- 鐐瑰嚮鍙充晶閫夋嫨锛屾垨鑰呮墜鍔ㄥ～鍐� --</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Property name="editorType">TextArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="uaAction">
+ <Property name="dataResolver">securityPR#saveCamera</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
+ <Property name="service">securityPR#delCamera</Property>
+ </AjaxAction>
+ <Dialog id="dialogVideo">
+ <Property name="width">1320</Property>
+ <Property name="caption">瑙嗛棰勮</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Property name="height">620</Property>
+ <Buttons/>
+ <Children>
+ <IFrame id="iFrameVideo" layoutConstraint="center"/>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <AjaxAction id="refreshCache">
+ <Property name="service">securityPR#refreshCache</Property>
+ <Property name="successMessage">缂撳瓨鏇存柊鎴愬姛锛�</Property>
+ </AjaxAction>
+ <Trigger id="triggerMedia">
+ <ClientEvent name="onExecute">view.get("#dialogMeidaSelect").show();
+</ClientEvent>
+ </Trigger>
+ <Dialog id="dialogMeidaSelect" layout="vbox padding:10">
+ <Property name="width">650</Property>
+ <Property name="caption">娴佸獟浣撳湴鍧�閫夋嫨</Property>
+ <Buttons/>
+ <Children>
+ <Container>
+ <Label>
+ <Property name="text">娴峰悍RTSP锛堟棫鐗�-涓荤爜娴侊級</Property>
+ <Property name="style">
+ <Property name="font-weight">bold</Property>
+ </Property>
+ </Label>
+ <Label id="text1">
+ <Property name="text">rtsp://{0}:{1}@{2}:{3}/h264/ch{4}/main/av_stream</Property>
+ </Label>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">view.get("#mediaAddr").set("text",view.get("#text1.text"));
+view.get("#dialogMeidaSelect").hide();
+</ClientEvent>
+ <Property name="caption">閫夋嫨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ </Container>
+ <Container>
+ <Label>
+ <Property name="text">娴峰悍RTSP锛堟棫鐗�-瀛愮爜娴侊級</Property>
+ <Property name="style">
+ <Property name="font-weight">bold</Property>
+ </Property>
+ </Label>
+ <Label id="text2">
+ <Property name="text">rtsp://{0}:{1}@{2}:{3}/mpeg4/ch{4}/sub/av_stream</Property>
+ </Label>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">view.get("#mediaAddr").set("text",view.get("#text2.text"));
+view.get("#dialogMeidaSelect").hide();
+</ClientEvent>
+ <Property name="caption">閫夋嫨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ </Container>
+ <Container>
+ <Label>
+ <Property name="text">娴峰悍RTSP锛堟柊鐗�-涓荤爜娴侊級</Property>
+ <Property name="style">
+ <Property name="font-weight">bold</Property>
+ </Property>
+ </Label>
+ <Label id="text3">
+ <Property name="text">rtsp://{0}:{1}@{2}:{3}/Streaming/Channels/{4}01</Property>
+ </Label>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">view.get("#mediaAddr").set("text",view.get("#text3.text"));
+view.get("#dialogMeidaSelect").hide();
+</ClientEvent>
+ <Property name="caption">閫夋嫨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ </Container>
+ <Container>
+ <Label>
+ <Property name="text">娴峰悍RTSP锛堟柊鐗�-瀛愮爜娴侊級</Property>
+ <Property name="style">
+ <Property name="font-weight">bold</Property>
+ </Property>
+ </Label>
+ <Label id="text4">
+ <Property name="text">rtsp://{0}:{1}@{2}:{3}/Streaming/Channels/{4}02</Property>
+ </Label>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">view.get("#mediaAddr").set("text",view.get("#text4.text"));
+view.get("#dialogMeidaSelect").hide();
+</ClientEvent>
+ <Property name="caption">閫夋嫨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ </Container>
+ <Container>
+ <Label>
+ <Property name="text">澶у崕RTSP锛堜富鐮佹祦锛�</Property>
+ <Property name="style">
+ <Property name="font-weight">bold</Property>
+ </Property>
+ </Label>
+ <Label id="text5">
+ <Property name="text">rtsp://{0}:{1}@{2}:{3}/cam/realmonitor?channel={4}&subtype=0</Property>
+ </Label>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">view.get("#mediaAddr").set("text",view.get("#text5.text"));
+view.get("#dialogMeidaSelect").hide();
+</ClientEvent>
+ <Property name="caption">閫夋嫨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ </Container>
+ <Container>
+ <Label>
+ <Property name="text">澶у崕RTSP锛堣緟鐮佹祦锛�</Property>
+ <Property name="style">
+ <Property name="font-weight">bold</Property>
+ </Property>
+ </Label>
+ <Label id="text6">
+ <Property name="text">rtsp://{0}:{1}@{2}:{3}/cam/realmonitor?channel={4}&subtype=1</Property>
+ </Label>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">view.get("#mediaAddr").set("text",view.get("#text6.text"));
+view.get("#dialogMeidaSelect").hide();
+</ClientEvent>
+ <Property name="caption">閫夋嫨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ </Container>
+ <Container>
+ <Label>
+ <Property name="text">闆勮繄RTSP锛堜富鐮佹祦锛�</Property>
+ <Property name="style">
+ <Property name="font-weight">bold</Property>
+ </Property>
+ </Label>
+ <Label id="text7">
+ <Property name="text">rtsp://{2}:{3}/user={0}&password={1}&channel={4}&stream=0.sdp?real_stream</Property>
+ </Label>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">view.get("#mediaAddr").set("text",view.get("#text7.text"));
+view.get("#dialogMeidaSelect").hide();
+</ClientEvent>
+ <Property name="caption">閫夋嫨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ </Container>
+ <Container>
+ <Label>
+ <Property name="text">闆勮繄RTSP锛堟鐮佹祦锛�</Property>
+ <Property name="style">
+ <Property name="font-weight">bold</Property>
+ </Property>
+ </Label>
+ <Label id="text8">
+ <Property name="text">rtsp://{2}:{3}/user={0}&password={1}&channel={4}&stream=1.sdp?real_stream</Property>
+ </Label>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">view.get("#mediaAddr").set("text",view.get("#text8.text"));
+view.get("#dialogMeidaSelect").hide();
+</ClientEvent>
+ <Property name="caption">閫夋嫨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ </Container>
+ <Container>
+ <Label>
+ <Property name="text">涓夋槦RTSP锛堥珮鐮佺巼锛�</Property>
+ <Property name="style">
+ <Property name="font-weight">bold</Property>
+ </Property>
+ </Label>
+ <Label id="text9">
+ <Property name="text">rtsp://{0}:{1}@{2}:{3}/onvif/profile2/media.smp</Property>
+ </Label>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">view.get("#mediaAddr").set("text",view.get("#text9.text"));
+view.get("#dialogMeidaSelect").hide();
+</ClientEvent>
+ <Property name="caption">閫夋嫨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ </Container>
+ <Container>
+ <Label>
+ <Property name="text">涓夋槦RTSP锛堜綆鐮佺巼锛�</Property>
+ <Property name="style">
+ <Property name="font-weight">bold</Property>
+ </Property>
+ </Label>
+ <Label id="text10">
+ <Property name="text">rtsp://{0}:{1}@{2}:{3}/onvif/profile3/media.smp</Property>
+ </Label>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">view.get("#mediaAddr").set("text",view.get("#text10.text"));
+view.get("#dialogMeidaSelect").hide();
+</ClientEvent>
+ <Property name="caption">閫夋嫨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ </Container>
+ <Container>
+ <Label>
+ <Property name="text">瀹囪RTSP</Property>
+ <Property name="style">
+ <Property name="font-weight">bold</Property>
+ </Property>
+ </Label>
+ <Label id="text11">
+ <Property name="text">rtsp://{0}:{1}@{2}/media/video1/multicast</Property>
+ </Label>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">view.get("#mediaAddr").set("text",view.get("#text11.text"));
+view.get("#dialogMeidaSelect").hide();
+</ClientEvent>
+ <Property name="caption">閫夋嫨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ </Container>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <AjaxAction id="ajaxRemoteMedia">
+ <Property name="confirmMessage">纭畾瑕佸悓姝ヤ箞锛�</Property>
+ <Property name="service">securityPR#flushByMedia</Property>
+ </AjaxAction>
+ </View>
+</ViewConfig>
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 8880181..3e204e2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -4,13 +4,10 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.service.SyncService12;
-import com.fzzy.async.fzzy35.impl.Fzzy35Sync1203;
-import com.fzzy.async.fzzy35.impl.Fzzy35Sync1208;
import com.fzzy.async.fzzy40.impl.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.Date;
/**
@@ -63,15 +60,6 @@
Date start = param.getStart();
Date end = param.getEnd();
- /*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
- if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
- //涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ュ競鍌ㄦ鏂ゅ崟锛屽悓姝ュ競鍌ㄩ┏杩愬崟
- //鍚屾甯傚偍妫�鏂ゅ崟
- fzzySync2101.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
- //鍚屾甯傚偍椹宠繍鍗�
- fzzySync2104.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
- }
-
//瀹㈡埛鍚屾
fzzySync1212.syncData(kqdm, deptId, start, end);
@@ -105,7 +93,14 @@
//绮鎬ц川杞彉淇℃伅鍚屾
fzzySync1210.syncData(kqdm, deptId, start, end);
-
+ /*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
+ if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
+ //涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ュ競鍌ㄦ鏂ゅ崟锛屽悓姝ュ競鍌ㄩ┏杩愬崟
+ //鍚屾甯傚偍妫�鏂ゅ崟
+ fzzySync2101.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ //鍚屾甯傚偍椹宠繍鍗�
+ fzzySync2104.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ }
//璐﹂潰搴撳瓨淇℃伅鍚屾 TODO
}
diff --git a/src/main/java/com/fzzy/push/gd2020/v2/GranaryWebService.java b/src/main/java/com/fzzy/push/gd2020/v2/GranaryWebService.java
index 9b6184d..e131710 100644
--- a/src/main/java/com/fzzy/push/gd2020/v2/GranaryWebService.java
+++ b/src/main/java/com/fzzy/push/gd2020/v2/GranaryWebService.java
@@ -84,7 +84,6 @@
xmlStr = xmlStr.replace("{ajbh}", GDUtils.formatStr(data.getAjdh()));//寤掗棿缂栫爜
xmlStr = xmlStr.replace("{ajsjcr}", GDUtils.formatNum(data.getAjsjcr()));//寤掗棿璁捐浠撳
xmlStr = xmlStr.replace("{ajzt}", GDUtils.formatStr(data.getAjzt()));//寤掗棿鐘舵��
- xmlStr = xmlStr.replace("{ajsjcrong}", GDUtils.formatNum(data.getAjsjcrong()));//寤掗棿瀹為檯浠撳
xmlStr = xmlStr.replace("{ajjd}", GDUtils.formatNum(api1103.getJd()));//寤掗棿缁忓害
xmlStr = xmlStr.replace("{ajwd}", GDUtils.formatNum(api1103.getWd()));//寤掗棿绾害
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index cbf506f..182f078 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -329,7 +329,23 @@
Gd2022Api1101 api1101 = new Gd2022Api1101();
BeanUtils.copyProperties(data, api1101);
return JSON.toJSONString(api1101);
- } else if (Constant.API_CODE_1109.equals(inteId)) {
+ } else if (Constant.API_CODE_1102.equals(inteId)) {
+ Gd2022Api1102 api1102 = new Gd2022Api1102();
+ BeanUtils.copyProperties(data, api1102);
+ return JSON.toJSONString(api1102);
+ } else if (Constant.API_CODE_1103.equals(inteId)) {
+ Gd2022Api1103 api1103 = new Gd2022Api1103();
+ BeanUtils.copyProperties(data, api1103);
+ return JSON.toJSONString(api1103);
+ } else if (Constant.API_CODE_1104.equals(inteId)) {
+ Gd2022Api1104 api1104 = new Gd2022Api1104();
+ BeanUtils.copyProperties(data, api1104);
+ return JSON.toJSONString(api1104);
+ } else if (Constant.API_CODE_1105.equals(inteId)) {
+ Gd2022Api1105 api1105 = new Gd2022Api1105();
+ BeanUtils.copyProperties(data, api1105);
+ return JSON.toJSONString(api1105);
+ }else if (Constant.API_CODE_1109.equals(inteId)) {
//灏佽鏁版嵁
Gd2022Api1109 api1109 = new Gd2022Api1109();
BeanUtils.copyProperties(data, api1109);
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java
index cb39200..5a6bbaf 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java
@@ -3,11 +3,9 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fzzy.api.entity.ApiParent;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
-import javax.persistence.Id;
import java.io.Serializable;
import java.util.Date;
@@ -18,12 +16,12 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-public class Gd2022Api1101 extends ApiParent implements Serializable {
+public class Gd2022Api1101 implements Serializable {
/**
*
*/
private static final long serialVersionUID = 9157617424050247565L;
- @Id
+
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
@@ -40,10 +38,10 @@
private Date zcrq;
@PropertyDef(label = "娉ㄥ唽璧勬湰")
- private double zczb;
+ private Double zczb;
@PropertyDef(label = "璧勪骇鎬婚")
- private double zcze;
+ private Double zcze;
@PropertyDef(label = "娉曞畾浠ｈ〃浜�")
private String fddbr;
@@ -78,10 +76,6 @@
@PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
private String xzqhdm;
- @JSONField(serialize = false)
- @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞")
- private String xzqhmc;
-
@PropertyDef(label = "涓婄骇鍗曚綅鍚嶇О")
private String sjdwmc;
@@ -98,10 +92,10 @@
private Integer ygs;
@PropertyDef(label = "缁忓害")
- private double jd;
+ private Double jd;
@PropertyDef(label = "绾害")
- private double wd;
+ private Double wd;
@PropertyDef(label = "澶囨绫诲瀷")
private String balx;
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1102.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1102.java
new file mode 100644
index 0000000..27ad819
--- /dev/null
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1102.java
@@ -0,0 +1,78 @@
+package com.fzzy.push.gd2022.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.persistence.Column;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-搴撳尯淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Gd2022Api1102 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 6597930270077627879L;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
+
+ @PropertyDef(label = "搴撳尯鍚嶇О")
+ private String kqmc;
+
+ @PropertyDef(label = "搴撳尯鍦板潃")
+ private String kqdz;
+
+ @PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
+ private String xzqhdm;
+
+ @PropertyDef(label = "搴撳尯浜ф潈", description = "1锛� 鑷湁 2锛氱璧� 3锛氬叡鏈� 4锛氭贩鍚� 9锛氬叾浠�")
+ private String kqcq;
+
+ @PropertyDef(label = "鏈夋晥浠撳")
+ private Double yxcr;
+
+ @PropertyDef(label = "鏈夋晥缃愬")
+ private Double yxgr;
+
+ @PropertyDef(label = "鍗犲湴闈㈢Н")
+ private Double zdmj;
+
+ @PropertyDef(label = "浠撴埧鏁�")
+ @Column(name = "cfs")
+ private Integer cfs;
+
+ @PropertyDef(label = "娌圭綈鏁�")
+ private Integer ygs;
+
+ @PropertyDef(label = "搴撳尯缁忓害")
+ private Double jd;
+
+ @PropertyDef(label = "搴撳尯绾害")
+ private Double wd;
+
+ @PropertyDef(label = "搴撳尯鐘舵��", description = "1:姝ｅ父锛堥粯璁わ級 2:閫�鍑哄偍澶囩伯鎵垮偍")
+ private String kqzt;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "娴峰悍鍖哄煙ID", description = "瀵瑰簲娴峰悍瑙嗛骞冲彴regionIndexCode瀛楁")
+ private String hkRegionId;
+
+ @PropertyDef(label = "浜ф潈鏂瑰簱鍖轰唬鐮�", description = "鑷湁浜ф潈鏃跺簱鍖轰唬鐮佸繀椤荤瓑浜庝骇鏉冩柟搴撳尯浠ｇ爜,闈炶嚜鏈変骇鏉冩椂搴撳尯浠ｇ爜涓嶈兘绛変簬浜ф潈鏂瑰簱鍖轰唬鐮�")
+ private String cqfkqdm;
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1103.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1103.java
new file mode 100644
index 0000000..6753464
--- /dev/null
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1103.java
@@ -0,0 +1,190 @@
+package com.fzzy.push.gd2022.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-浠撴埧淇℃伅
+ */
+@Data
+public class Gd2022Api1103 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 8095346227076335949L;
+
+ @PropertyDef(label = "浠撴埧浠ｇ爜")
+ private String cfdm;
+
+ @PropertyDef(label = "浠撴埧鍚嶇О")
+ private String cfmc;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "浠撴埧绫诲瀷浠ｇ爜")
+ private String cflxdm;
+
+ @PropertyDef(label = "浜や粯浣跨敤鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date jfsyrq;
+
+ @PropertyDef(label = "寤鸿鍗曚綅")
+ private String jsdw;
+
+ @PropertyDef(label = "璁捐浣跨敤骞撮檺")
+ private String sjsynx;
+
+ @PropertyDef(label = "璁捐鍗曚綅")
+ private String sjdw;
+
+ @PropertyDef(label = "鐩戠悊鍗曚綅")
+ private String jldw;
+
+ @PropertyDef(label = "澧欎綋缁撴瀯")
+ private String qtjg;
+
+ @PropertyDef(label = "鎴块《缁撴瀯")
+ private String fdjg;
+
+ @PropertyDef(label = "鎴挎灦缁撴瀯")
+ private String fjjg;
+
+ @PropertyDef(label = "鍦伴潰缁撴瀯")
+ private String dmjg;
+
+ @PropertyDef(label = "璁捐浠撳")
+ private Double sjcr;
+
+ @PropertyDef(label = "浠撳闀�")
+ private Double cwc;
+
+ @PropertyDef(label = "浠撳瀹�")
+ private Double cwk;
+
+ @PropertyDef(label = "浠撳妾愰珮")
+ private Double cwyg;
+
+ @PropertyDef(label = "浠撳椤堕珮")
+ private Double cwdg;
+
+ @PropertyDef(label = "绛掍粨澶栧緞")
+ private Double tcwj;
+
+ @PropertyDef(label = "浠撳唴闀�")
+ private Double cnc;
+
+ @PropertyDef(label = "浠撳唴瀹�")
+ private Double cnk;
+
+ @PropertyDef(label = "浠撳唴妾愰珮")
+ private Double cnyg;
+
+ @PropertyDef(label = "浠撳唴瑁呯伯绾块珮")
+ private Double cnzlxg;
+
+ @PropertyDef(label = "绛掍粨鍐呭緞")
+ private Double tcnj;
+
+ @PropertyDef(label = "浠撳唴浣撶Н")
+ private Double cntj;
+
+ @PropertyDef(label = "浠撻棬鏁伴噺")
+ private Integer cmsl;
+
+ @PropertyDef(label = "浠撻棬浣嶇疆")
+ private String cmwz;
+
+ @PropertyDef(label = "浠撻棬楂樺害")
+ private Double cmgd;
+
+ @PropertyDef(label = "浠撻棬瀹藉害")
+ private Double cmkd;
+
+ @PropertyDef(label = "鎸＄伯闂ㄥ瀷寮�")
+ private String dlmxs;
+
+ @PropertyDef(label = "浠撴埧鏄惁瀹屽ソ")
+ private String cfsfwh;
+
+ @PropertyDef(label = "鍌ㄧ伯鍔熸晥")
+ private String clgx;
+
+ @PropertyDef(label = "鑳藉惁闅旂儹淇濇俯")
+ private String nfgrbw;
+
+ @PropertyDef(label = "闅旂儹淇濇俯鎺柦")
+ private String grbwcs;
+
+ @PropertyDef(label = "闅旂儹鎬ц兘")
+ private String grxn;
+
+ @PropertyDef(label = "缁撴瀯鏉愭枡")
+ private String jgcl;
+
+ @PropertyDef(label = "姘斿瘑鎬�")
+ private String qmx;
+
+ @PropertyDef(label = "鏄惁宸茶繘琛屼俊鎭寲鏀归��")
+ private String sfyjxxxhgz;
+
+ @PropertyDef(label = "绮儏鎶�鏈�")
+ private String lqjs;
+
+ @PropertyDef(label = "鑳藉惁鏁ｈ鍌ㄥ瓨")
+ private String nfszcc;
+
+ @PropertyDef(label = "鏈夋棤闃查紶闃查泙闃茶櫕瑁呯疆鍙婅鏂�")
+ private String ywfsfqfczz;
+
+ @PropertyDef(label = "鏈夋棤闃茬伀闃茬垎闃茬洍璁炬柦")
+ private String ywfhfbfdss;
+
+ @PropertyDef(label = "鏈夋棤鏈烘閫氶璁炬柦")
+ private String ywjxtfss;
+
+ @PropertyDef(label = "閫氶绯荤粺鍨嬪紡")
+ private String tfxtxs;
+
+ @PropertyDef(label = "閫氶鎶�鏈�")
+ private String tfjs;
+
+ @PropertyDef(label = "鑳藉惁鐜祦鐔忚捀鏉�铏�")
+ private String nfhlxzsc;
+
+ @PropertyDef(label = "鏉�铏妧鏈�")
+ private String scjs;
+
+ @PropertyDef(label = "鑳藉惁瀵屾爱浣庢哀姘旇皟鍌ㄧ伯")
+ private String nffddyqtcl;
+
+ @PropertyDef(label = "鎺ф俯鎶�鏈�")
+ private String kwjs;
+
+ @PropertyDef(label = "瀹宠櫕妫�娴嬫柟寮�")
+ private String hcjcfs;
+
+ @PropertyDef(label = "浠撴埧鐘舵��")
+ private String cfzt;
+
+ @PropertyDef(label = "淇濈鍛�")
+ private String bgr;
+
+ @PropertyDef(label = "浠撴埧缁忓害")
+ private Double jd;
+
+ @PropertyDef(label = "浠撴埧绾害")
+ private Double wd;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1104.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1104.java
new file mode 100644
index 0000000..71dbf94
--- /dev/null
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1104.java
@@ -0,0 +1,59 @@
+package com.fzzy.push.gd2022.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-寤掗棿淇℃伅
+ *
+ * @author czt
+ * @date 2022-09-02 14:18
+ */
+@Data
+public class Gd2022Api1104 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 9157617424050247565L;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdh;
+
+ @PropertyDef(label = "寤掗棿鍚嶇О")
+ private String ajmc;
+
+ @PropertyDef(label = "浠撴埧(鎴栨补缃�)缂栫爜")
+ private String cfbh;
+
+ @PropertyDef(label = "寤掗棿闀垮害")
+ private Double ajcd;
+
+ @PropertyDef(label = "寤掗棿瀹藉害")
+ private Double ajkd;
+
+ @PropertyDef(label = "寤掗棿楂樺害")
+ private Double ajgd;
+
+ @PropertyDef(label = "寤掗棿璁捐浠撳")
+ private Double ajsjcr;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寤掗棿鍚敤鏃ユ湡")
+ private Date ajqyrq;
+
+ @PropertyDef(label = "寤掗棿鐘舵��")
+ private String ajzt;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1105.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1105.java
new file mode 100644
index 0000000..132fd7f
--- /dev/null
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1105.java
@@ -0,0 +1,50 @@
+package com.fzzy.push.gd2022.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-璐т綅淇℃伅
+ */
+@Data
+public class Gd2022Api1105 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6967028172020353365L;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "璐т綅鍚嶇О")
+ private String hwmc;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
+ @PropertyDef(label = "璐т綅鍚敤鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date hwqyrq;
+
+ @PropertyDef(label = "璐т綅瀹归噺")
+ private Double hwrl;
+
+ @PropertyDef(label = "淇濈鍗曚綅")
+ private String bgdw;
+
+ @PropertyDef(label = "淇濈鍛�")
+ private String bgy;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 39f8217..77f2e6f 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -266,13 +266,9 @@
List<SH2023Api1101> list = new ArrayList<>();
//鎶奷ata杞寲鎴恖ist闆嗗悎
List<Api1101> api1101List = castList(data, Api1101.class);
- //鏌ヨ寤掗棿鏁�
- List<Api1104> api1104List = api1104Rep.findPushData(api1101List.get(0).getKqdm());
for (Api1101 apiData : api1101List) {
api1101 = new SH2023Api1101();
BeanUtils.copyProperties(apiData, api1101);
- api1101.setAjs(api1104List.size());
- api1101.setBjw(ShAreaBjw.getBjw(code));
list.add(api1101);
}
return JSON.toJSONString(list);
@@ -283,22 +279,9 @@
List<SH2023Api1102> list = new ArrayList<>();
//鎶奷ata杞寲鎴恖ist闆嗗悎
List<Api1102> api1101List = castList(data, Api1102.class);
- //鏌ヨ寤掗棿鏁�
- List<Api1104> api1104List = api1104Rep.findPushData(api1101List.get(0).getKqdm());
- //璁＄畻鍌ㄥ浠撳
- Double count = 0.0;
- for (Api1104 api1104 : api1104List) {
- count = count + api1104.getAjsjcrong();
- }
for (Api1102 apiData : api1101List) {
api1102 = new SH2023Api1102();
BeanUtils.copyProperties(apiData, api1102);
- api1102.setAjs(api1104List.size());
- api1102.setBjw(ShAreaBjw.getBjw(code));
- api1102.setKqsx("2");
- api1102.setCbcr(count);
- //TODO 搴撳尯鐘舵��
- api1102.setKqzt("1");
list.add(api1102);
}
return JSON.toJSONString(list);
@@ -309,13 +292,9 @@
List<SH2023Api1103> list = new ArrayList<>();
//鎶奷ata杞寲鎴恖ist闆嗗悎
List<Api1103> api1103List = castList(data, Api1103.class);
- //鏌ヨ寤掗棿鏁�
- List<Api1104> api1104List = api1104Rep.findPushData(api1103List.get(0).getKqdm());
for (Api1103 apiData : api1103List) {
api1103 = new SH2023Api1103();
BeanUtils.copyProperties(apiData, api1103);
- api1103.setAjs(api1104List.size());
- api1103.setBjw(ShAreaBjw.getBjw(code));
list.add(api1103);
}
return JSON.toJSONString(list);
@@ -331,25 +310,12 @@
BeanUtils.copyProperties(apiData, api1104);
api1104.setAjdm(apiData.getAjdh());
api1104.setCfdm(apiData.getCfbh());
- api1104.setSykqdm(apiData.getKqdm());
- api1104.setBjw(ShAreaBjw.getBjw(code));
list.add(api1104);
}
return JSON.toJSONString(list);
}
if (SH2023Constant.SH_2023_API_CODE_1105.equals(inteId)) {
- SH2023Api1105 api1105;
- //鏈�鍚庤浆鎹负json
- List<SH2023Api1105> list = new ArrayList<>();
- //鎶奷ata杞寲鎴恖ist闆嗗悎
- List<Api1105> api1105List = castList(data, Api1105.class);
- for (Api1105 apiData : api1105List) {
- api1105 = new SH2023Api1105();
- BeanUtils.copyProperties(apiData, api1105);
- api1105.setBjw(ShAreaBjw.getBjw(code));
- list.add(api1105);
- }
- return JSON.toJSONString(list);
+ return JSON.toJSONString(data);
}
if (SH2023Constant.SH_2023_API_CODE_1106.equals(inteId)) {
SH2023Api1106 api1106;
@@ -404,10 +370,9 @@
api1109 = new SH2023Api1109();
BeanUtils.copyProperties(apiData, api1109);
api1109.setBjw(ShAreaBjw.getBjw(code));
- //TODO 涓氬姟鍗曞彿
- if ("1".equals(api1109.getWjlx())) {
- api1109.setYwdh("鏃�");
- }
+
+ api1109.setYwdh("鏃�");
+
map = new HashMap<>();
map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
api1109.setWjl(JSON.toJSONString(map));
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
index ff92803..160e450 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
@@ -33,10 +33,10 @@
private Date zcrq;
@PropertyDef(label = "娉ㄥ唽璧勬湰")
- private double zczb;
+ private Double zczb;
@PropertyDef(label = "璧勪骇鎬婚")
- private double zcze;
+ private Double zcze;
@PropertyDef(label = "娉曞畾浠ｈ〃浜�")
private String fddbr;
@@ -95,10 +95,10 @@
private Integer ygs;
@PropertyDef(label = "缁忓害")
- private double jd;
+ private Double jd;
@PropertyDef(label = "绾害")
- private double wd;
+ private Double wd;
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
index 88463bf..1651745 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
@@ -40,16 +40,16 @@
private String kqcq;
@PropertyDef(label = "鍌ㄥ浠撳")
- private double cbcr;
+ private Double cbcr;
@PropertyDef(label = "鏈夋晥浠撳")
- private double yxcr;
+ private Double yxcr;
@PropertyDef(label = "鏈夋晥缃愬")
- private double yxgr;
+ private Double yxgr;
@PropertyDef(label = "鍗犲湴闈㈢Н")
- private double zdmj;
+ private Double zdmj;
@PropertyDef(label = "浠撴埧鏁�")
private Integer cfs;
@@ -61,10 +61,10 @@
private Integer ygs;
@PropertyDef(label = "搴撳尯缁忓害")
- private double jd;
+ private Double jd;
@PropertyDef(label = "搴撳尯绾害")
- private double wd;
+ private Double wd;
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java
index 5303e5d..88133d0 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java
@@ -58,40 +58,40 @@
private String dmjg;
@PropertyDef(label = "璁捐浠撳")
- private double sjcr;
+ private Double sjcr;
@PropertyDef(label = "浠撳闀�")
- private double cwc;
+ private Double cwc;
@PropertyDef(label = "浠撳瀹�")
- private double cwk;
+ private Double cwk;
@PropertyDef(label = "浠撳妾愰珮")
- private double cwyg;
+ private Double cwyg;
@PropertyDef(label = "浠撳椤堕珮")
- private double cwdg;
+ private Double cwdg;
@PropertyDef(label = "绛掍粨澶栧緞")
- private double tcwj;
+ private Double tcwj;
@PropertyDef(label = "浠撳唴闀�")
- private double cnc;
+ private Double cnc;
@PropertyDef(label = "浠撳唴瀹�")
- private double cnk;
+ private Double cnk;
@PropertyDef(label = "浠撳唴妾愰珮")
- private double cnyg;
+ private Double cnyg;
@PropertyDef(label = "浠撳唴瑁呯伯绾块珮")
- private double cnzlxg;
+ private Double cnzlxg;
@PropertyDef(label = "绛掍粨鍐呭緞")
- private double tcnj;
+ private Double tcnj;
@PropertyDef(label = "浠撳唴浣撶Н")
- private double cntj;
+ private Double cntj;
@PropertyDef(label = "浠撻棬鏁伴噺")
private Integer cmsl;
@@ -100,10 +100,10 @@
private String cmwz;
@PropertyDef(label = "浠撻棬楂樺害")
- private double cmgd;
+ private Double cmgd;
@PropertyDef(label = "浠撻棬瀹藉害")
- private double cmkd;
+ private Double cmkd;
@PropertyDef(label = "鎸＄伯闂ㄥ瀷寮�")
private String dlmxs;
@@ -175,10 +175,10 @@
private String bgr;
@PropertyDef(label = "浠撴埧缁忓害")
- private double jd;
+ private Double jd;
@PropertyDef(label = "浠撴埧绾害")
- private double wd;
+ private Double wd;
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
index 4af04e0..23ab0ed 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
@@ -30,16 +30,16 @@
private String cfdm;
@PropertyDef(label = "寤掗棿闀垮害")
- private double ajcd;
+ private Double ajcd;
@PropertyDef(label = "寤掗棿瀹藉害")
- private double ajkd;
+ private Double ajkd;
@PropertyDef(label = "寤掗棿楂樺害")
- private double ajgd;
+ private Double ajgd;
@PropertyDef(label = "寤掗棿璁捐浠撳")
- private double ajsjcr;
+ private Double ajsjcr;
@PropertyDef(label = "寤掗棿鑱旂郴鐢佃瘽")
private String ajlxdh;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
index 5ca6fe6..04aa037 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
@@ -31,7 +31,7 @@
private Date hwqyrq;
@PropertyDef(label = "璐т綅瀹归噺")
- private double hwrl;
+ private Double hwrl;
@PropertyDef(label = "淇濈鍗曚綅")
private String bgdw;
--
Gitblit v1.9.3