From 4143abe3b122c303230464a1147fde23cd3c3064 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 25 八月 2023 15:34:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-protocol-modbus/src/main/java/com/ld/igds/models/DeviceModbus.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 89%
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..5d172eb 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,10 +27,15 @@
@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 = "寮�鍦板潃")
private String open = Constant.YN_N;
+
@Column(name = "OPEN_FUN", length = 4)
@PropertyDef(label = "鍔熻兘鍙�")
@@ -82,4 +89,8 @@
@PropertyDef(label = "鍔熻兘鍙�")
private String closeErrorFun = "99";
+
+ @Transient
+ private List<GasModbus> listGas;
+
}
--
Gitblit v1.9.3