规范数据库，添加必要约束，优化通道批量导入功能

648540858

2022-02-24 a42dda2bd3cc1cf8c20cc61e7ad9211eadecbaf3

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

@@ -10,6 +10,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

/**
 * 设备业务（目录订阅）
 */
@Service
public class DeviceServiceImpl implements IDeviceService {

@@ -27,13 +30,19 @@
        if (device == null || device.getSubscribeCycleForCatalog() < 0) {
            return false;
        }
        if (dynamicTask.contains(device.getDeviceId())) {
            logger.info("[添加目录订阅] 设备{}的目录订阅以存在", device.getDeviceId());
            return false;
        }
        logger.info("[添加目录订阅] 设备{}", device.getDeviceId());
        // 添加目录订阅
        CatalogSubscribeTask catalogSubscribeTask = new CatalogSubscribeTask(device, sipCommander);
        catalogSubscribeTask.run();
        // 提前开始刷新订阅
        // TODO 暂时关闭目录订阅的定时刷新，直到此功能完善
//        String cron = getCron(device.getSubscribeCycleForCatalog() - 60);
//        dynamicTask.startCron(device.getDeviceId(), catalogSubscribeTask, cron);
        int subscribeCycleForCatalog = device.getSubscribeCycleForCatalog();
        // 设置最小值为30
        subscribeCycleForCatalog = Math.max(subscribeCycleForCatalog, 30);
        dynamicTask.startCron(device.getDeviceId(), catalogSubscribeTask, subscribeCycleForCatalog - 5);
        return true;
    }

@@ -42,21 +51,12 @@
        if (device == null || device.getSubscribeCycleForCatalog() < 0) {
            return false;
        }
        logger.info("移除目录订阅: {}", device.getDeviceId());
        dynamicTask.stopCron(device.getDeviceId());
        return true;
    }
        device.setSubscribeCycleForCatalog(0);
        sipCommander.catalogSubscribe(device, null, null);
        // 清空cseq计数

    public String getCron(int time) {
        if (time <= 59) {
            return "0/" + time +" * * * * ?";
        }else if (time <= 60* 59) {
            int minute = time/(60);
            return "0 0/" + minute +" * * * ?";
        }else if (time <= 60* 60* 59) {
            int hour = time/(60*60);
            return "0 0 0/" + hour +" * * ?";
        }else {
            return "0 0/10 * * * ?";
        }
        return true;
    }
}