优化订阅信息的发送与取消订阅

648540858

2022-04-08 f10b458fc919fbcadc4936bf3a7886088e20ac71

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java

@@ -3,14 +3,13 @@
import java.util.List;
import java.util.UUID;

import javax.sip.message.Response;

import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.github.pagehelper.util.StringUtil;

import io.swagger.annotations.Api;
@@ -42,13 +41,16 @@
    private final static Logger logger = LoggerFactory.getLogger(MobilePositionController.class);

    @Autowired
    private IVideoManagerStorager storager;
    private IVideoManagerStorage storager;
    
   @Autowired
   private SIPCommander cmder;
   
   @Autowired
   private DeferredResultHolder resultHolder;

   @Autowired
   private IDeviceService deviceService;

    /**
     *  查询历史轨迹
@@ -67,9 +69,9 @@
    public ResponseEntity<List<MobilePosition>> positions(@PathVariable String deviceId,
                                                    @RequestParam(required = false) String start,
                                                    @RequestParam(required = false) String end) {
        if (logger.isDebugEnabled()) {
            logger.debug("查询设备" + deviceId + "的历史轨迹");
        }
//        if (logger.isDebugEnabled()) {
//            logger.debug("查询设备" + deviceId + "的历史轨迹");
//        }

        if (StringUtil.isEmpty(start)) {
            start = null;
@@ -93,9 +95,9 @@
    })
    @GetMapping("/latest/{deviceId}")
    public ResponseEntity<MobilePosition> latestPosition(@PathVariable String deviceId) {
        if (logger.isDebugEnabled()) {
            logger.debug("查询设备" + deviceId + "的最新位置");
        }
//        if (logger.isDebugEnabled()) {
//            logger.debug("查询设备" + deviceId + "的最新位置");
//        }
        MobilePosition result = storager.queryLatestPosition(deviceId);
        return new ResponseEntity<>(result, HttpStatus.OK);
    }
@@ -161,9 +163,11 @@
            interval = "5";
        }
        Device device = storager.queryVideoDevice(deviceId);

        device.setSubscribeCycleForMobilePosition(Integer.parseInt(expires));
        device.setMobilePositionSubmissionInterval(Integer.parseInt(interval));
        storager.updateDevice(device);
        String result = msg;
        if (cmder.mobilePositionSubscribe(device, Integer.parseInt(expires), Integer.parseInt(interval))) {
        if (deviceService.removeMobilePositionSubscribe(device)) {
            result += "，成功";
        } else {
            result += "，失败";