多级虚拟组织处理修复

648540858

2022-04-25 0b6b72ae4415afd79aaad53473bd5ce67c3bd788

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

@@ -9,7 +9,6 @@
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 +16,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;
@@ -164,20 +161,17 @@
         logger.debug("设备通道信息同步API调用，deviceId：" + deviceId);
      }
      Device device = storager.queryVideoDevice(deviceId);
      SyncStatus syncStatus = deviceService.getChannelSyncStatus(deviceId);
      boolean status = deviceService.isSyncRunning(deviceId);
      // 已存在则返回进度
      if (syncStatus != null && syncStatus.getErrorMsg() == null) {
      if (status) {
         WVPResult<SyncStatus> wvpResult = new WVPResult<>();
         wvpResult.setCode(0);
         wvpResult.setData(syncStatus);
         SyncStatus channelSyncStatus = deviceService.getChannelSyncStatus(deviceId);
         wvpResult.setData(channelSyncStatus);
         return wvpResult;
      }
      SyncStatus syncStatusReady = new SyncStatus();
      deviceService.setChannelSyncReady(deviceId);
      cmder.catalogQuery(device, event -> {
         String errorMsg = String.format("同步通道失败，错误码： %s, %s", event.statusCode, event.msg);
         deviceService.setChannelSyncEnd(deviceId, errorMsg);
      });
      deviceService.sync(device);

      WVPResult<SyncStatus> wvpResult = new WVPResult<>();
      wvpResult.setCode(0);
      wvpResult.setMsg("开始同步");
@@ -238,7 +232,7 @@
         @ApiImplicitParam(name="page", value = "当前页", required = true, dataTypeClass = Integer.class),
         @ApiImplicitParam(name="count", value = "每页条数", required = true, dataTypeClass = Integer.class),
         @ApiImplicitParam(name="query", value = "查询内容", dataTypeClass = String.class),
         @ApiImplicitParam(name="online", value = "是否在线", dataTypeClass = String.class),
         @ApiImplicitParam(name="online", value = "是否在线", dataTypeClass = Boolean.class),
         @ApiImplicitParam(name="channelType", value = "通道类型， 子目录", dataTypeClass = Boolean.class),
   })
   @GetMapping("/sub_channels/{deviceId}/{channelId}/channels")
@@ -247,7 +241,7 @@
                                      int page,
                                      int count,
                                      @RequestParam(required = false) String query,
                                      @RequestParam(required = false) String online,
                                      @RequestParam(required = false) Boolean online,
                                      @RequestParam(required = false) Boolean channelType){

//      if (logger.isDebugEnabled()) {
@@ -453,11 +447,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 = "获取通道同步进度")