|
@@ -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.sendCommand(Symbol.order.control, labHardwareVO.getRelayCode(), Symbol.command.open, labHardwareVO.getBit());
|
|
|
|
|
|
|
+ ResultData ResultData = socketService.sendCommand(Symbol.order.control, a.getRelayCode(), Symbol.command.open, a.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.sendCommand(Symbol.order.control, labHardwareVO.getRelayCode(), Symbol.command.close, labHardwareVO.getBit());
|
|
|
|
|
|
|
+ ResultData ResultData = socketService.sendCommand(Symbol.order.control, a.getRelayCode(), Symbol.command.close, a.getBit());
|
|
|
boolean equals = ResultData.getCode().equals(HttpStatus.SUCCESS);
|
|
boolean equals = ResultData.getCode().equals(HttpStatus.SUCCESS);
|
|
|
//插入control 关闭日志
|
|
//插入control 关闭日志
|
|
|
if (equals) {
|
|
if (equals) {
|