Merge pull request #640 from duzeng/wvp-28181-2.0

648540858

2022-10-13 92022f8a8b7bccc865c47bd8cfafaffb91c2799c

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

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.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;
@@ -17,6 +18,7 @@
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
@@ -30,14 +32,18 @@
import org.springframework.http.HttpStatus;
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.nio.file.Files;
import java.text.ParseException;
import java.util.*;

@Tag(name  = "国标设备查询", description = "国标设备查询")
@@ -81,10 +87,9 @@
   @Operation(summary = "查询国标设备")
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @GetMapping("/devices/{deviceId}")
   public ResponseEntity<Device> devices(@PathVariable String deviceId){
   public Device devices(@PathVariable String deviceId){
      
      Device device = storager.queryVideoDevice(deviceId);
      return new ResponseEntity<>(device,HttpStatus.OK);
      return storager.queryVideoDevice(deviceId);
   }

   /**
@@ -123,18 +128,17 @@
   @Parameter(name = "online", description = "是否在线")
   @Parameter(name = "channelType", description = "设备/子目录-> false/true")
   @Parameter(name = "catalogUnderDevice", description = "是否直属与设备的目录")
   public ResponseEntity<PageInfo> channels(@PathVariable String deviceId,
   public 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 catalogUnderDevice) {
      if (StringUtils.isEmpty(query)) {
      if (ObjectUtils.isEmpty(query)) {
         query = null;
      }

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

   /**
@@ -154,11 +158,8 @@
      boolean status = deviceService.isSyncRunning(deviceId);
      // 已存在则返回进度
      if (status) {
         WVPResult<SyncStatus> wvpResult = new WVPResult<>();
         wvpResult.setCode(0);
         SyncStatus channelSyncStatus = deviceService.getChannelSyncStatus(deviceId);
         wvpResult.setData(channelSyncStatus);
         return wvpResult;
         return WVPResult.success(channelSyncStatus);
      }
      deviceService.sync(device);

@@ -176,7 +177,7 @@
   @Operation(summary = "移除设备")
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @DeleteMapping("/devices/{deviceId}/delete")
   public ResponseEntity<String> delete(@PathVariable String deviceId){
   public String delete(@PathVariable String deviceId){
      
      if (logger.isDebugEnabled()) {
         logger.debug("设备信息删除API调用，deviceId：" + deviceId);
@@ -200,10 +201,10 @@
         }
         JSONObject json = new JSONObject();
         json.put("deviceId", deviceId);
         return new ResponseEntity<>(json.toString(),HttpStatus.OK);
         return json.toString();
      } else {
         logger.warn("设备信息删除API调用失败！");
         return new ResponseEntity<String>("设备信息删除API调用失败！", HttpStatus.INTERNAL_SERVER_ERROR);
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "设备信息删除API调用失败！");
      }
   }

@@ -317,13 +318,18 @@
         result.setResult(new ResponseEntity(String.format("设备%s不存在", deviceId),HttpStatus.OK));
         return result;
      }
      cmder.deviceStatusQuery(device, event -> {
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData(String.format("获取设备状态失败，错误码： %s, %s", event.statusCode, event.msg));
         resultHolder.invokeResult(msg);
      });
      try {
         cmder.deviceStatusQuery(device, event -> {
            RequestMessage msg = new RequestMessage();
            msg.setId(uuid);
            msg.setKey(key);
            msg.setData(String.format("获取设备状态失败，错误码： %s, %s", event.statusCode, event.msg));
            resultHolder.invokeResult(msg);
         });
      } catch (InvalidArgumentException | SipException | ParseException e) {
         logger.error("[命令发送失败] 获取设备状态: {}", e.getMessage());
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
      }
      result.onTimeout(()->{
         logger.warn(String.format("获取设备状态超时"));
         // 释放rtpserver
@@ -370,14 +376,19 @@
      Device device = storager.queryVideoDevice(deviceId);
      String key = DeferredResultHolder.CALLBACK_CMD_ALARM + deviceId;
      String uuid = UUID.randomUUID().toString();
      cmder.alarmInfoQuery(device, startPriority, endPriority, alarmMethod, alarmType, startTime, endTime, event -> {
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData(String.format("设备报警查询失败，错误码： %s, %s",event.statusCode, event.msg));
         resultHolder.invokeResult(msg);
      });
        DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String >> (3 * 1000L);
      try {
         cmder.alarmInfoQuery(device, startPriority, endPriority, alarmMethod, alarmType, startTime, endTime, event -> {
            RequestMessage msg = new RequestMessage();
            msg.setId(uuid);
            msg.setKey(key);
            msg.setData(String.format("设备报警查询失败，错误码： %s, %s",event.statusCode, event.msg));
            resultHolder.invokeResult(msg);
         });
      } catch (InvalidArgumentException | SipException | ParseException e) {
         logger.error("[命令发送失败] 设备报警查询: {}", e.getMessage());
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
      }
      DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String >> (3 * 1000L);
      result.onTimeout(()->{
         logger.warn(String.format("设备报警查询超时"));
         // 释放rtpserver
@@ -402,7 +413,8 @@
         wvpResult.setCode(-1);
         wvpResult.setMsg("同步尚未开始");
      }else {
         wvpResult.setCode(0);
         wvpResult.setCode(ErrorCode.SUCCESS.getCode());
         wvpResult.setMsg(ErrorCode.SUCCESS.getMsg());
         wvpResult.setData(channelSyncStatus);
         if (channelSyncStatus.getErrorMsg() != null) {
            wvpResult.setMsg(channelSyncStatus.getErrorMsg());
@@ -414,24 +426,20 @@
   @GetMapping("/{deviceId}/subscribe_info")
   @Operation(summary = "获取设备的订阅状态")
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   public WVPResult<Map<String, String>> getSubscribeInfo(@PathVariable String deviceId) {
   public WVPResult<Map<String, Integer>> getSubscribeInfo(@PathVariable String deviceId) {
      Set<String> allKeys = dynamicTask.getAllKeys();
      Map<String, String> dialogStateMap = new HashMap<>();
      Map<String, Integer> dialogStateMap = new HashMap<>();
      for (String key : allKeys) {
         if (key.startsWith(deviceId)) {
            ISubscribeTask subscribeTask = (ISubscribeTask)dynamicTask.get(key);
            DialogState dialogState = subscribeTask.getDialogState();
            if (dialogState == null) {
               continue;
            }
            if (subscribeTask instanceof CatalogSubscribeTask) {
               dialogStateMap.put("catalog", dialogState.toString());
               dialogStateMap.put("catalog", 1);
            }else if (subscribeTask instanceof MobilePositionSubscribeTask) {
               dialogStateMap.put("mobilePosition", dialogState.toString());
               dialogStateMap.put("mobilePosition", 1);
            }
         }
      }
      WVPResult<Map<String, String>> wvpResult = new WVPResult<>();
      WVPResult<Map<String, Integer>> wvpResult = new WVPResult<>();
      wvpResult.setCode(0);
      wvpResult.setData(dialogStateMap);
      return wvpResult;
@@ -502,7 +510,6 @@
      return new ResponseEntity<>(pageInfo,HttpStatus.OK);
   }


   /**
    * 查询国标树下的通道
    * @param deviceId 设备ID
@@ -518,7 +525,6 @@
   @Parameter(name = "count", description = "每页条数", required = true)
   @GetMapping("/tree/channel/{deviceId}")
   public ResponseEntity<PageInfo> getChannelInTreeNode(@PathVariable String deviceId, @RequestParam(required = false) String parentId, int page, int count){


      if (page <= 0) {
         page = 1;