From 7243e0b4bd9a267a633d2e481e17646509b6868d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-protocol-modbus/src/main/java/com/ld/igds/models/DeviceModbus.java |  101 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 101 insertions(+), 0 deletions(-)

diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/models/DeviceModbus.java b/igds-protocol-modbus/src/main/java/com/ld/igds/models/DeviceModbus.java
new file mode 100644
index 0000000..3c0e3d3
--- /dev/null
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/models/DeviceModbus.java
@@ -0,0 +1,101 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.ld.igds.constant.BizType;
+import com.ld.igds.constant.Constant;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 鏍规嵁璁惧閰嶇疆鐨凪odbus-TCP鍙傛暟閰嶇疆
+ */
+@Data
+@Entity
+@Table(name = "D_DEVICE_MODBUS")
+public class DeviceModbus implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "ID_", length = 40)
+    @PropertyDef(label = "ID")
+    private String id;
+
+    @Column(name = "DEVICE_CODE_", length = 40)
+    @PropertyDef(label = "璁惧缂栫爜")
+    private String deviceCode;
+    
+    @Column(name = "BIZ_TYEP_", length = 10)
+    @PropertyDef(label = "涓氬姟绫诲瀷")
+    private String bizType = BizType.AREATION.getCode();
+
+    @Column(name = "OPEN_", length = 10)
+    @PropertyDef(label = "寮�鍦板潃", description = "寮�鍦板潃銆佽兘鑰楄鍙栧湴鍧�")
+    private String open = Constant.YN_N;
+
+
+    @Column(name = "OPEN_FUN", length = 4)
+    @PropertyDef(label = "鍔熻兘鍙�")
+    private String openFun = "99";
+
+    @Column(name = "CLOSE_", length = 10)
+    @PropertyDef(label = "鍏冲湴鍧�", description = "鍏冲湴鍧�銆佺┖璋冩俯搴﹁缃湴鍧�")
+    private String close = Constant.YN_N;
+
+    @Column(name = "CLOSE_FUN", length = 4)
+    @PropertyDef(label = "鍔熻兘鍙�")
+    private String closeFun = "99";
+
+    @Column(name = "STOP_", length = 10)
+    @PropertyDef(label = "鍋滃湴鍧�")
+    private String stop = Constant.YN_N;
+
+    @Column(name = "STOP_FUN", length = 4)
+    @PropertyDef(label = "鍔熻兘鍙�")
+    private String stopFun = "99";
+
+    @Column(name = "OPEN_END_", length = 10)
+    @PropertyDef(label = "寮�鍒颁綅鍦板潃", description = "寮�鍒颁綅鍦板潃銆佽繍琛岀姸鎬佸湴鍧�(椋庢満鍜岀┖璋�)")
+    private String openEnd = Constant.YN_N;
+
+    @Column(name = "OPEN_END_FUN", length = 4)
+    @PropertyDef(label = "鍔熻兘鍙�")
+    private String openEndFun = "99";
+
+    @Column(name = "CLOSE_END_", length = 10)
+    @PropertyDef(label = "鍏冲埌浣嶅湴鍧�")
+    private String closeEnd = Constant.YN_N;
+
+    @Column(name = "CLOSE_END_FUN", length = 4)
+    @PropertyDef(label = "鍔熻兘鍙�")
+    private String closeEndFun = "99";
+
+    @Column(name = "OPEN_ERROR_", length = 10)
+    @PropertyDef(label = "寮�鏁呴殰鍦板潃")
+    private String openError = Constant.YN_N;
+
+    @Column(name = "OPEN_ERROR_FUN", length = 4)
+    @PropertyDef(label = "鍔熻兘鍙�")
+    private String openErrorFun = "99";
+
+    @Column(name = "CLOSE_ERROR_", length = 10)
+    @PropertyDef(label = "鍏虫晠闅滃湴鍧�")
+    private String closeError = Constant.YN_N;
+
+    @Column(name = "CLOSE_ERROR_FUN", length = 4)
+    @PropertyDef(label = "鍔熻兘鍙�")
+    private String closeErrorFun = "99";
+
+    //杞存祦椋庢満鍜岃酱娴佺獥鍙兘涓嶅湪涓�涓垎鏈轰笂锛孖P涓嶅悓
+    @Column(name = "SER_ID_", length = 10)
+    @PropertyDef(label = "鎵�灞炲垎鏈�")
+    private String serId;
+
+
+    @Transient
+    private List<GasModbus> listGas;
+
+}

--
Gitblit v1.9.3