修复空指针异常

648540858

2024-01-10 c25a99d60bef3d3bbd59fee895bd658928fd00db

 src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java

@@ -2,11 +2,13 @@

import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.service.IPlatformService;
import com.genersoft.iot.vmp.service.impl.PlatformServiceImpl;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
@@ -19,7 +21,7 @@
 * @author lin
 */
@Component
@Order(value=3)
@Order(value=13)
public class SipPlatformRunner implements CommandLineRunner {

    @Autowired
@@ -34,6 +36,7 @@
    @Autowired
    private ISIPCommanderForPlatform sipCommanderForPlatform;

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

    @Override
    public void run(String... args) throws Exception {
@@ -41,17 +44,29 @@
        List<ParentPlatform> parentPlatforms = storager.queryEnableParentPlatformList(true);

        for (ParentPlatform parentPlatform : parentPlatforms) {

            ParentPlatformCatch parentPlatformCatchOld = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId());

            // 更新缓存
            ParentPlatformCatch parentPlatformCatch = new ParentPlatformCatch();
            parentPlatformCatch.setParentPlatform(parentPlatform);
            parentPlatformCatch.setId(parentPlatform.getServerGBId());
            redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
            if (parentPlatformCatchOld != null) {
                // 取消订阅
                try {
                    sipCommanderForPlatform.unregister(parentPlatform, parentPlatformCatchOld.getSipTransactionInfo(), null, (eventResult)->{
                        platformService.login(parentPlatform);
                    });
                } catch (Exception e) {
                    logger.error("[命令发送失败] 国标级联 注销: {}", e.getMessage());
                    platformService.offline(parentPlatform, true);
                    continue;
                }
            }

            // 设置所有平台离线
            platformService.offline(parentPlatform);
            // 取消订阅
            sipCommanderForPlatform.unregister(parentPlatform, null, (eventResult)->{
                platformService.login(parentPlatform);
            });
            platformService.offline(parentPlatform, false);
        }
    }
}