From 803697bd4f3ac5262e0acd69d6d7cc519ec45b2a Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期一, 04 九月 2023 10:28:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-protocol-modbus/src/main/java/com/ld/igds/models/DeviceModbus.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/DeviceModbus.java b/igds-protocol-modbus/src/main/java/com/ld/igds/models/DeviceModbus.java
similarity index 75%
rename from igds-core/src/main/java/com/ld/igds/models/DeviceModbus.java
rename to igds-protocol-modbus/src/main/java/com/ld/igds/models/DeviceModbus.java
index e41d581..3c0e3d3 100644
--- a/igds-core/src/main/java/com/ld/igds/models/DeviceModbus.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/models/DeviceModbus.java
@@ -1,11 +1,13 @@
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鍙傛暟閰嶇疆
@@ -25,17 +27,22 @@
@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 = "寮�鍦板潃")
+ @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 = "鍏冲湴鍧�")
+ @PropertyDef(label = "鍏冲湴鍧�", description = "鍏冲湴鍧�銆佺┖璋冩俯搴﹁缃湴鍧�")
private String close = Constant.YN_N;
@Column(name = "CLOSE_FUN", length = 4)
@@ -51,7 +58,7 @@
private String stopFun = "99";
@Column(name = "OPEN_END_", length = 10)
- @PropertyDef(label = "鍋滃湴鍧�")
+ @PropertyDef(label = "寮�鍒颁綅鍦板潃", description = "寮�鍒颁綅鍦板潃銆佽繍琛岀姸鎬佸湴鍧�(椋庢満鍜岀┖璋�)")
private String openEnd = Constant.YN_N;
@Column(name = "OPEN_END_FUN", length = 4)
@@ -82,4 +89,13 @@
@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