依赖包版本升级

648540858

2022-08-19 1a9e49d9ff210e39f6297150db758906a4f02e6f

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

@@ -7,19 +7,16 @@

package com.genersoft.iot.vmp.vmanager.gb28181.device;

import javax.sip.message.Response;

import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
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.storager.IVideoManagerStorage;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +27,7 @@

import java.util.UUID;

@Api(tags = "国标设备配置")
@Tag(name = "国标设备配置")
@CrossOrigin
@RestController
@RequestMapping("/api/device/config")
@@ -39,7 +36,7 @@
    private final static Logger logger = LoggerFactory.getLogger(DeviceQuery.class);

    @Autowired
    private IVideoManagerStorager storager;
    private IVideoManagerStorage storager;

    @Autowired
    private SIPCommander cmder;
@@ -57,16 +54,14 @@
    * @param heartBeatCount 心跳计数
    * @return
    */
   @ApiOperation("基本配置设置命令")
   @GetMapping("/basicParam/{deviceId}")
   @ApiImplicitParams({
         @ApiImplicitParam(name = "deviceId", value ="设备ID" ,dataTypeClass = String.class),
         @ApiImplicitParam(name = "channelId", value ="通道ID",dataTypeClass = String.class ),
         @ApiImplicitParam(name = "name", value ="名称" ,dataTypeClass = String.class),
         @ApiImplicitParam(name = "expiration", value ="到期时间" ,dataTypeClass = String.class),
         @ApiImplicitParam(name = "heartBeatInterval", value ="心跳间隔" ,dataTypeClass = String.class),
         @ApiImplicitParam(name = "heartBeatCount", value ="心跳计数" ,dataTypeClass = String.class),
   })
   @Operation(summary = "基本配置设置命令")
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @Parameter(name = "name", description = "名称")
   @Parameter(name = "expiration", description = "到期时间")
   @Parameter(name = "heartBeatInterval", description = "心跳间隔")
   @Parameter(name = "heartBeatCount", description = "心跳计数")
   public DeferredResult<ResponseEntity<String>> homePositionApi(@PathVariable String deviceId,
                                                                  String channelId,
                                                                @RequestParam(required = false) String name,
@@ -111,12 +106,10 @@
    * @param channelId 通道ID
    * @return
    */
   @ApiOperation("设备配置查询请求")
   @ApiImplicitParams({
         @ApiImplicitParam(name = "deviceId", value ="设备ID" ,dataTypeClass = String.class),
         @ApiImplicitParam(name = "channelId", value ="通道ID" ,dataTypeClass = String.class),
         @ApiImplicitParam(name = "configType", value ="配置类型" ,dataTypeClass = String.class),
   })
   @Operation(summary = "设备配置查询请求")
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @Parameter(name = "configType", description = "配置类型")
   @GetMapping("/query/{deviceId}/{configType}")
    public DeferredResult<ResponseEntity<String>> configDownloadApi(@PathVariable String deviceId, 
                                                                @PathVariable String configType,