Parcourir la source

2023-3-21 修改成了老继电器,目前项目都用老的。

chaiyunlong il y a 2 ans
Parent
commit
5d4ca001d8

+ 2 - 2
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/RedisExpiredAndWorkListener.java

@@ -80,14 +80,14 @@ public class RedisExpiredAndWorkListener extends KeyExpirationEventMessageListen
                     .stream()
                     .stream()
                     .forEach(a->{
                     .forEach(a->{
                         if(dealyNotifyVo.getOpenOrCloseType().intValue()==1){
                         if(dealyNotifyVo.getOpenOrCloseType().intValue()==1){
-                            ResultData ResultData = socketService.sendMqttCommand(a.getId(), a.getRelayCode(), Symbol.command.open, a.getBit(),a.getSubjectId());
+                            ResultData ResultData = socketService.sendCommand(Symbol.order.control, labHardwareVO.getRelayCode(), Symbol.command.open, labHardwareVO.getBit());
                             boolean equals = ResultData.getCode().equals(HttpStatus.SUCCESS);
                             boolean equals = ResultData.getCode().equals(HttpStatus.SUCCESS);
                             //插入control 打开日志
                             //插入control 打开日志
                             if (equals) {
                             if (equals) {
                                 saveControl(a, 1);
                                 saveControl(a, 1);
                             }
                             }
                         }else{
                         }else{
-                            ResultData ResultData = socketService.sendMqttCommand(a.getId(), a.getRelayCode(), Symbol.command.close, a.getBit(),a.getSubjectId());
+                            ResultData ResultData = socketService.sendCommand(Symbol.order.control, labHardwareVO.getRelayCode(), Symbol.command.close, labHardwareVO.getBit());
                             boolean equals = ResultData.getCode().equals(HttpStatus.SUCCESS);
                             boolean equals = ResultData.getCode().equals(HttpStatus.SUCCESS);
                             //插入control 关闭日志
                             //插入control 关闭日志
                             if (equals) {
                             if (equals) {