From e78af8510a56008ebc5939e4a30883fe6238d509 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 07 九月 2023 18:46:04 +0800
Subject: [PATCH] 优化气体采集配置
---
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.java | 209 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 166 insertions(+), 43 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 c59a7b2..7057bc8 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
@@ -1,8 +1,11 @@
package com.ld.igds.protocol.modbus.command;
import com.ld.igds.common.CoreDeviceService;
+import com.ld.igds.common.CoreSerService;
+import com.ld.igds.constant.BizType;
import com.ld.igds.constant.Constant;
import com.ld.igds.constant.DeviceStatus;
+import com.ld.igds.constant.DeviceType;
import com.ld.igds.io.RemoteControlService;
import com.ld.igds.io.constant.OrderRespEnum;
import com.ld.igds.io.constant.ProtocolEnum;
@@ -14,6 +17,7 @@
import com.ld.igds.modbus.service.HModbusService;
import com.ld.igds.models.Device;
import com.ld.igds.models.DeviceModbus;
+import com.ld.igds.models.DeviceSer;
import com.ld.igds.protocol.modbus.ModbusUtil2;
import com.ld.igds.protocol.modbus.ServerUtil;
import com.ld.igds.protocol.modbus.data.ModbusTcp;
@@ -43,6 +47,8 @@
private HModbusService deviceModbusService;
@Resource
private AnalysisService analysisService;
+ @Resource
+ private CoreSerService coreSerService;
@Override
@@ -63,6 +69,7 @@
ModbusTcp modbusTcp;
ModbusTcp modbusTcpLink = null;
String temp = Constant.YN_N;
+ DeviceSer deviceSer;
for (ExeDevice exeDevice : deviceList) {
deviceModbus = deviceModbusService.getCacheDeviceModbus(request.getCompanyId(), exeDevice.getPassCode() + "");
@@ -74,7 +81,13 @@
modbusTcp = new ModbusTcp(deviceModbus);
modbusTcp.setIp(request.getIp());
modbusTcp.setPort(request.getPort());
- modbusTcp.setDeviceCode(exeDevice.getPassCode() + "");
+ //鑻odbus璁惧閰嶇疆鍒嗘満锛屽垯浣跨敤鎵�閰嶇疆鍒嗘満鐨処P銆佺鍙�
+ if (StringUtils.isNotEmpty(deviceModbus.getSerId())) {
+ deviceSer = coreSerService.getCacheSer(request.getCompanyId(), deviceModbus.getSerId());
+ modbusTcp.setIp(deviceSer.getIp());
+ modbusTcp.setPort(deviceSer.getPort());
+ }
+ modbusTcp.setBizCode(exeDevice.getPassCode() + "");
modbusTcp.setSerId(request.getSerId());
modbusTcp.setCompanyId(request.getCompanyId());
@@ -87,74 +100,87 @@
temp = modbusTcp.getDeviceModbus().getOpen();
}
+ //鐜祦椋庢満-鍏�
+ if (DeviceStatus.F_CLOSE.getCode().equals(exeDevice.getTargetStatus())) {
+ temp = modbusTcp.getDeviceModbus().getStop();
+ }
+
+ //鐜祦椋庢満-寮�
+ if (DeviceStatus.F_OPEN.getCode().equals(exeDevice.getTargetStatus())) {
+ temp = modbusTcp.getDeviceModbus().getOpen();
+ }
+
if (StringUtils.isBlank(exeDevice.getLink()) || "null".equals(exeDevice.getLink())) {
//鏍规嵁璁惧鐩爣鐘舵�侊紝璋冪敤MODBUS鎵ц
- modbusTcp.setAddrExe(this.getAddrExe(temp));
+ modbusTcp.setAddrExe(ServerUtil.getAddrExe(temp));
doWriteExe(modbusTcp, exeDevice.getTargetStatus());
continue;
}
-
deviceModbus = deviceModbusService.getCacheDeviceModbus(request.getCompanyId(), exeDevice.getLink());
if (null == deviceModbus) continue;
modbusTcpLink = new ModbusTcp(deviceModbus);
modbusTcpLink.setIp(request.getIp());
modbusTcpLink.setPort(request.getPort());
- modbusTcpLink.setDeviceCode(exeDevice.getLink());
+ modbusTcpLink.setBizCode(exeDevice.getLink());
modbusTcpLink.setSerId(request.getSerId());
modbusTcpLink.setCompanyId(request.getCompanyId());
+ //鑻odbus璁惧閰嶇疆鍒嗘満锛屽垯浣跨敤鎵�閰嶇疆鍒嗘満鐨処P銆佺鍙�
+ if (StringUtils.isNotEmpty(deviceModbus.getSerId())) {
+ deviceSer = coreSerService.getCacheSer(request.getCompanyId(), deviceModbus.getSerId());
+ modbusTcpLink.setIp(deviceSer.getIp());
+ modbusTcpLink.setPort(deviceSer.getPort());
+ }
//濡傛灉鏄紑椋庢満
if (DeviceStatus.F_OPEN.getCode().equals(exeDevice.getTargetStatus())) {
//鍏堝紑绐楀彛
temp = modbusTcp.getDeviceModbus().getOpen();
- modbusTcp.setAddrExe(this.getAddrExe(temp));
-
+ modbusTcp.setAddrExe(ServerUtil.getAddrExe(temp));
doWriteExe(modbusTcp, DeviceStatus.OPEN.getCode());
-
Thread.sleep(300);
//鍐嶅紑椋庢満
temp = modbusTcpLink.getDeviceModbus().getOpen();
- modbusTcpLink.setAddrExe(this.getAddrExe(temp));
+ modbusTcpLink.setAddrExe(ServerUtil.getAddrExe(temp));
doWriteExe(modbusTcpLink, DeviceStatus.OPEN.getCode());
}
//濡傛灉鍏抽鏈�
- if (DeviceStatus.F_CLOSE.equals(exeDevice.getTargetStatus())) {
+ if (DeviceStatus.F_CLOSE.getCode().equals(exeDevice.getTargetStatus())) {
temp = modbusTcpLink.getDeviceModbus().getStop();
- modbusTcpLink.setAddrExe(this.getAddrExe(temp));
+ modbusTcpLink.setAddrExe(ServerUtil.getAddrExe(temp));
doWriteExe(modbusTcpLink, DeviceStatus.CLOSE.getCode());
}
//濡傛灉寮�绐�
- if (DeviceStatus.W_OPEN.equals(exeDevice.getTargetStatus())) {
+ if (DeviceStatus.W_OPEN.getCode().equals(exeDevice.getTargetStatus())) {
temp = modbusTcp.getDeviceModbus().getOpen();
- modbusTcp.setAddrExe(this.getAddrExe(temp));
+ modbusTcp.setAddrExe(ServerUtil.getAddrExe(temp));
doWriteExe(modbusTcp, exeDevice.getTargetStatus());
}
//濡傛灉鏄叧绐楁埛
- if (DeviceStatus.W_CLOSE.equals(exeDevice.getTargetStatus())) {
+ if (DeviceStatus.W_CLOSE.getCode().equals(exeDevice.getTargetStatus())) {
//鍏堝叧椋庢満
temp = modbusTcpLink.getDeviceModbus().getStop();
- modbusTcpLink.setAddrExe(this.getAddrExe(temp));
+ modbusTcpLink.setAddrExe(ServerUtil.getAddrExe(temp));
doWriteExe(modbusTcpLink, DeviceStatus.CLOSE.getCode());
Thread.sleep(300);
//鍦ㄥ叧绐楁埛
- temp = modbusTcp.getDeviceModbus().getOpen();
- modbusTcp.setAddrExe(this.getAddrExe(temp));
+ temp = modbusTcp.getDeviceModbus().getClose();
+ modbusTcp.setAddrExe(ServerUtil.getAddrExe(temp));
doWriteExe(modbusTcp, DeviceStatus.CLOSE.getCode());
}
@@ -168,19 +194,14 @@
return new DeviceControlResponse(OrderRespEnum.ORDER_SUCCESS);
}
- private int getAddrExe(String temp) {
- if (Constant.YN_N.equals(temp)) return 65535;
- if (temp.length() > 4) {
- temp = temp.substring(temp.length() - 4);
- }
- return Integer.valueOf(temp) - 1;
- }
-
private void doWriteExe(ModbusTcp modbusTcp, String targetStatus) throws Exception {
boolean exeResult = ModbusUtil2.writeCoilStatus(modbusTcp.getIp(), modbusTcp.getPort(), modbusTcp.getAddrExe(), true);
if (exeResult) {
- log.debug("--------鍐欏叆鍊�---{}-{}-{}", modbusTcp.getSerId(), modbusTcp.getDeviceCode(), targetStatus);
- ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getDeviceCode(), targetStatus);
+ //鏍规嵁Modbus-TCP锛屽皢鍐欒繃鐨勫�硷紝鎭㈠鍘熸潵鐨勫��
+ ModbusUtil2.writeCoilStatus(modbusTcp.getIp(), modbusTcp.getPort(), modbusTcp.getAddrExe(), false);
+
+ log.debug("--------鍐欏叆鍊�---{}-{}-{}", modbusTcp.getSerId(), modbusTcp.getBizCode(), targetStatus);
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), targetStatus);
}
}
@@ -204,6 +225,11 @@
for (Device device : list) {
deviceModbus = deviceModbusService.getCacheDeviceModbus(request.getCompanyId(), device.getPassCode() + "");
+ //绌鸿皟璁惧鍗曠嫭鏌ヨ
+ if(DeviceType.TYPE_05.getCode().equals(device.getType())){
+ deviceModbus = deviceModbusService.getCacheDeviceModbus(request.getCompanyId(), device.getPassCode() + "", BizType.TEMPCONTROL.getCode());
+ }
+
if (null == deviceModbus) {
log.error("褰撳墠璁惧---{}{},涓鸿幏鍙栧埌閰嶇疆鐨凪ODBUS淇℃伅", device.getSerId(), device.getName());
continue;
@@ -214,11 +240,17 @@
modbusTcp = new ModbusTcp(deviceModbus);
modbusTcp.setIp(request.getIp());
modbusTcp.setPort(request.getPort());
- modbusTcp.setDeviceCode(device.getPassCode() + "");
+ modbusTcp.setBizCode(device.getPassCode() + "");
modbusTcp.setSerId(device.getSerId());
modbusTcp.setCompanyId(device.getCompanyId());
- doReadStatus(modbusTcp);
+ //绌鸿皟鐘舵�佸崟鐙鍙�
+ if(DeviceType.TYPE_05.getCode().equals(device.getType())){
+ doReadTempStatus(modbusTcp);
+ continue;
+ }
+
+ doReadStatus(modbusTcp, false);
if (StringUtils.isBlank(device.getLink()) || "null".equals(device.getLink())) continue;
@@ -232,12 +264,12 @@
modbusTcpLink.setIp(request.getIp());
modbusTcpLink.setPort(request.getPort());
modbusTcpLink.setSerId(device.getSerId());
- modbusTcpLink.setDeviceCode(device.getLink());
+ modbusTcpLink.setBizCode(device.getLink());
modbusTcpLink.setCompanyId(device.getCompanyId());
- modbusTcpLink.setAddrExe(this.getAddrExe(modbusTcp.getDeviceModbus().getOpenEnd()));
+ modbusTcpLink.setAddrExe(ServerUtil.getAddrExe(modbusTcp.getDeviceModbus().getOpenEnd()));
- doReadStatus(modbusTcpLink);
+ doReadStatus(modbusTcpLink, true);
}
} catch (Exception e) {
@@ -254,34 +286,125 @@
* 璇诲彇鐘舵�侊紝鍚屾椂璇诲彇寮�鐘舵�佸拰鍏抽棴鐘舵��
*
* @param modbusTcp
+ * @param flag 鏄惁鏄叧鑱旇澶�
* @throws Exception
*/
- private void doReadStatus(ModbusTcp modbusTcp) throws Exception {
+ private void doReadStatus(ModbusTcp modbusTcp, Boolean flag) throws Exception {
if (Constant.YN_N.equals(modbusTcp.getDeviceModbus().getOpen())) return;
+ if (Constant.YN_N.equals(modbusTcp.getDeviceModbus().getOpenEnd())) return;
- int addrExe = getAddrExe(modbusTcp.getDeviceModbus().getOpenEnd());
-
+ int addrExe = ServerUtil.getAddrExe(modbusTcp.getDeviceModbus().getOpenEnd());
boolean result = ModbusUtil2.readInputStatus(modbusTcp.getIp(), modbusTcp.getPort(), addrExe);
- log.debug("---------璇诲紑鍒颁綅鐘舵��------{}-{}-{}", modbusTcp.getDeviceCode(), addrExe, result);
-
+ log.debug("---------璇婚绐楅鍙ｅ紑鍒颁綅鐘舵��(鎴栧叾浠栬澶囪繍琛岀姸鎬�)------{}-{}-{}", modbusTcp.getBizCode(), addrExe, result);
+ String statusOpen = DeviceStatus.OPEN.getCode();
+ String statusClose = DeviceStatus.CLOSE.getCode();
+ if(flag){
+ statusOpen = DeviceStatus.F_OPEN.getCode();
+ statusClose = DeviceStatus.F_CLOSE.getCode();
+ }
if (result) {
- ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getDeviceCode(), DeviceStatus.OPEN.getCode());
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), statusOpen);
+ }else {
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), statusClose);
}
-
- addrExe = getAddrExe(modbusTcp.getDeviceModbus().getCloseEnd());
+ if (Constant.YN_N.equals(modbusTcp.getDeviceModbus().getCloseEnd())) return;
+ addrExe = ServerUtil.getAddrExe(modbusTcp.getDeviceModbus().getCloseEnd());
result = ModbusUtil2.readInputStatus(modbusTcp.getIp(), modbusTcp.getPort(), addrExe);
- log.debug("---------璇诲叧鍒颁綅鐘舵��------{}-{}-{}", modbusTcp.getDeviceCode(), addrExe, result);
-
+ log.debug("---------璇婚绐楅鍙ｅ叧鍒颁綅鐘舵��------{}-{}-{}", modbusTcp.getBizCode(), addrExe, result);
if (result) {
- ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getDeviceCode(), DeviceStatus.CLOSE.getCode());
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), DeviceStatus.CLOSE.getCode());
+ }else {
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), DeviceStatus.OPEN.getCode());
+ }
+ }
+
+ /**
+ * 璇诲彇绌鸿皟璁惧鐘舵��
+ *
+ * @param modbusTcp
+ * @throws Exception
+ */
+ private void doReadTempStatus(ModbusTcp modbusTcp) throws Exception {
+
+ if (Constant.YN_N.equals(modbusTcp.getDeviceModbus().getOpenEnd())) return;
+
+ int addrExe = ServerUtil.getAddrExe(modbusTcp.getDeviceModbus().getOpenEnd());
+ Number number = ModbusUtil2.readHoldingRegister(modbusTcp.getIp(), modbusTcp.getPort(), addrExe);
+ log.debug("---------璇荤┖璋冭繍琛岀姸鎬�------{}-{}-{}", modbusTcp.getBizCode(), addrExe, number);
+
+ int num = number.intValue();
+ if(num == 1){
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), DeviceStatus.OPEN.getCode());
+ }
+ if(num == 2){
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), DeviceStatus.CLOSE.getCode());
}
}
@Override
public DeviceControlResponse tempControl(TempControlRequest request) {
- return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "缁堢鏌滀綋鏈帴鍏ュ綋鍓嶆帶鍒�");
+ ExeDevice exeDevice = request.getExeDevice();
+
+ if (null == exeDevice) {
+ return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "娌℃湁闇�瑕佹墽琛岀殑璁惧");
+ }
+
+ try {
+ ModbusTcp modbusTcp;
+ String temp = Constant.YN_N;
+ DeviceSer deviceSer;
+
+ DeviceModbus deviceModbus = deviceModbusService.getCacheDeviceModbus(request.getCompanyId(), exeDevice.getPassCode() + "", BizType.TEMPCONTROL.getCode());
+ if (null == deviceModbus) {
+ return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鏈幏鍙栧埌閰嶇疆鐨凪ODBUS淇℃伅");
+ }
+
+ modbusTcp = new ModbusTcp(deviceModbus);
+ modbusTcp.setIp(request.getIp());
+ modbusTcp.setPort(request.getPort());
+
+ //鑻odbus璁惧閰嶇疆鍒嗘満锛屽垯浣跨敤鎵�閰嶇疆鍒嗘満鐨処P銆佺鍙�
+ if (StringUtils.isNotEmpty(deviceModbus.getSerId())) {
+ deviceSer = coreSerService.getCacheSer(request.getCompanyId(), deviceModbus.getSerId());
+ modbusTcp.setIp(deviceSer.getIp());
+ modbusTcp.setPort(deviceSer.getPort());
+ }
+
+ modbusTcp.setBizCode(exeDevice.getPassCode() + "");
+ modbusTcp.setSerId(request.getSerId());
+ modbusTcp.setCompanyId(request.getCompanyId());
+
+ //寮�绌鸿皟鏃讹紝闇�瑕佸彂閫佷袱鏉″懡浠わ紝涓�鏉¤缃俯搴﹀懡浠わ紝涓�鏉″紑鍚懡浠�
+ if (DeviceStatus.OPEN.getCode().equals(exeDevice.getTargetStatus())) {
+
+ //璁剧疆娓╁害
+ temp = modbusTcp.getDeviceModbus().getClose();
+ modbusTcp.setAddrExe(ServerUtil.getAddrExe(temp));
+ doWriteExe(modbusTcp, exeDevice.getTargetStatus());
+ boolean exeResult = ModbusUtil2.writeRegister(modbusTcp.getIp(), modbusTcp.getPort(), modbusTcp.getAddrExe(), Integer.valueOf(request.getTargetTemp()));
+
+ //寮�绌鸿皟
+ if (exeResult) {
+ temp = modbusTcp.getDeviceModbus().getOpen();
+ modbusTcp.setAddrExe(ServerUtil.getAddrExe(temp));
+ doWriteExe(modbusTcp, exeDevice.getTargetStatus());
+ }
+ }
+
+ //鍏崇┖璋冩椂锛屽彧鍙戦�佷竴鏉″叧闂懡浠�
+ if (DeviceStatus.CLOSE.getCode().equals(exeDevice.getTargetStatus())) {
+ temp = modbusTcp.getDeviceModbus().getStop();
+ modbusTcp.setAddrExe(ServerUtil.getAddrExe(temp));
+ doWriteExe(modbusTcp, exeDevice.getTargetStatus());
+ }
+ } catch (Exception e) {
+ log.error("璋冪敤MODBUS-TCP鎵ц寮傚父锛歿}", e);
+ return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍚庡彴鎵ц寮傚父锛�" + e.getMessage());
+ }
+
+ return new DeviceControlResponse(OrderRespEnum.ORDER_SUCCESS);
}
@Override
--
Gitblit v1.9.3