修复循环引用

648540858

2024-06-06 619a86e0ed6cdda88e2458b9ec4302d202d2215f

修复循环引用

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

@@ -24,9 +24,6 @@
    @Autowired
    private UserSetting userSetting;

    @Autowired
    private IPlatformService platformService;

    private final String taskOverduePrefix = "subscribe_overdue_";

    private static ConcurrentHashMap<String, SubscribeInfo> catalogMap = new ConcurrentHashMap<>();
@@ -61,13 +58,11 @@
        dynamicTask.stop(taskOverdueKey);
    }

    public void putMobilePositionSubscribe(String platformId, SubscribeInfo subscribeInfo) {
    public void putMobilePositionSubscribe(String platformId, SubscribeInfo subscribeInfo, Runnable gpsTask) {
        mobilePositionMap.put(platformId, subscribeInfo);
        String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetting.getServerId() + "MobilePosition_" + platformId;
        // 添加任务处理GPS定时推送
        dynamicTask.startCron(key, ()->{
                    platformService.sendNotifyMobilePosition(platformId);
                },
        dynamicTask.startCron(key, gpsTask,
                subscribeInfo.getGpsInterval() * 1000);
        String taskOverdueKey = taskOverduePrefix +  "MobilePosition_" + platformId;
        if (subscribeInfo.getExpires() > 0) {

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

@@ -147,7 +147,9 @@
                subscribeHolder.removeMobilePositionSubscribe(platformId);
            }else {
                subscribeInfo.setResponse(response);
                subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
                subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo, ()->{
                    platformService.sendNotifyMobilePosition(platformId);
                });
            }

        } catch (SipException | InvalidArgumentException | ParseException e) {