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/command/RemoteControlServiceImpl.java | 200 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 161 insertions(+), 39 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 0af4436..32d867b 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
@@ -13,6 +13,7 @@
import com.ld.igds.io.response.DeviceControlResponse;
import com.ld.igds.models.Device;
import com.ld.igds.protocol.modbus.ModbusUtil;
+import com.ld.igds.protocol.modbus.ServerUtil;
import com.ld.igds.protocol.modbus.data.ModbusTcp;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -36,7 +37,10 @@
@Resource
private CoreDeviceService deviceService;
@Resource
+ private AnalysisService analysisService;
+ @Resource
private ModbusUtil modbusUtil;
+
@Override
public String getProtocol() {
@@ -51,14 +55,11 @@
return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "娌℃湁闇�瑕佹墽琛岀殑璁惧");
}
-
try {
-
-
Device device;
ModbusTcp modbusTcp;
- String[] addr;
- String temp;
+ ModbusTcp modbusTcpLink = null;
+ String temp = Constant.YN_N;
int addrExe = 65535;
for (ExeDevice exeDevice : deviceList) {
device = deviceService.getCacheDeviceById(exeDevice.getCompanyId(), exeDevice.getId());
@@ -67,79 +68,200 @@
if (null == device.getModbus()) continue;
- modbusTcp = new ModbusTcp();
+ modbusTcp = new ModbusTcp(device.getModbus());
modbusTcp.setIp(request.getIp());
modbusTcp.setPort(request.getPort());
- modbusTcp.setDeviceId(device.getId());
+ modbusTcp.setDeviceCode(device.getPassCode() + "");
modbusTcp.setSerId(request.getSerId());
+ modbusTcp.setCompanyId(request.getCompanyId());
- //modbus瑙勫垯锛氬紑鍦板潃-鍏冲湴鍧�-鍋滃湴鍧�-寮�鍒颁綅-鍏冲埌浣�-寮�鏁呴殰-鍏虫晠闅滐紝鏃犲湴鍧�鐢∟浠ｆ浛
- addr = device.getModbus().split("-");
- temp = addr[0];
- if (!Constant.YN_N.equals(temp)) modbusTcp.setAddrOpen(temp);
- temp = addr[1];
- if (!Constant.YN_N.equals(temp)) modbusTcp.setAddrClose(temp);
- temp = addr[2];
- if (!Constant.YN_N.equals(temp)) modbusTcp.setAddrStop(temp);
- temp = addr[3];
- if (!Constant.YN_N.equals(temp)) modbusTcp.setAddrOpenEnd(temp);
- temp = addr[4];
- if (!Constant.YN_N.equals(temp)) modbusTcp.setAddrCloseEnd(temp);
- temp = addr[5];
- if (!Constant.YN_N.equals(temp)) modbusTcp.setAddrOpenError(temp);
- temp = addr[6];
- if (!Constant.YN_N.equals(temp)) modbusTcp.setAddrCloseError(temp);
-
+ if (null != device.getLinkModbus()) {
+ modbusTcpLink = new ModbusTcp(device.getLinkModbus());
+ modbusTcpLink.setIp(request.getIp());
+ modbusTcpLink.setPort(request.getPort());
+ modbusTcpLink.setDeviceCode(device.getLink());
+ modbusTcpLink.setSerId(request.getSerId());
+ modbusTcpLink.setCompanyId(request.getCompanyId());
+ }
//鏍规嵁璁惧鐩爣鐩爣鐘舵�侊紝閫夋嫨闇�瑕佹墽琛岀殑閫氶亾
if (DeviceStatus.CLOSE.getCode().equals(device.getTargetStatus())) {
- addrExe = Integer.valueOf(modbusTcp.getAddrClose());
+ temp = modbusTcp.getAddrClose();
}
- if(DeviceStatus.OPEN.getCode().equals(device.getTargetStatus())){
- addrExe = Integer.valueOf(modbusTcp.getAddrOpen());
+ if (DeviceStatus.OPEN.getCode().equals(device.getTargetStatus())) {
+ temp = modbusTcp.getAddrOpen();
+ }
+
+ if (null == modbusTcpLink) {
+ //鏍规嵁璁惧鐩爣鐘舵�侊紝璋冪敤MODBUS鎵ц
+ addrExe = Integer.valueOf(temp) - 1;
+ modbusTcp.setAddrExe(addrExe);
+ doExe(modbusTcp, device.getTargetStatus());
+ continue;
}
- //TODO 鍏朵粬鐘舵�佸緟瀹�
+ //濡傛灉鏄紑椋庢満
+ if (DeviceStatus.F_OPEN.getCode().equals(device.getTargetStatus())) {
- //鏍规嵁璁惧鐩爣鐘舵�侊紝璋冪敤MODBUS鎵ц
- modbusUtil.writeCoil(modbusTcp.getIp(), modbusTcp.getPort(),addrExe, true);
+ //鍏堝紑绐楀彛
+ temp = modbusTcp.getAddrOpen();
+ addrExe = Integer.valueOf(temp) - 1;
+ modbusTcp.setAddrExe(addrExe);
+
+ doExe(modbusTcp, DeviceStatus.OPEN.getCode());
+
+
+ Thread.sleep(300);
+
+ //鍐嶅紑椋庢満
+ temp = modbusTcpLink.getAddrOpen();
+ addrExe = Integer.valueOf(temp) - 1;
+ modbusTcpLink.setAddrExe(addrExe);
+
+ doExe(modbusTcpLink, DeviceStatus.OPEN.getCode());
+ }
+
+ //濡傛灉鍏抽鏈�
+ if(DeviceStatus.F_CLOSE.equals(device.getTargetStatus())){
+ temp = modbusTcpLink.getAddrClose();
+ addrExe = Integer.valueOf(temp) - 1;
+ modbusTcpLink.setAddrExe(addrExe);
+
+ doExe(modbusTcpLink, DeviceStatus.CLOSE.getCode());
+ }
+
+
+ //濡傛灉寮�绐�
+ if(DeviceStatus.W_OPEN.equals(device.getTargetStatus())){
+ temp = modbusTcp.getAddrOpen();
+ addrExe = Integer.valueOf(temp) - 1;
+ modbusTcp.setAddrExe(addrExe);
+
+ doExe(modbusTcp, 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());
+
+ Thread.sleep(300);
+
+ //鍦ㄥ叧绐楁埛
+ temp = modbusTcp.getAddrClose();
+ addrExe = Integer.valueOf(temp) - 1;
+ modbusTcp.setAddrExe(addrExe);
+
+ doExe(modbusTcp, DeviceStatus.CLOSE.getCode());
+ }
}
} catch (Exception e) {
-
+ log.error("璋冪敤MODBUS-TCP鎵ц寮傚父锛歿}", e);
+ return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍚庡彴鎵ц寮傚父锛�" + e.getMessage());
}
return new DeviceControlResponse(OrderRespEnum.ORDER_SUCCESS);
}
+ private void doExe(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);
+ }
+ }
+
@Override
public DeviceControlResponse closeAll(DeviceControlRequest request) {
- return null;
+ return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "缁堢鏌滀綋涓嶆敮鎸�");
}
@Override
public DeviceControlResponse queryStatus(DeviceControlRequest request) {
- return null;
+ try {
+ List<Device> list = deviceService.getCacheDeviceBySerId(request.getCompanyId(), request.getSerId());
+
+ if (null == list || list.isEmpty()) {
+ return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鏈幏鍙栧埌璁惧鍒楄〃淇℃伅");
+ }
+
+ ModbusTcp modbusTcp;
+ ModbusTcp modbusTcpLink;
+ int addrStart;
+ boolean[] result;
+ 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());
+
+ 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 (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());
+
+ analysisResult(device.getCompanyId(), device.getSerId(), modbusTcpLink.getDeviceCode(), result);
+ }
+ }
+
+ } catch (Exception e) {
+ log.error("璋冪敤MODBUS-TCP鎵ц寮傚父锛歿}", e);
+ return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍚庡彴鎵ц寮傚父锛�" + e.getMessage());
+ }
+
+ analysisService.analysisDevice(request, 3000);
+
+ return new DeviceControlResponse(OrderRespEnum.ORDER_SUCCESS);
+ }
+
+ /**
+ * 杩斿洖涓や綅锛岀涓�浣嶆槸寮�鍒颁綅锛岀浜屼綅鏄叧鍒颁綅锛屾牴鎹繖涓や釜鏍囪纭褰撳墠璁惧鐨勭姸鎬�
+ *
+ * @param deviceCode
+ * @param result
+ */
+ private void analysisResult(String companyId, String serId, String deviceCode, boolean[] result) {
+ if (result[0]) {
+ ServerUtil.add2StatusMap(companyId, serId, deviceCode, DeviceStatus.OPEN.getCode());
+ }
+ if (result[1]) {
+ ServerUtil.add2StatusMap(companyId, serId, deviceCode, DeviceStatus.CLOSE.getCode());
+ }
}
@Override
public DeviceControlResponse tempControl(TempControlRequest request) {
- return null;
+ return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "缁堢鏌滀綋鏈帴鍏ュ綋鍓嶆帶鍒�");
}
@Override
public DeviceControlResponse airAutoControl(DeviceAutoControlRequest request) {
-
-
- return null;
+ return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "缁堢鏌滀綋鏈帴鍏ュ綋鍓嶆帶鍒�");
}
@Override
public DeviceControlResponse n2AutoControl(DeviceAutoControlRequest request) {
-
- return null;
+ return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "缁堢鏌滀綋鏈帴鍏ュ綋鍓嶆帶鍒�");
}
}
--
Gitblit v1.9.3