From 3c6efb35ff0ebcca6e7104c20cde64825fddd59d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:35:24 +0800
Subject: [PATCH] 添加数据
---
igds-security/src/main/java/com/ld/igds/sec/service/SecurityService.java | 2
igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml | 69 ++++++++++++++++++++++++++++++++++
igds-core/src/main/java/com/ld/igds/models/SecCamera.java | 11 ++++-
igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java | 4 +-
igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java | 2
igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java | 2
6 files changed, 82 insertions(+), 8 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/SecCamera.java b/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
index ea10760..844213c 100644
--- a/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
+++ b/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
@@ -3,6 +3,7 @@
import com.bstek.dorado.annotation.PropertyDef;
import com.ld.igds.constant.Constant;
import lombok.Data;
+
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@@ -42,7 +43,7 @@
@Column(name = "TYPE_", length = 10)
@PropertyDef(label = "璁惧绫诲瀷")
private String type;
-
+
@Column(name = "PLAY_TYPE_", length = 40)
@PropertyDef(label = "鎾斁鏂瑰紡")
private String playType;
@@ -50,6 +51,10 @@
@Column(name = "SNAP_TYPE_", length = 25)
@PropertyDef(label = "鎶撴媿鏂瑰紡")
private String snapType;
+
+ @Column(name = "azwzlx", length = 2)
+ @PropertyDef(label = "瀹夎浣嶇疆绫诲瀷")
+ private String azwzlx;
@Column(name = "NAME_", length = 50)
@PropertyDef(label = "鍚嶇О")
@@ -92,11 +97,11 @@
private String remark;
@PropertyDef(label = "椤甸潰涓殑鍧愭爣")
- @Column(name = "POS_X_",updatable = false)
+ @Column(name = "POS_X_", updatable = false)
private double posX;
@PropertyDef(label = "椤甸潰涓殑鍧愭爣")
- @Column(name = "POS_Y_",updatable = false)
+ @Column(name = "POS_Y_", updatable = false)
private double posY;
@Column(name = "SCREEN_SHOW_", length = 1)
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
index fdf340d..f44e71d 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
@@ -19,7 +19,7 @@
@Entity
@Data
@Table(name = "D_DRUG_LOG_DTL")
- public class DrugLogDtl implements Serializable {
+public class DrugLogDtl implements Serializable {
@Id
@Column(name = "DTL_ID_", length = 40)
@@ -27,7 +27,7 @@
private String dtlId;
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "id", description = "鐔忚捀缂栧彿+搴撳尯浠ｇ爜+濉姤鏃ユ湡")
+ @PropertyDef(label = "id", description = "搴撳尯浠ｇ爜+濉姤鏃ユ湡+鐔忚捀缂栧彿")
private String id;
@Column(name = "DRUG_LOG_ID_", length = 4)
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java
index 8707f80..1ad403f 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java
@@ -27,7 +27,7 @@
private String propleId;
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "id")
+ @PropertyDef(label = "id", description = "搴撳尯浠ｇ爜+濉姤鏃ユ湡+鐔忚捀缂栧彿")
private String id;
@Column(name = "DRUG_LOG_ID_", length = 4)
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
index 08a7530..d58e009 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
@@ -28,7 +28,7 @@
private String wayId;
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "id",description = "涓庡妗堜俊鎭叧鑱擨D 鐔忚捀缂栫爜+搴撳尯浠ｇ爜+濉姤鏃ユ湡")
+ @PropertyDef(label = "id", description = "涓庡妗堜俊鎭叧鑱擨D锛屽簱鍖轰唬鐮�+鐔忚捀缂栫爜+濉姤鏃ユ湡")
private String id;
@Column(name = "DRUG_LOG_ID_", length = 4)
diff --git a/igds-security/src/main/java/com/ld/igds/sec/service/SecurityService.java b/igds-security/src/main/java/com/ld/igds/sec/service/SecurityService.java
index 0b45821..418ed6a 100644
--- a/igds-security/src/main/java/com/ld/igds/sec/service/SecurityService.java
+++ b/igds-security/src/main/java/com/ld/igds/sec/service/SecurityService.java
@@ -59,7 +59,7 @@
if (null == data.getCompanyId()) {
data.setCompanyId(ContextUtil.getCompanyId());
}
-
+ data.setUpdateTime(new Date());
if (data.getChanNum() == 0) {
data.setChanNum(1);
}
diff --git a/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml b/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
index 810be96..1fb7fdf 100644
--- a/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
+++ b/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
@@ -197,6 +197,70 @@
</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">
@@ -526,6 +590,11 @@
<Property name="property">snapType</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">azwzlx</Property>
+ <Property name="property">azwzlx</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
--
Gitblit v1.9.3