From 38ab8fbd4355070def9e3b39f362731dd4dea6d1 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 30 八月 2023 20:54:12 +0800
Subject: [PATCH] 优化设备状态解析
---
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/AnalysisService.java | 29 +++++++++
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.java | 51 ++++++++++++++--
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java | 2
igds-core/src/main/java/com/ld/igds/common/CoreDeviceService.java | 8 ++
igds-core/src/main/java/com/ld/igds/common/impl/CoreDeviceServiceImpl.java | 27 +++++++++
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ServerUtil.java | 33 ++++++++++
6 files changed, 141 insertions(+), 9 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/common/CoreDeviceService.java b/igds-core/src/main/java/com/ld/igds/common/CoreDeviceService.java
index 216fd35..9c58bd2 100644
--- a/igds-core/src/main/java/com/ld/igds/common/CoreDeviceService.java
+++ b/igds-core/src/main/java/com/ld/igds/common/CoreDeviceService.java
@@ -39,6 +39,14 @@
*/
List<Device> getCacheDeviceBySerId(String companyId, String serId);
+ /**
+ * 鏍规嵁浠撳簱缂栫爜鑾峰彇璁惧淇℃伅
+ * @param companyId
+ * @param depotId
+ * @return
+ */
+ List<Device> getCacheDeviceByDepotId(String companyId, String depotId);
+
/**
* 鏍规嵁鍒嗘満淇℃伅鑾峰彇璁惧
diff --git a/igds-core/src/main/java/com/ld/igds/common/impl/CoreDeviceServiceImpl.java b/igds-core/src/main/java/com/ld/igds/common/impl/CoreDeviceServiceImpl.java
index ac4ab1b..6b53fb2 100644
--- a/igds-core/src/main/java/com/ld/igds/common/impl/CoreDeviceServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/common/impl/CoreDeviceServiceImpl.java
@@ -9,6 +9,7 @@
import com.ld.igds.constant.DeviceStatus;
import com.ld.igds.constant.DeviceType;
+import com.ld.igds.models.Depot;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -112,6 +113,32 @@
return list;
}
+ @SuppressWarnings("unchecked")
+ @Override
+ public List<Device> getCacheDeviceByDepotId(String companyId, String depotId) {
+ String patten = RedisConst.buildKey(companyId, RedisConst.KEY_DEVICE_LIST);
+
+ Set<String> keys = redisUtil.keys(patten);
+ if (null == keys) return null;
+
+ List<Device> result = new ArrayList<>();
+ List<Device> list = new ArrayList<>();
+ for (String key : keys) {
+ list.addAll((List<Device>) redisUtil.get(key));
+ }
+
+ if (list.isEmpty()) {
+ return null;
+ }
+
+ for (Device device : list) {
+ if(depotId.equals(device.getDepotId())){
+ result.add(device);
+ }
+ }
+ return result;
+ }
+
@Override
public Device getCacheDeviceById(String companyId, String id) {
String key = RedisConst.buildDeviceKey(companyId, RedisConst.KEY_DEVICE, id);
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java
index 4eb27c7..a1b45dd 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java
@@ -48,7 +48,7 @@
modbusMaster.init();
//鍒濆鍖栦箣鍚庣瓑寰咃紝閬垮厤鍑虹幇杩炴帴鏈垱寤�
- Thread.sleep(2500);
+ Thread.sleep(3000);
return modbusMaster;
}
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ServerUtil.java b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ServerUtil.java
index 11a7979..1a2813b 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ServerUtil.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ServerUtil.java
@@ -1,7 +1,9 @@
package com.ld.igds.protocol.modbus;
import com.ld.igds.constant.Constant;
+import com.ld.igds.constant.DeviceStatus;
import com.ld.igds.util.ContextUtil;
+import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
import java.util.Map;
@@ -30,7 +32,36 @@
* @param deviceCode 璁惧閫氶亾ID
* @param status 涓嶈�冭檻璁惧绫诲瀷锛屽彧鍦ㄩ�氶亾涓婃爣璁版槸OPEN鎴栬�匔LOSE鍗冲彲
*/
- public static void add2StatusMap(String companyId, String serId, String deviceCode, String status) {
+ public static void add2StatusMap(String companyId, String serId, String deviceCode, String status, String mainLink) {
+
+ //鑻ヤ笉涓虹┖锛屽垯鏌ヨ涓昏澶囩姸鎬�
+ if(StringUtils.isNotEmpty(mainLink)){
+ String oldStatus = contextStatusMap.get(ContextUtil.buildDeviceStatusKey(companyId, serId, mainLink));
+ //鑻ラ绐楁垨椋庡彛寮�
+ if(DeviceStatus.OPEN.getCode().equals(oldStatus)){
+ //鑻ラ鏈哄紑
+ if(DeviceStatus.OPEN.getCode().equals(status)){
+ status = DeviceStatus.F_OPEN.getCode();
+ }
+ //鑻ラ鏈哄叧
+ if(DeviceStatus.CLOSE.getCode().equals(status)){
+ status = DeviceStatus.W_OPEN.getCode();
+ }
+ }
+ //鑻ラ绐楁垨椋庡彛寮�
+ if(DeviceStatus.CLOSE.getCode().equals(oldStatus)){
+ //鑻ラ鏈哄紑
+ if(DeviceStatus.OPEN.getCode().equals(status)){
+ status = DeviceStatus.ERROR.getCode();
+ }
+ //鑻ラ鏈哄叧
+ if(DeviceStatus.CLOSE.getCode().equals(status)){
+ status = DeviceStatus.W_CLOSE.getCode();
+ }
+ }
+ contextStatusMap.put(ContextUtil.buildDeviceStatusKey(companyId, serId, mainLink), status);
+ return;
+ }
contextStatusMap.put(ContextUtil.buildDeviceStatusKey(companyId, serId, deviceCode), status);
}
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/AnalysisService.java b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/AnalysisService.java
index be6703b..37b58e2 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/AnalysisService.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/AnalysisService.java
@@ -190,4 +190,33 @@
log.info("Modbus鐢佃〃----->>>骞冲彴锛氳兘鑰楁暟鎹В鏋愬畬鎴�-浠撳簱={}", esData.getDepotId());
esService.saveAndUpdateInc(esData);
}
+
+ /**
+ * 瑙ｆ瀽绌鸿皟鐘舵��
+ *
+ * @param request
+ * @param result
+ */
+ public void analysisTempStatus(BaseRequest request, Number result) {
+
+ log.debug("----------寮�濮嬫墽琛岃兘鑰楃粨鏋滆В鏋�----{}", request.getDepotId());
+
+
+ //鏈夊姛鐢佃兘鍒ゆ柇鏄惁杩斿洖鏈夋晥鏁版嵁
+ if (null == result) {
+ log.error("---鑳借�楁暟鎹繑鍥炴暟鎹笉瀹屾暣锛屽仠姝㈣В鏋�----{}", result.toString());
+ return;
+ }
+
+ EsData esData = new EsData();
+ esData.setCompanyId(request.getCompanyId());
+ esData.setDepotId(request.getDepotId());
+ esData.setUpdateTime(new Date());
+
+ esData.setEp(result.doubleValue());
+ esData.setEs(result.doubleValue());
+
+ log.info("Modbus鐢佃〃----->>>骞冲彴锛氳兘鑰楁暟鎹В鏋愬畬鎴�-浠撳簱={}", esData.getDepotId());
+ esService.saveAndUpdateInc(esData);
+ }
}
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..127d128 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;
@@ -200,7 +201,7 @@
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);
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), targetStatus, null);
}
}
@@ -213,7 +214,8 @@
@Override
public DeviceControlResponse queryStatus(DeviceControlRequest request) {
try {
- List<Device> list = coreDeviceService.getCacheDeviceBySerId(request.getCompanyId(), request.getSerId());
+ //鐢变簬modbus璁惧鍙兘鍦ㄥ涓垎鏈洪厤缃笂锛岄渶鏍规嵁浠撳簱缂栫爜鏌ヨ璁惧淇℃伅
+ List<Device> list = coreDeviceService.getCacheDeviceByDepotId(request.getCompanyId(), request.getDepotId());
if (null == list || list.isEmpty()) {
return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鏈幏鍙栧埌璁惧鍒楄〃淇℃伅");
@@ -223,6 +225,11 @@
ModbusTcp modbusTcpLink;
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());
@@ -238,7 +245,13 @@
modbusTcp.setSerId(device.getSerId());
modbusTcp.setCompanyId(device.getCompanyId());
- doReadStatus(modbusTcp);
+ //绌鸿皟鐘舵�佸崟鐙鍙�
+ if(DeviceType.TYPE_05.getCode().equals(device.getType())){
+ doReadTempStatus(modbusTcp);
+ continue;
+ }
+
+ doReadStatus(modbusTcp, null);
if (StringUtils.isBlank(device.getLink()) || "null".equals(device.getLink())) continue;
@@ -257,7 +270,7 @@
modbusTcpLink.setAddrExe(ServerUtil.getAddrExe(modbusTcp.getDeviceModbus().getOpenEnd()));
- doReadStatus(modbusTcpLink);
+ doReadStatus(modbusTcpLink, device.getPassCode() + "");
}
} catch (Exception e) {
@@ -274,9 +287,10 @@
* 璇诲彇鐘舵�侊紝鍚屾椂璇诲彇寮�鐘舵�佸拰鍏抽棴鐘舵��
*
* @param modbusTcp
+ * @param mainLink 涓昏澶囩紪鐮�
* @throws Exception
*/
- private void doReadStatus(ModbusTcp modbusTcp) throws Exception {
+ private void doReadStatus(ModbusTcp modbusTcp, String mainLink) throws Exception {
if (Constant.YN_N.equals(modbusTcp.getDeviceModbus().getOpen())) return;
if (Constant.YN_N.equals(modbusTcp.getDeviceModbus().getOpenEnd())) return;
@@ -285,7 +299,7 @@
boolean 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.OPEN.getCode());
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), DeviceStatus.OPEN.getCode(), mainLink);
}
if (Constant.YN_N.equals(modbusTcp.getDeviceModbus().getCloseEnd())) return;
@@ -294,7 +308,30 @@
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());
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), DeviceStatus.CLOSE.getCode(), mainLink);
+ }
+ }
+
+ /**
+ * 璇诲彇绌鸿皟璁惧鐘舵��
+ *
+ * @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(), null);
+ }
+ if(num == 2){
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), DeviceStatus.CLOSE.getCode(), null);
}
}
--
Gitblit v1.9.3