From 2884bf1f32b51129a83125ecfc2cf8526f71154f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 24 八月 2023 15:34:43 +0800
Subject: [PATCH] 更新MODBUS-TCP协议 4
---
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/data/ModbusTcp.java | 53 +++++++++++++++++++++--------------------------------
1 files changed, 21 insertions(+), 32 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 49d1ebc..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,39 +22,24 @@
private int port;
- /**
- * 寮�鍦板潃
- **/
- private String addrOpen = "65535";
+ private DeviceModbus deviceModbus;
- /**
- * 鍏冲湴鍧�
- **/
- private String addrClose = "65535";
+ private int addrExe;
- /**
- * 鍋滃湴鍧�
- **/
- private String addrStop = "65535";
+ public ModbusTcp() {
+ super();
+ }
- /**
- * 寮�鍒颁綅鍦板潃
- **/
- private String addrOpenEnd = "65535";
+ public ModbusTcp(DeviceModbus deviceModbus) {
+ this.deviceModbus = deviceModbus;
+ }
- /**
- * 鍏冲埌浣嶅湴鍧�
- **/
- private String addrCloseEnd = "65535";
-
- /**
- * 寮�鏁呴殰鍦板潃
- **/
- private String addrOpenError = "65535";
-
- /**
- * 鍏虫晠闅滃湴鍧�
- **/
- private String addrCloseError = "65535";
-
+ 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