优化设备状态保持，自动记录心跳间隔，三次心跳失败则设备离线，不在使用设备有效期字段作为唯一判断标准，提高容错能力和稳定性。

648540858

2023-01-04 a82b831b8b2b96dfa5791808f1207500e16697cf

优化设备状态保持，自动记录心跳间隔，三次心跳失败则设备离线，不在使用设备有效期字段作为唯一判断标准，提高容错能力和稳定性。

 pom.xml

@@ -11,7 +11,7 @@

    <groupId>com.genersoft</groupId>
    <artifactId>wvp-pro</artifactId>
    <version>2.6.6</version>
    <version>2.6.7</version>
    <name>web video platform</name>
    <description>国标28181视频平台</description>


 sql/update.sql

@@ -1,43 +1,3 @@
alter table media_server
    drop column streamNoneReaderDelayMS;

alter table media_server
    drop column sendRtpPortRange;

alter table stream_proxy
    add enable_disable_none_reader bit(1) default null;

-- 2.6.6->2.6.7
alter table device
    add mediaServerId varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'auto';

alter table device
    add custom_name varchar(255) default null;

alter table device
    add sdpIp varchar(50) default null;

alter table device
    add localIp varchar(50) default null;

alter table device
    add password varchar(255) default null;

alter table device
    modify ip varchar(50) null;

alter table device
    modify port int null;

alter table device
    modify expires int null;

alter table device
    modify subscribeCycleForCatalog int null;

alter table device
    modify hostAddress varchar(50) null;

alter table stream_proxy
    change enable_hls enable_audio bit null;


    add keepaliveIntervalTime int default null;

 src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java

@@ -70,6 +70,8 @@


    public static final String SYSTEM_INFO_DISK_PREFIX = "VMP_SYSTEM_INFO_DISK_";



    public static final String REGISTER_EXPIRE_TASK_KEY_PREFIX = "VMP_device_register_expire_";










 src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java

@@ -94,6 +94,13 @@
    @Schema(description = "心跳时间")
    private String keepaliveTime;


    /**
     * 心跳间隔
     */
    @Schema(description = "心跳间隔")
    private int keepaliveIntervalTime;

    /**
     * 通道个数
     */
@@ -413,4 +420,12 @@
    public void setLocalIp(String localIp) {
        this.localIp = localIp;
    }

    public int getKeepaliveIntervalTime() {
        return keepaliveIntervalTime;
    }

    public void setKeepaliveIntervalTime(int keepaliveIntervalTime) {
        this.keepaliveIntervalTime = keepaliveIntervalTime;
    }
}

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java

@@ -1,5 +1,7 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd;

import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
@@ -43,6 +45,9 @@
    @Autowired
    private UserSetting userSetting;

    @Autowired
    private DynamicTask dynamicTask;

    @Override
    public void afterPropertiesSet() throws Exception {
        notifyMessageHandler.addHandler(cmdType, this);
@@ -68,6 +73,13 @@
            device.setHostAddress(remoteAddressInfo.getIp().concat(":").concat(String.valueOf(remoteAddressInfo.getPort())));
            device.setIp(remoteAddressInfo.getIp());
        }
        if (device.getKeepaliveTime() == null) {
            device.setKeepaliveIntervalTime(60);
        }else {
            long lastTime = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(device.getKeepaliveTime());
            device.setKeepaliveIntervalTime(new Long(System.currentTimeMillis()/1000-lastTime).intValue());
        }

        device.setKeepaliveTime(DateUtil.getNow());

        if (device.getOnline() == 1) {
@@ -75,9 +87,15 @@
        }else {
            // 对于已经离线的设备判断他的注册是否已经过期
            if (!deviceService.expire(device)){
                device.setOnline(0);
                deviceService.online(device);
            }
        }
        // 刷新过期任务
        String registerExpireTaskKey = VideoManagerConstants.REGISTER_EXPIRE_TASK_KEY_PREFIX + device.getDeviceId();
        // 如果三次心跳失败，则设置设备离线
        dynamicTask.startDelay(registerExpireTaskKey, ()-> deviceService.offline(device.getDeviceId()), device.getKeepaliveIntervalTime()*1000*3);

    }

    @Override

 src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java

@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.service.impl;

import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.*;
@@ -44,8 +45,6 @@
public class DeviceServiceImpl implements IDeviceService {

    private final static Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class);

    private final String  registerExpireTaskKeyPrefix = "device-register-expire-";

    @Autowired
    private DynamicTask dynamicTask;
@@ -101,7 +100,10 @@
            redisCatchStorage.clearCatchByDeviceId(device.getDeviceId());
        }
        device.setUpdateTime(now);

        if (device.getKeepaliveIntervalTime() == 0) {
            // 默认心跳间隔60
            device.setKeepaliveIntervalTime(60);
        }
        // 第一次上线 或则设备之前是离线状态--进行通道同步和设备信息查询
        if (device.getCreateTime() == null) {
            device.setOnline(1);
@@ -116,7 +118,6 @@
            }
            sync(device);
        }else {

            if(device.getOnline() == 0){
                device.setOnline(1);
                device.setCreateTime(now);
@@ -153,19 +154,19 @@
            addMobilePositionSubscribe(device);
        }
        // 刷新过期任务
        String registerExpireTaskKey = registerExpireTaskKeyPrefix + device.getDeviceId();
        // 增加一个10秒给设备重发消息的机会
        dynamicTask.startDelay(registerExpireTaskKey, ()-> offline(device.getDeviceId()), (device.getExpires() + 10) * 1000);
        String registerExpireTaskKey = VideoManagerConstants.REGISTER_EXPIRE_TASK_KEY_PREFIX + device.getDeviceId();
        // 如果第一次注册那么必须在60 * 3时间内收到一个心跳，否则设备离线
        dynamicTask.startDelay(registerExpireTaskKey, ()-> offline(device.getDeviceId()), device.getKeepaliveIntervalTime() * 1000 * 3);
    }

    @Override
    public void offline(String deviceId) {
        logger.info("[设备离线]， device：{}", deviceId);
        logger.error("[设备离线]， device：{}", deviceId);
        Device device = deviceMapper.getDeviceByDeviceId(deviceId);
        if (device == null) {
            return;
        }
        String registerExpireTaskKey = registerExpireTaskKeyPrefix + deviceId;
        String registerExpireTaskKey = VideoManagerConstants.REGISTER_EXPIRE_TASK_KEY_PREFIX + deviceId;
        dynamicTask.stop(registerExpireTaskKey);
        device.setOnline(0);
        redisCatchStorage.updateDevice(device);

 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java

@@ -61,6 +61,7 @@
                "expires," +
                "registerTime," +
                "keepaliveTime," +
                "keepaliveIntervalTime," +
                "createTime," +
                "updateTime," +
                "charset," +
@@ -88,6 +89,7 @@
                "#{expires}," +
                "#{registerTime}," +
                "#{keepaliveTime}," +
                "#{keepaliveIntervalTime}," +
                "#{createTime}," +
                "#{updateTime}," +
                "#{charset}," +
@@ -117,6 +119,7 @@
                "<if test=\"online != null\">, online=${online}</if>" +
                "<if test=\"registerTime != null\">, registerTime='${registerTime}'</if>" +
                "<if test=\"keepaliveTime != null\">, keepaliveTime='${keepaliveTime}'</if>" +
                "<if test=\"keepaliveIntervalTime != null\">, keepaliveIntervalTime='${keepaliveIntervalTime}'</if>" +
                "<if test=\"expires != null\">, expires=${expires}</if>" +
                "WHERE deviceId='${deviceId}'"+
            " </script>"})