From 5adce825013b49f0614db1746cffe43a7502de82 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期二, 22 八月 2023 23:07:46 +0800 Subject: [PATCH] 更新MODBUS-TCP协议 1 --- igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/data/ModbusTcp.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 49 insertions(+), 8 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..88d5d63 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.constant.Constant; import lombok.Data; /** @@ -10,7 +11,10 @@ @Data public class ModbusTcp { - private String deviceId; + + private String companyId; + + private String deviceCode; private String serId; @@ -21,36 +25,73 @@ /** * 寮�鍦板潃 **/ - private String addrOpen = "65535"; + private String addrOpen = Constant.YN_N; /** * 鍏冲湴鍧� **/ - private String addrClose = "65535"; + private String addrClose = Constant.YN_N; /** * 鍋滃湴鍧� **/ - private String addrStop = "65535"; + private String addrStop = Constant.YN_N; /** * 寮�鍒颁綅鍦板潃 **/ - private String addrOpenEnd = "65535"; + private String addrOpenEnd = Constant.YN_N; /** * 鍏冲埌浣嶅湴鍧� **/ - private String addrCloseEnd = "65535"; + private String addrCloseEnd = Constant.YN_N; /** * 寮�鏁呴殰鍦板潃 **/ - private String addrOpenError = "65535"; + private String addrOpenError = Constant.YN_N; /** * 鍏虫晠闅滃湴鍧� **/ - private String addrCloseError = "65535"; + private String addrCloseError = Constant.YN_N; + private int addrExe = 65535; + + + 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(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; +// } } -- Gitblit v1.9.3