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-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java | 17 +++--
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.java | 32 ++++++----
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 | 3
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteGasServiceImpl.java | 1
igds-core/src/main/java/com/ld/igds/common/impl/CoreDeviceServiceImpl.java | 9 +-
igds-web/src/main/resources/static/img/n2/5325/pfc2_a.png | 0
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ServerUtil.java | 60 ++++++++++----------
8 files changed, 67 insertions(+), 57 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 9c58bd2..df04f89 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
@@ -2,6 +2,7 @@
import java.util.List;
import java.util.Map;
+import java.util.Set;
import com.ld.igds.models.Device;
import com.ld.igds.temp.dto.TempParam;
@@ -45,7 +46,7 @@
* @param depotId
* @return
*/
- List<Device> getCacheDeviceByDepotId(String companyId, String depotId);
+ Set<String> getCacheDeviceSerByDepotId(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 6b53fb2..11d32fb 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.io.request.ExeDevice;
import com.ld.igds.models.Depot;
import lombok.extern.slf4j.Slf4j;
@@ -115,25 +116,23 @@
@SuppressWarnings("unchecked")
@Override
- public List<Device> getCacheDeviceByDepotId(String companyId, String depotId) {
+ public Set<String> getCacheDeviceSerByDepotId(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;
}
-
+ Set<String> result = new HashSet<>();
for (Device device : list) {
if(depotId.equals(device.getDepotId())){
- result.add(device);
+ result.add(device.getSerId());
}
}
return result;
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 a1b45dd..4eb27c7 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(3000);
+ Thread.sleep(2500);
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 1a2813b..93a3fa4 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
@@ -32,36 +32,36 @@
* @param deviceCode 璁惧閫氶亾ID
* @param status 涓嶈�冭檻璁惧绫诲瀷锛屽彧鍦ㄩ�氶亾涓婃爣璁版槸OPEN鎴栬�匔LOSE鍗冲彲
*/
- 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;
- }
+ public static void add2StatusMap(String companyId, String serId, String deviceCode, String status) {
+// System.out.println(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/RemoteControlServiceImpl.java b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.java
index 127d128..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
@@ -201,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, null);
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), targetStatus);
}
}
@@ -214,8 +214,7 @@
@Override
public DeviceControlResponse queryStatus(DeviceControlRequest request) {
try {
- //鐢变簬modbus璁惧鍙兘鍦ㄥ涓垎鏈洪厤缃笂锛岄渶鏍规嵁浠撳簱缂栫爜鏌ヨ璁惧淇℃伅
- List<Device> list = coreDeviceService.getCacheDeviceByDepotId(request.getCompanyId(), request.getDepotId());
+ List<Device> list = coreDeviceService.getCacheDeviceBySerId(request.getCompanyId(), request.getSerId());
if (null == list || list.isEmpty()) {
return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鏈幏鍙栧埌璁惧鍒楄〃淇℃伅");
@@ -251,7 +250,7 @@
continue;
}
- doReadStatus(modbusTcp, null);
+ doReadStatus(modbusTcp, false);
if (StringUtils.isBlank(device.getLink()) || "null".equals(device.getLink())) continue;
@@ -270,7 +269,7 @@
modbusTcpLink.setAddrExe(ServerUtil.getAddrExe(modbusTcp.getDeviceModbus().getOpenEnd()));
- doReadStatus(modbusTcpLink, device.getPassCode() + "");
+ doReadStatus(modbusTcpLink, true);
}
} catch (Exception e) {
@@ -287,10 +286,10 @@
* 璇诲彇鐘舵�侊紝鍚屾椂璇诲彇寮�鐘舵�佸拰鍏抽棴鐘舵��
*
* @param modbusTcp
- * @param mainLink 涓昏澶囩紪鐮�
+ * @param flag 鏄惁鏄叧鑱旇澶�
* @throws Exception
*/
- private void doReadStatus(ModbusTcp modbusTcp, String mainLink) 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;
@@ -298,17 +297,26 @@
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(), mainLink);
+ 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(), mainLink);
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), DeviceStatus.CLOSE.getCode());
+ }else {
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), DeviceStatus.OPEN.getCode());
}
}
@@ -328,10 +336,10 @@
int num = number.intValue();
if(num == 1){
- ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), DeviceStatus.OPEN.getCode(), null);
+ 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(), null);
+ ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getBizCode(), DeviceStatus.CLOSE.getCode());
}
}
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteGasServiceImpl.java b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteGasServiceImpl.java
index a3c690c..6918ae1 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteGasServiceImpl.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteGasServiceImpl.java
@@ -75,7 +75,6 @@
boolean exeResult = ModbusUtil2.writeCoilStatus(modbusTcp.getIp(), modbusTcp.getPort(), modbusTcp.getAddrExe(), true);
if (exeResult) {
- ModbusUtil2.writeCoilStatus(modbusTcp.getIp(), modbusTcp.getPort(), modbusTcp.getAddrExe(), false);
addRun(request);
//璋冪敤寮傛鑾峰彇缁撴灉
progressGasResult(request, modbusTcp);
diff --git a/igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java b/igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java
index 4880842..fac6d43 100644
--- a/igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java
+++ b/igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java
@@ -29,10 +29,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
@@ -301,16 +298,22 @@
return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "娌℃湁闇�瑕佹洿鏂扮殑璁惧淇℃伅锛侊紒");
}
+// 2023-08-31鏆傛椂绂佺敤锛屼娇鐢ㄤ粨搴撶紪鐮佽幏鍙栦粨搴撴墍鏈夎澶囩殑鍒嗘満淇℃伅
//鏍规嵁璁惧鎵�灞炲垎鏈鸿繘琛屽垎缁�
- Map<String, List<ExeDevice>> groupBy = param.getDeviceList().stream().collect(Collectors.groupingBy(ExeDevice::getSerId));
+// Map<String, List<ExeDevice>> groupBy = param.getDeviceList().stream().collect(Collectors.groupingBy(ExeDevice::getSerId));
+// DeviceControlResponse response = new DeviceControlResponse(OrderRespEnum.ORDER_SUCCESS.getCode(), "鍛戒护鍙戦�佹垚鍔燂紒");
+// DeviceSer deviceSer;
+// DeviceControlRequest request;
+// try {
+// for (String serId : groupBy.keySet()) {
+ Set<String> list = coreDeviceService.getCacheDeviceSerByDepotId(param.getCompanyId(), param.getDepotId());
DeviceControlResponse response = new DeviceControlResponse(OrderRespEnum.ORDER_SUCCESS.getCode(), "鍛戒护鍙戦�佹垚鍔燂紒");
-
DeviceSer deviceSer;
DeviceControlRequest request;
try {
- for (String serId : groupBy.keySet()) {
+ for (String serId : list) {
deviceSer = coreSerService.getCacheSer(param.getCompanyId(), serId);
if (null == deviceSer) {
log.info("鏍规嵁浠撳簱{}鑾峰彇璁惧鐘舵�侊紝鍒嗘満缂栫爜{}鐨勫垎鏈轰笉瀛樺湪锛屽彇娑堟墽琛屻��", param.getDepotId(), serId);
diff --git a/igds-web/src/main/resources/static/img/n2/5325/pfc2_a.png b/igds-web/src/main/resources/static/img/n2/5325/pfc2_a.png
index 8fa743b..aa7f80c 100644
--- a/igds-web/src/main/resources/static/img/n2/5325/pfc2_a.png
+++ b/igds-web/src/main/resources/static/img/n2/5325/pfc2_a.png
Binary files differ
--
Gitblit v1.9.3