From 6d847ba021fb494051ec710810a45fa8084f90ed Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 22 八月 2023 23:23:55 +0800
Subject: [PATCH] 更新MODBUS-TCP协议 2
---
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.java | 85 ++++++++++++++++++++++++------------------
1 files changed, 49 insertions(+), 36 deletions(-)
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.java b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.java
index 32d867b..cc85cda 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.java
@@ -97,7 +97,7 @@
//鏍规嵁璁惧鐩爣鐘舵�侊紝璋冪敤MODBUS鎵ц
addrExe = Integer.valueOf(temp) - 1;
modbusTcp.setAddrExe(addrExe);
- doExe(modbusTcp, device.getTargetStatus());
+ doWriteExe(modbusTcp, device.getTargetStatus());
continue;
}
@@ -110,7 +110,7 @@
addrExe = Integer.valueOf(temp) - 1;
modbusTcp.setAddrExe(addrExe);
- doExe(modbusTcp, DeviceStatus.OPEN.getCode());
+ doWriteExe(modbusTcp, DeviceStatus.OPEN.getCode());
Thread.sleep(300);
@@ -120,36 +120,36 @@
addrExe = Integer.valueOf(temp) - 1;
modbusTcpLink.setAddrExe(addrExe);
- doExe(modbusTcpLink, DeviceStatus.OPEN.getCode());
+ doWriteExe(modbusTcpLink, DeviceStatus.OPEN.getCode());
}
//濡傛灉鍏抽鏈�
- if(DeviceStatus.F_CLOSE.equals(device.getTargetStatus())){
+ if (DeviceStatus.F_CLOSE.equals(device.getTargetStatus())) {
temp = modbusTcpLink.getAddrClose();
addrExe = Integer.valueOf(temp) - 1;
modbusTcpLink.setAddrExe(addrExe);
- doExe(modbusTcpLink, DeviceStatus.CLOSE.getCode());
+ doWriteExe(modbusTcpLink, DeviceStatus.CLOSE.getCode());
}
//濡傛灉寮�绐�
- if(DeviceStatus.W_OPEN.equals(device.getTargetStatus())){
+ if (DeviceStatus.W_OPEN.equals(device.getTargetStatus())) {
temp = modbusTcp.getAddrOpen();
addrExe = Integer.valueOf(temp) - 1;
modbusTcp.setAddrExe(addrExe);
- doExe(modbusTcp, device.getTargetStatus());
+ doWriteExe(modbusTcp, device.getTargetStatus());
}
//濡傛灉鏄叧绐楁埛
- if(DeviceStatus.W_CLOSE.equals(device.getTargetStatus())){
+ if (DeviceStatus.W_CLOSE.equals(device.getTargetStatus())) {
//鍏堝叧椋庢満
temp = modbusTcpLink.getAddrClose();
addrExe = Integer.valueOf(temp) - 1;
modbusTcpLink.setAddrExe(addrExe);
- doExe(modbusTcpLink, DeviceStatus.CLOSE.getCode());
+ doWriteExe(modbusTcpLink, DeviceStatus.CLOSE.getCode());
Thread.sleep(300);
@@ -158,7 +158,7 @@
addrExe = Integer.valueOf(temp) - 1;
modbusTcp.setAddrExe(addrExe);
- doExe(modbusTcp, DeviceStatus.CLOSE.getCode());
+ doWriteExe(modbusTcp, DeviceStatus.CLOSE.getCode());
}
}
@@ -170,7 +170,7 @@
return new DeviceControlResponse(OrderRespEnum.ORDER_SUCCESS);
}
- private void doExe(ModbusTcp modbusTcp, String targetStatus) throws Exception {
+ private void doWriteExe(ModbusTcp modbusTcp, String targetStatus) throws Exception {
boolean exeResult = modbusUtil.writeValue05(modbusTcp.getIp(), modbusTcp.getPort(), modbusTcp.getAddrExe(), true);
if (exeResult) {
ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getDeviceCode(), targetStatus);
@@ -194,35 +194,42 @@
ModbusTcp modbusTcp;
ModbusTcp modbusTcpLink;
- int addrStart;
- boolean[] result;
+ int addrExe;
for (Device device : list) {
+
if (null == device.getModbus()) continue;
+
+
modbusTcp = new ModbusTcp(device.getModbus());
modbusTcp.setIp(request.getIp());
modbusTcp.setPort(request.getPort());
modbusTcp.setDeviceCode(device.getPassCode() + "");
- modbusTcp.setSerId(request.getSerId());
+ modbusTcp.setSerId(device.getSerId());
+ modbusTcp.setCompanyId(device.getCompanyId());
- addrStart = Integer.valueOf(modbusTcp.getAddrOpenEnd()) - 1;
- result = modbusUtil.readStatus02(modbusTcp.getIp(), modbusTcp.getPort(), addrStart, 2);
- log.debug("---------璇诲彇鐘舵��------{}--{}", modbusTcp.getDeviceCode(), result.toString());
- analysisResult(device.getCompanyId(), device.getSerId(), modbusTcp.getDeviceCode(), result);
+ if (Constant.YN_N.equals(modbusTcp.getAddrOpenEnd())) continue;
- if (null != device.getLinkModbus()) {
- Thread.sleep(300);
- modbusTcpLink = new ModbusTcp(device.getModbus());
- modbusTcpLink.setIp(request.getIp());
- modbusTcpLink.setPort(request.getPort());
- modbusTcpLink.setSerId(request.getSerId());
- modbusTcpLink.setDeviceCode(device.getLink());
- addrStart = Integer.valueOf(modbusTcpLink.getAddrOpenEnd()) - 1;
- result = modbusUtil.readStatus02(modbusTcpLink.getIp(), modbusTcpLink.getPort(), addrStart, 2);
- log.debug("---------璇诲彇鐘舵��-LINK------{}--{}", modbusTcpLink.getDeviceCode(), result.toString());
+ addrExe = Integer.valueOf(modbusTcp.getAddrOpenEnd()) - 1;
+ modbusTcp.setAddrExe(addrExe);
- analysisResult(device.getCompanyId(), device.getSerId(), modbusTcpLink.getDeviceCode(), result);
- }
+ doReadExe(modbusTcp);
+
+ if (null == device.getLinkModbus()) continue;
+
+ Thread.sleep(300);
+
+ modbusTcpLink = new ModbusTcp(device.getModbus());
+ modbusTcpLink.setIp(request.getIp());
+ modbusTcpLink.setPort(request.getPort());
+ modbusTcpLink.setSerId(device.getSerId());
+ modbusTcpLink.setDeviceCode(device.getLink());
+ modbusTcpLink.setCompanyId(device.getCompanyId());
+ addrExe = Integer.valueOf(modbusTcpLink.getAddrOpenEnd()) - 1;
+ modbusTcpLink.setAddrExe(addrExe);
+
+ doReadExe(modbusTcpLink);
+
}
} catch (Exception e) {
@@ -236,17 +243,23 @@
}
/**
- * 杩斿洖涓や綅锛岀涓�浣嶆槸寮�鍒颁綅锛岀浜屼綅鏄叧鍒颁綅锛屾牴鎹繖涓や釜鏍囪纭褰撳墠璁惧鐨勭姸鎬�
+ * 璇诲彇鐘舵�侊紝鍚屾椂璇诲彇寮�鐘舵�佸拰鍏抽棴鐘舵��
*
- * @param deviceCode
- * @param result
+ * @param modbusTcp
+ * @throws Exception
*/
- private void analysisResult(String companyId, String serId, String deviceCode, boolean[] result) {
+ private void doReadExe(ModbusTcp modbusTcp) throws Exception {
+
+ if (Constant.YN_N.equals(modbusTcp.getAddrOpenEnd())) return;
+
+ boolean[] result = modbusUtil.readStatus02(modbusTcp.getIp(), modbusTcp.getPort(), modbusTcp.getAddrExe(), 2);
+ log.debug("---------璇诲彇鐘舵��------{}--{}", modbusTcp.getDeviceCode(), result.toString());
+
if (result[0]) {
- ServerUtil.add2StatusMap(companyId, serId, deviceCode, DeviceStatus.OPEN.getCode());
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getDeviceCode(), DeviceStatus.OPEN.getCode());
}
if (result[1]) {
- ServerUtil.add2StatusMap(companyId, serId, deviceCode, DeviceStatus.CLOSE.getCode());
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getDeviceCode(), DeviceStatus.CLOSE.getCode());
}
}
--
Gitblit v1.9.3