优化异常处理以及级联设备状态查询

648540858

2023-03-17 c3ce2bc5d069ba57309567aee4ae418bc0cf75ed

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

@@ -1,11 +1,10 @@
package com.genersoft.iot.vmp.vmanager.gb28181.device;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
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.task.ISubscribeTask;
import com.genersoft.iot.vmp.gb28181.task.impl.CatalogSubscribeTask;
@@ -25,7 +24,7 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.ibatis.annotations.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,22 +32,22 @@
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;

import javax.servlet.http.HttpServletResponse;
import javax.sip.DialogState;
import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
import java.io.*;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.text.ParseException;
import java.util.*;

@Tag(name  = "国标设备查询", description = "国标设备查询")
@SuppressWarnings("rawtypes")
@CrossOrigin

@RestController
@RequestMapping("/api/device/query")
public class DeviceQuery {
@@ -99,9 +98,11 @@
   @Parameter(name = "page", description = "当前页", required = true)
   @Parameter(name = "count", description = "每页查询数量", required = true)
   @GetMapping("/devices")
   @Options()
   public PageInfo<Device> devices(int page, int count){
		
      return storager.queryVideoDeviceList(page, count);
//      if (page == null) page = 0;
//      if (count == null) count = 20;
      return storager.queryVideoDeviceList(page, count,null);
   }

   /**
@@ -125,7 +126,7 @@
   @Parameter(name = "online", description = "是否在线")
   @Parameter(name = "channelType", description = "设备/子目录-> false/true")
   @Parameter(name = "catalogUnderDevice", description = "是否直属与设备的目录")
   public PageInfo channels(@PathVariable String deviceId,
   public PageInfo<DeviceChannel> channels(@PathVariable String deviceId,
                                    int page, int count,
                                    @RequestParam(required = false) String query,
                                    @RequestParam(required = false) Boolean online,
@@ -145,7 +146,7 @@
    */
   @Operation(summary = "同步设备通道")
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @PostMapping("/devices/{deviceId}/sync")
   @GetMapping("/devices/{deviceId}/sync")
   public WVPResult<SyncStatus> devicesSync(@PathVariable String deviceId){
      
      if (logger.isDebugEnabled()) {
@@ -225,7 +226,7 @@
   @Parameter(name = "online", description = "是否在线")
   @Parameter(name = "channelType", description = "设备/子目录-> false/true")
   @GetMapping("/sub_channels/{deviceId}/{channelId}/channels")
   public PageInfo subChannels(@PathVariable String deviceId,
   public PageInfo<DeviceChannel> subChannels(@PathVariable String deviceId,
                                      @PathVariable String channelId,
                                      int page,
                                      int count,
@@ -239,8 +240,7 @@
         return deviceChannelPageResult;
      }

      PageInfo pageResult = storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count);
      return pageResult;
      return storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count);
   }

   /**