重启后对心跳超时的设备设置为离线。

64850858

2021-07-26 ea32cd2673b83b9481e8cc45705d2d3a84e884bb

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java

@@ -282,7 +282,7 @@
         //String result = XmlUtil.getText(rootElement, "Result");

         // 回复200 OK

         responseAck(evt);

         if (rootElement.getName().equals("Response")) {//} !XmlUtil.isEmpty(result)) {

         if (rootElement.getName().equals("Response")) {//} !StringUtils.isEmpty(result)) {

            // 此处是对本平台发出DeviceControl指令的应答

            JSONObject json = new JSONObject();

            XmlUtil.node2Json(rootElement, json);

@@ -299,7 +299,7 @@
            String platformId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(FromHeader.NAME)).getAddress().getURI()).getUser();

            String targetGBId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();

            // 远程启动功能

            if (!XmlUtil.isEmpty(XmlUtil.getText(rootElement, "TeleBoot"))) {

            if (!StringUtils.isEmpty(XmlUtil.getText(rootElement, "TeleBoot"))) {

               if (deviceId.equals(targetGBId)) {

                  // 远程启动本平台：需要在重新启动程序后先对SipStack解绑

                  logger.info("执行远程启动本平台命令");

@@ -337,7 +337,7 @@
               }

            }

            // 云台/前端控制命令

            if (!XmlUtil.isEmpty(XmlUtil.getText(rootElement,"PTZCmd")) && !deviceId.equals(targetGBId)) {

            if (!StringUtils.isEmpty(XmlUtil.getText(rootElement,"PTZCmd")) && !deviceId.equals(targetGBId)) {

               String cmdString = XmlUtil.getText(rootElement,"PTZCmd");

               Device device = storager.queryVideoDeviceByPlatformIdAndChannelId(platformId, deviceId);

               cmder.fronEndCmd(device, deviceId, cmdString);

@@ -421,7 +421,7 @@
         String deviceId = XmlUtil.getText(rootElement, "DeviceID");

         // 回复200 OK

         responseAck(evt);

         if (rootElement.getName().equals("Response")) {//   !XmlUtil.isEmpty(result)) {

         if (rootElement.getName().equals("Response")) {//   !StringUtils.isEmpty(result)) {

            // 此处是对本平台发出DeviceControl指令的应答

            JSONObject json = new JSONObject();

            XmlUtil.node2Json(rootElement, json);

@@ -718,7 +718,7 @@
               deviceAlarm.setLatitude(0.00);

            }

   

            if (!XmlUtil.isEmpty(deviceAlarm.getAlarmMethod())) {

            if (!StringUtils.isEmpty(deviceAlarm.getAlarmMethod())) {

               if ( deviceAlarm.getAlarmMethod().equals("4")) {

                  MobilePosition mobilePosition = new MobilePosition();

                  mobilePosition.setDeviceId(deviceAlarm.getDeviceId());

@@ -771,19 +771,31 @@
         Element rootElement = getRootElement(evt);

         String deviceId = XmlUtil.getText(rootElement, "DeviceID");

         Device device = storager.queryVideoDevice(deviceId);

         // 检查设备是否存在并在线， 不存在则不回复

         if (device != null && device.getOnline() == 1) {



         // 检查设备是否存在并在线， 不在线则设置为在线

         if (device != null ) {

            // 回复200 OK

            responseAck(evt);

            if (offLineDetector.isOnline(deviceId)) {

               publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

            } else {

            }

         }else {

            logger.warn("收到[ "+deviceId+" ]心跳信息, 但是设备" + (device == null? "不存在":"离线") + ", 回复401");

            Response response = getMessageFactory().createResponse(Response.UNAUTHORIZED, evt.getRequest());

            publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

         }else{

            logger.warn("收到[ "+deviceId+" ]心跳信息, 但是设备不存在, 回复404");

            Response response = getMessageFactory().createResponse(Response.NOT_FOUND, evt.getRequest());

            getServerTransaction(evt).sendResponse(response);

         }



//         if (device != null && device.getOnline() == 1) {

//

//            if (offLineDetector.isOnline(deviceId)) {

//               publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

//            } else {

//            }

//         }else {

////            logger.warn("收到[ "+deviceId+" ]心跳信息, 但是设备" + (device == null? "不存在":"离线") + ", 回复401");

////            Response response = getMessageFactory().createResponse(Response.UNAUTHORIZED, evt.getRequest());

////            getServerTransaction(evt).sendResponse(response);

//            publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

//

//         }

      } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {

         e.printStackTrace();

      }