fix 低电量报警改为电量耗尽

nb-common/ws-common/src/main/java/com/nb/common/websocket/ws/DefaultWsServerAioListener.java

@@ -35,14 +35,11 @@ public class DefaultWsServerAioListener extends WsServerAioListener {
     public boolean onHeartbeatTimeout(ChannelContext channelContext, Long interval, int heartbeatTimeoutCount) {
         //连接关闭时进行业务处理,发送
         log.info("{},心跳超时,通道关闭", channelContext);
-        String auth = String.valueOf(channelContext.getAttribute(LOGIN_USER_KEY));
-        if(!StrUtil.isNullOrUndefined(auth)){
-            try {
-                LoginUser loginUser = SecurityUtil.getLoginUser(auth);
-                log.error("ws断开连接{}",JSONUtil.toJsonStr(loginUser));
-            }catch (Exception e){
-
-            }
+        try {
+            LoginUser loginUser = (LoginUser) channelContext.getAttribute(LOGIN_USER_KEY);
+            log.error("ws因超时断开连接 操作系统:{},username: {}",loginUser.getOs(),loginUser.getUsername());
+        }catch (Exception e){
+
         }
         wsHandlers.parallelStream().forEach(wsHandler -> wsHandler.close(channelContext));
         return false;

nb-service/web-service/src/main/java/com/nb/web/service/bus/listener/DeviceInfoListener.java

@@ -236,14 +236,16 @@ public class DeviceInfoListener implements IIotMsgHandler {
     }
 
     private void init(BusDeviceRunningEntity device,DeviceOperator deviceOperator ) {
-        if(ObjectUtil.equal(DeviceTypeEnum.intelligent,device.getType())){
+        //开机数据不做加档受限判断
+        if(!DeviceStatusEnum.StartUp.equals(device.getRunState())
+                &&ObjectUtil.equal(DeviceTypeEnum.intelligent,device.getType())){
             if (deviceOperator.isFlowLimit()) {
                 device.setWarnFlow(FlowStatusEnum.Limited);
             }
         }
-//        if(device.getWarnFlow()!=null&&FlowStatusEnum.None.equals(device.getWarnFlow())){
-//            device.setWarnFlow(null);
-//        }
+        if(device.getWarnFlow()!=null&&FlowStatusEnum.None.equals(device.getWarnFlow())){
+            device.setWarnFlow(null);
+        }
         if(device.getWarnFlow()!=null&&FlowStatusEnum.Limited.equals(device.getWarnFlow())){
             //加档受限，进行标识
             device.setFlowRestricted(true);