From 9c49930966edbe0f24e62e38f58c2d3e453976b3 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期三, 23 八月 2023 15:51:39 +0800 Subject: [PATCH] 更新MODBUS-TCP协议 4 --- igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/data/ModbusTcp.java | 80 +++++++--------------------------------- 1 files changed, 14 insertions(+), 66 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 88d5d63..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,6 +1,6 @@ package com.ld.igds.protocol.modbus.data; -import com.ld.igds.constant.Constant; +import com.ld.igds.models.DeviceModbus; import lombok.Data; /** @@ -22,76 +22,24 @@ private int port; - /** - * 寮�鍦板潃 - **/ - private String addrOpen = Constant.YN_N; + private DeviceModbus deviceModbus; - /** - * 鍏冲湴鍧� - **/ - private String addrClose = Constant.YN_N; - - /** - * 鍋滃湴鍧� - **/ - private String addrStop = Constant.YN_N; - - /** - * 寮�鍒颁綅鍦板潃 - **/ - private String addrOpenEnd = Constant.YN_N; - - /** - * 鍏冲埌浣嶅湴鍧� - **/ - private String addrCloseEnd = Constant.YN_N; - - /** - * 寮�鏁呴殰鍦板潃 - **/ - private String addrOpenError = Constant.YN_N; - - /** - * 鍏虫晠闅滃湴鍧� - **/ - private String addrCloseError = Constant.YN_N; - - private int addrExe = 65535; - + private int addrExe; public ModbusTcp() { super(); } - public ModbusTcp(String modbusStr) { - //modbus瑙勫垯锛氬紑鍦板潃-鍏冲湴鍧�-鍋滃湴鍧�-寮�鍒颁綅-鍏冲埌浣�-寮�鏁呴殰-鍏虫晠闅滐紝鏃犲湴鍧�鐢∟浠f浛 - String[] addr = modbusStr.split("-"); - this.addrOpen = addr[0]; - this.addrClose = addr[1]; - this.addrStop = addr[2]; - this.addrOpenEnd = addr[3]; - this.addrCloseEnd = addr[4]; - this.addrOpenError = addr[5]; - this.addrCloseError = addr[6]; + public ModbusTcp(DeviceModbus deviceModbus) { + this.deviceModbus = deviceModbus; } -// -// public ModbusTcp(String modbusStr) { -// //modbus瑙勫垯锛氬紑鍦板潃-鍏冲湴鍧�-鍋滃湴鍧�-寮�鍒颁綅-鍏冲埌浣�-寮�鏁呴殰-鍏虫晠闅滐紝鏃犲湴鍧�鐢∟浠f浛 -// String[] addr = modbusStr.split("-"); -// String temp = addr[0]; -// if (!Constant.YN_N.equals(temp)) this.addrOpen = temp; -// temp = addr[1]; -// if (!Constant.YN_N.equals(temp)) this.addrClose = temp; -// temp = addr[2]; -// if (!Constant.YN_N.equals(temp)) this.addrStop = temp; -// temp = addr[3]; -// if (!Constant.YN_N.equals(temp)) this.addrOpenEnd = temp; -// temp = addr[4]; -// if (!Constant.YN_N.equals(temp)) this.addrCloseEnd = temp; -// temp = addr[5]; -// if (!Constant.YN_N.equals(temp)) this.addrOpenError = temp; -// temp = addr[6]; -// if (!Constant.YN_N.equals(temp)) this.addrCloseError = temp; -// } + + 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