From 6b1c7e3fa773aa75ea34b346d4104ba70064f52c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 31 八月 2023 14:35:53 +0800
Subject: [PATCH] 调整设备状态解析2
---
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 5 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 a87d445..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
@@ -5,6 +5,7 @@
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;
@@ -224,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;
@@ -238,7 +244,13 @@
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;
@@ -257,7 +269,7 @@
modbusTcpLink.setAddrExe(ServerUtil.getAddrExe(modbusTcp.getDeviceModbus().getOpenEnd()));
- doReadStatus(modbusTcpLink);
+ doReadStatus(modbusTcpLink, true);
}
} catch (Exception e) {
@@ -274,9 +286,10 @@
* 璇诲彇鐘舵�侊紝鍚屾椂璇诲彇寮�鐘舵�佸拰鍏抽棴鐘舵��
*
* @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;
@@ -284,17 +297,49 @@
int addrExe = ServerUtil.getAddrExe(modbusTcp.getDeviceModbus().getOpenEnd());
boolean result = ModbusUtil2.readInputStatus(modbusTcp.getIp(), modbusTcp.getPort(), addrExe);
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.getBizCode(), DeviceStatus.OPEN.getCode());
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), statusOpen);
+ }else {
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), statusClose);
}
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);
if (result) {
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());
}
}
--
Gitblit v1.9.3