处理冲突

xiaoxie

2022-05-23 d739bfa5976e36ced26f906ab16f83c20c8cb27c

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java

@@ -6,10 +6,8 @@
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
import com.genersoft.iot.vmp.gb28181.task.impl.CatalogSubscribeTask;
import com.genersoft.iot.vmp.gb28181.task.impl.MobilePositionSubscribeHandlerTask;
import com.genersoft.iot.vmp.gb28181.task.impl.MobilePositionSubscribeTask;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
@@ -17,14 +15,12 @@
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.vmanager.bean.DeviceChannelTree;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.kxml2.wap.wv.WV;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,9 +53,6 @@
   
   @Autowired
   private DeferredResultHolder resultHolder;
	
   @Autowired
   private DeviceOffLineDetector offLineDetector;

   @Autowired
   private IDeviceService deviceService;
@@ -131,12 +124,14 @@
         @ApiImplicitParam(name="query", value = "查询内容" ,dataTypeClass = String.class),
         @ApiImplicitParam(name="online", value = "是否在线"  ,dataTypeClass = Boolean.class),
         @ApiImplicitParam(name="channelType", value = "设备/子目录-> false/true" ,dataTypeClass = Boolean.class),
         @ApiImplicitParam(name="catalogUnderDevice", value = "是否直属与设备的目录" ,dataTypeClass = Boolean.class),
   })
   public ResponseEntity<PageInfo> channels(@PathVariable String deviceId,
                                    int page, int count,
                                    @RequestParam(required = false) String query,
                                    @RequestParam(required = false) Boolean online,
                                    @RequestParam(required = false) Boolean channelType) {
                                    @RequestParam(required = false) Boolean channelType,
                                    @RequestParam(required = false) Boolean catalogUnderDevice) {
//      if (logger.isDebugEnabled()) {
//         logger.debug("查询视频设备通道API调用");
//      }
@@ -144,7 +139,7 @@
         query = null;
      }

      PageInfo pageResult = storager.queryChannelsByDeviceId(deviceId, query, channelType, online, page, count);
      PageInfo pageResult = storager.queryChannelsByDeviceId(deviceId, query, channelType, online, catalogUnderDevice, page, count);
      return new ResponseEntity<>(pageResult,HttpStatus.OK);
   }

@@ -293,7 +288,8 @@
   public ResponseEntity<PageInfo> updateTransport(@PathVariable String deviceId, @PathVariable String streamMode){
      Device device = storager.queryVideoDevice(deviceId);
      device.setStreamMode(streamMode);
      storager.updateDevice(device);
//      storager.updateDevice(device);
      deviceService.updateDevice(device);
      return new ResponseEntity<>(null,HttpStatus.OK);
   }

@@ -310,45 +306,12 @@
   public ResponseEntity<WVPResult<String>> updateDevice(Device device){

      if (device != null && device.getDeviceId() != null) {
         Device deviceInStore = storager.queryVideoDevice(device.getDeviceId());
         if (!StringUtils.isEmpty(device.getName())) deviceInStore.setName(device.getName());
         if (!StringUtils.isEmpty(device.getCharset())) deviceInStore.setCharset(device.getCharset());
         if (!StringUtils.isEmpty(device.getMediaServerId())) deviceInStore.setMediaServerId(device.getMediaServerId());

         //  目录订阅相关的信息
         if (device.getSubscribeCycleForCatalog() > 0) {
            if (deviceInStore.getSubscribeCycleForCatalog() == 0 || deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) {
               deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
               // 开启订阅
               deviceService.addCatalogSubscribe(deviceInStore);
            }
         }else if (device.getSubscribeCycleForCatalog() == 0) {
            if (deviceInStore.getSubscribeCycleForCatalog() != 0) {
               deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
               // 取消订阅
               deviceService.removeCatalogSubscribe(deviceInStore);
            }
         }

         // 移动位置订阅相关的信息
         if (device.getSubscribeCycleForMobilePosition() > 0) {
            if (deviceInStore.getSubscribeCycleForMobilePosition() == 0 || deviceInStore.getSubscribeCycleForMobilePosition() != device.getSubscribeCycleForMobilePosition()) {
               deviceInStore.setMobilePositionSubmissionInterval(device.getMobilePositionSubmissionInterval());
               deviceInStore.setSubscribeCycleForMobilePosition(device.getSubscribeCycleForMobilePosition());
               // 开启订阅
               deviceService.addMobilePositionSubscribe(deviceInStore);
            }
         }else if (device.getSubscribeCycleForMobilePosition() == 0) {
            if (deviceInStore.getSubscribeCycleForMobilePosition() != 0) {
               // 取消订阅
               deviceService.removeMobilePositionSubscribe(deviceInStore);
            }
         }

         // TODO 报警订阅相关的信息

         storager.updateDevice(device);
         cmder.deviceInfoQuery(device);
         deviceService.updateDevice(device);
//         cmder.deviceInfoQuery(device);
      }
      WVPResult<String> result = new WVPResult<>();
      result.setCode(0);
@@ -450,11 +413,6 @@
      return result;
   }

   @GetMapping("/{deviceId}/tree")
   @ApiOperation(value = "通道树形结构", notes = "通道树形结构")
   public WVPResult<List<DeviceChannelTree>> tree(@PathVariable String deviceId) {
      return WVPResult.Data(storager.tree(deviceId));
   }

   @GetMapping("/{deviceId}/sync_status")
   @ApiOperation(value = "获取通道同步进度", notes = "获取通道同步进度")