From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/models/SecCamera.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 56c3288..1b49e25 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,8 +3,10 @@
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;
/**
* 瀹夐槻瑙嗛鐩戞帶璁惧
@@ -41,7 +43,7 @@
@Column(name = "TYPE_", length = 10)
@PropertyDef(label = "璁惧绫诲瀷")
private String type;
-
+
@Column(name = "PLAY_TYPE_", length = 40)
@PropertyDef(label = "鎾斁鏂瑰紡")
private String playType;
@@ -49,6 +51,14 @@
@Column(name = "SNAP_TYPE_", length = 25)
@PropertyDef(label = "鎶撴媿鏂瑰紡")
private String snapType;
+
+ @Column(name = "spjklx", length = 1)
+ @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷")
+ private String spjklx;
+
+ @Column(name = "spdwlx", length = 2)
+ @PropertyDef(label = "瑙嗛鐐逛綅绫诲瀷")
+ private String spdwlx;
@Column(name = "NAME_", length = 50)
@PropertyDef(label = "鍚嶇О")
@@ -86,16 +96,20 @@
@PropertyDef(label = "娴佸獟浣撳湴鍧�")
private String mediaAddr;
+ @Column(name = "PHONE_ADDR_", length = 100)
+ @PropertyDef(label = "鎵嬫満鐩存挱鍦板潃")
+ private String phoneAddr;
+
@Column(name = "REMARK_", length = 300)
@PropertyDef(label = "澶囨敞")
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)
@@ -106,6 +120,10 @@
@PropertyDef(label = "鐩戠鑷姩鎶撴媿")
private String snapTag = Constant.YN_N;
+ @Column(name = "UPDATE_TIME_", length = 1)
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date updateTime;
+
public int getChanNum() {
return chanNum;
}
--
Gitblit v1.9.3