From 73f74cbf665a431b0db474be129a03c655e2338a Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 25 八月 2023 13:30:03 +0800
Subject: [PATCH] 更新MODBUS-TCP协议，添加GasModus的配置
---
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/data/ModbusTcp.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/data/ModbusTcp.java b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/data/ModbusTcp.java
index 6b1ddb0..c69d629 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/data/ModbusTcp.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/data/ModbusTcp.java
@@ -1,5 +1,6 @@
package com.ld.igds.protocol.modbus.data;
+import com.ld.igds.models.DeviceModbus;
import lombok.Data;
/**
@@ -10,7 +11,10 @@
@Data
public class ModbusTcp {
- private String deviceId;
+
+ private String companyId;
+
+ private String deviceCode;
private String serId;
@@ -18,18 +22,24 @@
private int port;
- private int addrOpen;
+ private DeviceModbus deviceModbus;
- private int addrClose;
+ private int addrExe;
- private int addrStop;
+ public ModbusTcp() {
+ super();
+ }
- private int addrOpenEnd;
+ public ModbusTcp(DeviceModbus deviceModbus) {
+ this.deviceModbus = deviceModbus;
+ }
- private int addrCloseEnd;
-
- private int addrOpenError;
-
- private int addrCloseError;
-
+ public ModbusTcp(String companyId, String deviceCode, String serId, String ip, int port, DeviceModbus deviceModbus) {
+ this.companyId = companyId;
+ this.deviceCode = deviceCode;
+ this.serId = serId;
+ this.ip = ip;
+ this.port = port;
+ this.deviceModbus = deviceModbus;
+ }
}
--
Gitblit v1.9.3