فهرست منبع

fix(功能配置):

修复 自动结束管理失效
18339543638 2 سال پیش
والد
کامیت
3a14cd4142

+ 7 - 7
nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/config/HospitalDeviceAutoUndoConfigHandler.java

@@ -58,10 +58,10 @@ public class HospitalDeviceAutoUndoConfigHandler extends  AbstractHospitalConfig
         }
         judgeShutdownAutoUndo(source,config);
 
-
-        if(null!=lastNoSignalDelayMessage){
-            delayMessageManager.remove(lastNoSignalDelayMessage);
-        }
+//
+//        if(null!=lastNoSignalDelayMessage){
+//            delayMessageManager.remove(lastNoSignalDelayMessage);
+//        }
     }
 
     /**
@@ -123,9 +123,9 @@ public class HospitalDeviceAutoUndoConfigHandler extends  AbstractHospitalConfig
             lastShutDownDelayMessage = new DelayMessage(Value.simple(undo), HandlerConstant.DEVICE_AUTO_UNDO, DelayMessageProperties.of(TimeUnit.MINUTES, config.getNoSignalInterval()));
             delayMessageManager.add(lastShutDownDelayMessage);
         }else{
-            if(lastShutDownDelayMessage!=null){
-                delayMessageManager.remove(lastShutDownDelayMessage);
-            }
+//            if(lastShutDownDelayMessage!=null){
+//                delayMessageManager.remove(lastShutDownDelayMessage);
+//            }
         }
 
 

+ 3 - 3
nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/config/HospitalFinishMonitorConfigHandler.java

@@ -112,9 +112,9 @@ public class HospitalFinishMonitorConfigHandler extends AbstractHospitalConfigHa
         UndoDeviceConfig undoDeviceConfig = new UndoDeviceConfig();
         undoDeviceConfig.setUndoBy(config.getUndoBy());
         //删除延迟队列消息
-        if(lastShutDownFinish!=null){
-            delayMessageManager.remove(lastShutDownFinish);
-        }
+//        if(lastShutDownFinish!=null){
+//            delayMessageManager.remove(lastShutDownFinish);
+//        }
 
         if(DeviceStatusEnum.Shutdown.equals(source.getRunState())){
             FinishMonitorEntity body = FinishMonitorEntity.builder()