From a3f8ef130d998973a5d36bb196e1607827de81e8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 30 八月 2023 16:06:13 +0800
Subject: [PATCH] 增加Modbus协议：温控控制
---
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.java | 78 ++++++++++++++++++++++++++++++++++-----
igds-recir/src/main/java/com/ld/igds/temp/manager/TempControlManager.java | 12 +++---
2 files changed, 74 insertions(+), 16 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 5da1698..a87d445 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
@@ -2,6 +2,7 @@
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.io.RemoteControlService;
@@ -80,7 +81,7 @@
modbusTcp.setIp(request.getIp());
modbusTcp.setPort(request.getPort());
//鑻odbus璁惧閰嶇疆鍒嗘満锛屽垯浣跨敤鎵�閰嶇疆鍒嗘満鐨処P銆佺鍙�
- if(StringUtils.isNotEmpty(deviceModbus.getSerId())){
+ if (StringUtils.isNotEmpty(deviceModbus.getSerId())) {
deviceSer = coreSerService.getCacheSer(request.getCompanyId(), deviceModbus.getSerId());
modbusTcp.setIp(deviceSer.getIp());
modbusTcp.setPort(deviceSer.getPort());
@@ -126,7 +127,7 @@
modbusTcpLink.setCompanyId(request.getCompanyId());
//鑻odbus璁惧閰嶇疆鍒嗘満锛屽垯浣跨敤鎵�閰嶇疆鍒嗘満鐨処P銆佺鍙�
- if(StringUtils.isNotEmpty(deviceModbus.getSerId())){
+ if (StringUtils.isNotEmpty(deviceModbus.getSerId())) {
deviceSer = coreSerService.getCacheSer(request.getCompanyId(), deviceModbus.getSerId());
modbusTcpLink.setIp(deviceSer.getIp());
modbusTcpLink.setPort(deviceSer.getPort());
@@ -197,7 +198,7 @@
if (exeResult) {
//鏍规嵁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);
}
@@ -278,22 +279,20 @@
private void doReadStatus(ModbusTcp modbusTcp) throws Exception {
if (Constant.YN_N.equals(modbusTcp.getDeviceModbus().getOpen())) return;
-
if (Constant.YN_N.equals(modbusTcp.getDeviceModbus().getOpenEnd())) return;
+
int addrExe = ServerUtil.getAddrExe(modbusTcp.getDeviceModbus().getOpenEnd());
-
boolean result = ModbusUtil2.readInputStatus(modbusTcp.getIp(), modbusTcp.getPort(), addrExe);
- log.debug("---------璇诲紑鍒颁綅鐘舵��------{}-{}-{}", modbusTcp.getBizCode(), addrExe, result);
-
+ log.debug("---------璇婚绐楅鍙ｅ紑鍒颁綅鐘舵��(鎴栧叾浠栬澶囪繍琛岀姸鎬�)------{}-{}-{}", modbusTcp.getBizCode(), addrExe, result);
if (result) {
ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), DeviceStatus.OPEN.getCode());
}
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.getBizCode(), addrExe, result);
-
+ log.debug("---------璇婚绐楅鍙ｅ叧鍒颁綅鐘舵��------{}-{}-{}", modbusTcp.getBizCode(), addrExe, result);
if (result) {
ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), DeviceStatus.CLOSE.getCode());
}
@@ -301,7 +300,66 @@
@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
diff --git a/igds-recir/src/main/java/com/ld/igds/temp/manager/TempControlManager.java b/igds-recir/src/main/java/com/ld/igds/temp/manager/TempControlManager.java
index 8bbc262..9e53777 100644
--- a/igds-recir/src/main/java/com/ld/igds/temp/manager/TempControlManager.java
+++ b/igds-recir/src/main/java/com/ld/igds/temp/manager/TempControlManager.java
@@ -161,7 +161,7 @@
return tempControl3(param);
}
-// 濡傛灉澶氫釜璁惧锛岄渶瑕佸璁惧鎸夊垎鏈鸿繘琛屽垎缁�
+ // 濡傛灉澶氫釜璁惧锛岄渶瑕佸璁惧鎸夊垎鏈鸿繘琛屽垎缁�
Map<String, List<ExeDevice>> deviceMap = deviceList.stream().collect(Collectors.groupingBy(ExeDevice::getSerId));
String temp = "";
@@ -202,11 +202,11 @@
// 鑾峰彇鍒嗘満淇℃伅
DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(), exeDevice.getSerId());
- if (!Constant.YN_Y.equals(deviceSer.getStatus())) {
- return new DeviceControlResponse(
- OrderRespEnum.ORDER_ERROR.getCode(),
- "褰撳墠璁惧鎵�鍦ㄦ帶鍒舵煖銆�" + deviceSer.getName() + "銆戜笉鍦ㄧ嚎锛屾棤娉曟墽琛�");
- }
+// if (!Constant.YN_Y.equals(deviceSer.getStatus())) {
+// return new DeviceControlResponse(
+// OrderRespEnum.ORDER_ERROR.getCode(),
+// "褰撳墠璁惧鎵�鍦ㄦ帶鍒舵煖銆�" + deviceSer.getName() + "銆戜笉鍦ㄧ嚎锛屾棤娉曟墽琛�");
+// }
TempControlRequest request = new TempControlRequest();
request.setDepotId(param.getDepotId());
--
Gitblit v1.9.3