新增监控通用接口

src/main/java/com/yunfeiyun/agmp/iotm/device/common/domin/IotDeviceBaseListReqVo.java

@@ -3,10 +3,11 @@ package com.yunfeiyun.agmp.iotm.device.common.domin;
 import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class IotDeviceBaseListReqVo extends IotDevice {
     private String landId;
     private String blockId;
-    private String devTypeCode;
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/common/service/impl/IotDeviceCommonServiceImpl.java

@@ -29,10 +29,10 @@ public class IotDeviceCommonServiceImpl implements IotDeviceCommonService {
     private IotDeviceMapper iotDeviceMapper;
     @Override
     public <T> List<T> list(IotDeviceBaseListReqVo iotDeviceBaseListReqVo) {
-        if(StringUtils.isEmpty(iotDeviceBaseListReqVo.getDevTypeCode())){
+        if(StringUtils.isEmpty(iotDeviceBaseListReqVo.getDevtypeBid())){
             throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(),"设备类型为空");
         }
-        TosDevicetype tosDevicetype = typeCacheService.getCacheObjectByDevTypeCode(iotDeviceBaseListReqVo.getDevTypeCode());
+        TosDevicetype tosDevicetype = typeCacheService.getCacheObjectByDevTypeCode(iotDeviceBaseListReqVo.getDevtypeBid());
         IotDeviceBaseService iotDeviceBaseService = iotDeviceBaseServiceMap.get(typeCacheService.getServiceNameByDevTypeBid(tosDevicetype.getDevtypeBid()));
         iotDeviceBaseListReqVo.setDevtypeBid(tosDevicetype.getDevtypeBid());
         return iotDeviceBaseService.list(iotDeviceBaseListReqVo);

src/main/java/com/yunfeiyun/agmp/iotm/device/monitor/controller/IotMonitorController.java

@@ -0,0 +1,65 @@
+package com.yunfeiyun.agmp.iotm.device.monitor.controller;
+
+import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
+import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
+import com.yunfeiyun.agmp.common.utils.SecurityUtils;
+import com.yunfeiyun.agmp.iotm.common.controller.BaseController;
+import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseCtlReqVo;
+import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseListReqVo;
+import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceCommonService;
+import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotMonitorAddressGetReqVo;
+import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotMonitorCaptureReqVo;
+import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotMonitorPtzReqVo;
+import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotMonitorVideoReqVo;
+import com.yunfeiyun.agmp.iotm.device.monitor.service.IotMonitorService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/iot/monitor")
+public class IotMonitorController extends BaseController {
+    @Resource
+    private IotMonitorService iotMonitorService;
+    @Resource
+    private IotDeviceCommonService iotDeviceCommonService;
+
+    @GetMapping("/page")
+    public TableDataInfo page(IotDeviceBaseListReqVo iotDeviceBaseListReqVo){
+      startPage();
+      iotDeviceBaseListReqVo.setTid(SecurityUtils.getTid());
+      return getDataTable(iotMonitorService.list(iotDeviceBaseListReqVo));
+    }
+    @PostMapping("/address")
+    public AjaxResult address(@RequestBody IotMonitorAddressGetReqVo iotMonitorAddressGetReqVo){
+        IotDeviceBaseCtlReqVo iotDeviceBaseCtlReqVo = new IotDeviceBaseCtlReqVo();
+        iotDeviceBaseCtlReqVo.setDevBid(iotMonitorAddressGetReqVo.getDevBid());
+        iotDeviceBaseCtlReqVo.setCtlType("address");
+        iotDeviceBaseCtlReqVo.setParams(iotMonitorAddressGetReqVo);
+        return AjaxResult.success(iotDeviceCommonService.ctl(iotDeviceBaseCtlReqVo));
+    }
+    @PostMapping("/video}")
+    public AjaxResult video(@RequestBody IotMonitorVideoReqVo iotMonitorVideoReqVo){
+        IotDeviceBaseCtlReqVo iotDeviceBaseCtlReqVo = new IotDeviceBaseCtlReqVo();
+        iotDeviceBaseCtlReqVo.setDevBid(iotMonitorVideoReqVo.getDevBid());
+        iotDeviceBaseCtlReqVo.setCtlType("video");
+        iotDeviceBaseCtlReqVo.setParams(iotMonitorVideoReqVo);
+        return AjaxResult.success(iotDeviceCommonService.ctl(iotDeviceBaseCtlReqVo));
+    }
+    @PostMapping("/capture")
+    public AjaxResult capture(@RequestBody IotMonitorCaptureReqVo iotMonitorCaptureReqVo){
+        IotDeviceBaseCtlReqVo iotDeviceBaseCtlReqVo = new IotDeviceBaseCtlReqVo();
+        iotDeviceBaseCtlReqVo.setDevBid(iotMonitorCaptureReqVo.getDevBid());
+        iotDeviceBaseCtlReqVo.setCtlType("capture");
+        iotDeviceBaseCtlReqVo.setParams(iotMonitorCaptureReqVo);
+        return AjaxResult.success(iotDeviceCommonService.ctl(iotDeviceBaseCtlReqVo));
+    }
+    @PostMapping("/ptz")
+    public AjaxResult ptz(@RequestBody IotMonitorPtzReqVo iotMonitorPtzReqVo){
+        IotDeviceBaseCtlReqVo iotDeviceBaseCtlReqVo = new IotDeviceBaseCtlReqVo();
+        iotDeviceBaseCtlReqVo.setDevBid(iotMonitorPtzReqVo.getDevBid());
+        iotDeviceBaseCtlReqVo.setCtlType("ptz");
+        iotDeviceBaseCtlReqVo.setParams(iotMonitorPtzReqVo);
+        return AjaxResult.success(iotDeviceCommonService.ctl(iotDeviceBaseCtlReqVo));
+    }
+}

src/main/java/com/yunfeiyun/agmp/iotm/device/monitor/domin/IotEzvizDeviceAddressGetReqVo.java

@@ -1,20 +0,0 @@
-package com.yunfeiyun.agmp.iotm.device.monitor.domin;
-
-import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
-import lombok.Data;
-
-@Data
-public class IotEzvizDeviceAddressGetReqVo extends IotDevice {
-
-    private Integer channelNo;
-    private Integer protocol;
-    private String code;
-    private Integer expireTime;
-    private String type;
-    private Integer quality;
-    private String startTime;
-    private String stopTime;
-    private Integer supportH265;
-    private String playbackSpeed;
-    private String gbchannel;
-}

src/main/java/com/yunfeiyun/agmp/iotm/device/monitor/domin/IotMonitorAddressGetReqVo.java

@@ -0,0 +1,13 @@
+package com.yunfeiyun.agmp.iotm.device.monitor.domin;
+
+import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
+import lombok.Data;
+
+@Data
+public class IotMonitorAddressGetReqVo {
+    private String devBid;
+    private IotDevice iotDevice;
+    private String type;
+    private Integer quality;
+
+}

src/main/java/com/yunfeiyun/agmp/iotm/device/monitor/domin/IotEzvizDeviceCaptureReqVo.java

@@ -4,8 +4,8 @@ import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import lombok.Data;
 
 @Data
-public class IotEzvizDeviceCaptureReqVo extends IotDevice {
-
-    private Integer channelNo;
+public class IotMonitorCaptureReqVo {
+    private String devBid;
+    private IotDevice iotDevice;
     private Integer quality;
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/monitor/domin/IotEzvizDevicePtzReqVo.java

@@ -4,9 +4,10 @@ import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import lombok.Data;
 
 @Data
-public class IotEzvizDevicePtzReqVo extends IotDevice {
-
+public class IotMonitorPtzReqVo {
+    private String devBid;
+    private IotDevice iotDevice;
     private Integer direction;
-    private Integer channelNo;
     private Integer speed;
+    private boolean isStart;
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/monitor/domin/IotEzvizDeviceVideoReqVo.java

@@ -4,13 +4,9 @@ import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import lombok.Data;
 
 @Data
-public class IotEzvizDeviceVideoReqVo extends IotDevice {
-
-    private Integer channelNo;
+public class IotMonitorVideoReqVo {
+    private String devBid;
+    private IotDevice iotDevice;
     private String startTime;
     private String endTime;
-    private Integer recType;
-    private String version;
-    private Integer pageSize;
-
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/monitor/service/IotEzvizMonitorService.java

@@ -1,31 +1,23 @@
 package com.yunfeiyun.agmp.iotm.device.monitor.service;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
-import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseCtlReqVo;
-import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseListReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceBaseService;
 import com.yunfeiyun.agmp.iotm.device.monitor.domin.*;
 
-import java.util.List;
-
 /**
  * @author 123
  */
 public interface IotEzvizMonitorService extends IotDeviceBaseService {
-    public List<IotDevice> list(IotDeviceBaseListReqVo iotDeviceBaseListReqVo);
-
-    public IotDevice info(IotDeviceBaseListReqVo iotDeviceBaseListReqVo);
-
     /**云台控制开始*/
-    public String ptzStart(IotEzvizDevicePtzReqVo iotEzvizDevicePtzReqVo);
+    public String ptzStart(IotMonitorPtzReqVo iotMonitorReqVo);
     /**云台控制结束*/
-    public String ptzEnd(IotEzvizDevicePtzReqVo iotEzvizDevicePtzReqVo);
+    public String ptzEnd(IotMonitorPtzReqVo iotMonitorReqVo);
     /**抓拍*/
-    public String capture(IotEzvizDeviceCaptureReqVo iotEzvizDeviceCaptureReqVo);
+    public String capture(IotMonitorCaptureReqVo iotMonitorCaptureReqVo);
     /**回放*/
-    public String video(IotEzvizDeviceVideoReqVo iotEzvizDeviceVideoReqVo);
+    public String video(IotMonitorVideoReqVo iotMonitorVideoReqVo);
 
-    public String address(IotEzvizDeviceAddressGetReqVo iotEzvizDeviceAddressGetReqVo);
+    public String address(IotMonitorAddressGetReqVo iotEzvizDeviceAddressGetReqVo);
 
     public String refreshStatus(IotDevice iotDevice);
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/monitor/service/IotMonitorService.java

@@ -0,0 +1,14 @@
+package com.yunfeiyun.agmp.iotm.device.monitor.service;
+
+import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
+import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseListReqVo;
+import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceBaseService;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceListResVo;
+
+import java.util.List;
+
+public interface IotMonitorService extends IotDeviceBaseService {
+    public List<IotDeviceListResVo> list(IotDeviceBaseListReqVo iotDeviceBaseListReqVo);
+
+    public IotDevice info(IotDeviceBaseListReqVo iotDeviceBaseListReqVo);
+}

src/main/java/com/yunfeiyun/agmp/iotm/device/monitor/service/impl/IotEzvizMonitorServiceImpl.java

@@ -9,27 +9,21 @@ import com.yunfeiyun.agmp.common.utils.uuid.IdUtils;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceTypeLv1Enum;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
-import com.yunfeiyun.agmp.iot.common.domain.resvo.IotDeviceResVo;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.util.tmn.CustomerIdUtil;
-import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseCtlReqVo;
-import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseListReqVo;
-import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceBaseService;
 import com.yunfeiyun.agmp.iotm.device.common.service.impl.IotDeviceBaseServiceImpl;
 import com.yunfeiyun.agmp.iotm.device.monitor.domin.*;
 import com.yunfeiyun.agmp.iotm.device.monitor.service.IotEzvizMonitorService;
 import com.yunfeiyun.agmp.iotm.web.mapper.IotDeviceMapper;
 import com.yunfeiyun.agmp.iotm.web.service.IIotCmdtaskService;
-import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.LinkedList;
-import java.util.List;
 
 /**
  * 萤石云监控设备实现
@@ -44,36 +38,38 @@ public class IotEzvizMonitorServiceImpl extends IotDeviceBaseServiceImpl impleme
     @Resource
     private RedisCacheManager redisCacheManager;
 
-
-
-    @Override
-    public List<IotDevice> list(IotDeviceBaseListReqVo iotDeviceBaseCtlReqVo){
-        return iotDeviceMapper.selectIotDeviceList(iotDeviceBaseCtlReqVo);
-    }
-    @Override
-    public IotDevice info(IotDeviceBaseListReqVo iotDeviceBaseListReqVo){
-        return iotDeviceMapper.selectIotDeviceByDevBid(iotDeviceBaseListReqVo.getDevBid());
+    public String ptz(IotMonitorPtzReqVo iotMonitorPtzReqVo){
+        if(iotMonitorPtzReqVo.isStart()){
+            return ptzStart(iotMonitorPtzReqVo);
+        }else {
+            return ptzEnd(iotMonitorPtzReqVo);
+        }
     }
 
+
     @Override
-    public String ptzStart(IotEzvizDevicePtzReqVo iotEzvizDevicePtzReqVo) {
-        if(ObjectUtil.isNull(redisCacheManager.getCacheObject(RedisCacheKey.IOT_DEVICE_STATUS,iotEzvizDevicePtzReqVo.getDevBid()))){
+    public String ptzStart(IotMonitorPtzReqVo iotMonitorPtzReqVo) {
+        IotDevice iotDevice = iotMonitorPtzReqVo.getIotDevice();
+        if(null == iotDevice){
+            iotDevice = iotDeviceMapper.selectIotDeviceByDevBid(iotMonitorPtzReqVo.getDevBid());
+        }
+        if(ObjectUtil.isNull(redisCacheManager.getCacheObject(RedisCacheKey.IOT_DEVICE_STATUS, iotMonitorPtzReqVo.getDevBid()))){
             throw new IotBizException(ErrorCode.FAILURE.getCode(),"设备已离线");
         }
         CmdGroupModel cmdGroupModel = new CmdGroupModel();
         cmdGroupModel.setCId(CustomerIdUtil.getCustomerId());
         cmdGroupModel.setCmdModels(new LinkedList<>());
         CmdModel cmdModel = new CmdModel();
-        cmdModel.setDeviceId(iotEzvizDevicePtzReqVo.getDevBid());
+        cmdModel.setDeviceId(iotMonitorPtzReqVo.getDevBid());
         CmdModel.Cmd cmd = new CmdModel.Cmd();
         cmd.setFunc("ptzStart");
         cmd.setRetry(0L);
         JSONObject params = new JSONObject();
-        String[] devCodeArray = iotEzvizDevicePtzReqVo.getDevCode().split("-");
+        String[] devCodeArray = iotDevice.getDevCode().split("-");
         params.put("deviceSerial", devCodeArray[0]);
         params.put("channelNo", devCodeArray[1]);
-        params.put("direction", iotEzvizDevicePtzReqVo.getDirection());
-        params.put("speed", iotEzvizDevicePtzReqVo.getSpeed());
+        params.put("direction", iotMonitorPtzReqVo.getDirection());
+        params.put("speed", iotMonitorPtzReqVo.getSpeed());
         cmd.setJsons(params);
         cmdModel.setFinalStatus(false);
         cmdModel.setTimeout(10);
@@ -81,33 +77,37 @@ public class IotEzvizMonitorServiceImpl extends IotDeviceBaseServiceImpl impleme
         cmdModel.setCmdDistribution(cmd);
         cmdGroupModel.getCmdModels().add(Collections.singletonList(cmdModel));
         cmdGroupModel.setRequestId(IdUtils.fastUUID());
-        cmdGroupModel.setDevCode(iotEzvizDevicePtzReqVo.getDevCode());
+        cmdGroupModel.setDevCode(iotDevice.getDevCode());
         cmdGroupModel.setCtBiztype("3");
-        cmdGroupModel.setCtBiztitle(IotDeviceTypeLv1Enum.JKSB.getName() + "：" + iotEzvizDevicePtzReqVo.getDevCode());
-        cmdGroupModel.setCtDevtype(iotEzvizDevicePtzReqVo.getDevtypeBid());
+        cmdGroupModel.setCtBiztitle(IotDeviceTypeLv1Enum.JKSB.getName() + "：" + iotDevice.getDevCode());
+        cmdGroupModel.setCtDevtype(iotDevice.getDevtypeBid());
         
         iIotCmdtaskService.handInternalCmd(cmdGroupModel);
         return cmdGroupModel.getTaskUuid();
     }
 
     @Override
-    public String ptzEnd(IotEzvizDevicePtzReqVo iotEzvizDevicePtzReqVo) {
-        if(ObjectUtil.isNull(redisCacheManager.getCacheObject(RedisCacheKey.IOT_DEVICE_STATUS,iotEzvizDevicePtzReqVo.getDevBid()))){
+    public String ptzEnd(IotMonitorPtzReqVo iotMonitorPtzReqVo) {
+        IotDevice iotDevice = iotMonitorPtzReqVo.getIotDevice();
+        if(null == iotDevice){
+            iotDevice = iotDeviceMapper.selectIotDeviceByDevBid(iotMonitorPtzReqVo.getDevBid());
+        }
+        if(ObjectUtil.isNull(redisCacheManager.getCacheObject(RedisCacheKey.IOT_DEVICE_STATUS, iotMonitorPtzReqVo.getDevBid()))){
             throw new IotBizException(ErrorCode.FAILURE.getCode(),"设备已离线");
         }
-        String[] devCodeArray = iotEzvizDevicePtzReqVo.getDevCode().split("-");
+        String[] devCodeArray = iotDevice.getDevCode().split("-");
         CmdGroupModel cmdGroupModel = new CmdGroupModel();
         cmdGroupModel.setCId(CustomerIdUtil.getCustomerId());
         cmdGroupModel.setCmdModels(new LinkedList<>());
         CmdModel cmdModel = new CmdModel();
-        cmdModel.setDeviceId(iotEzvizDevicePtzReqVo.getDevBid());
+        cmdModel.setDeviceId(iotMonitorPtzReqVo.getDevBid());
         CmdModel.Cmd cmd = new CmdModel.Cmd();
         cmd.setFunc("ptzEnd");
         cmd.setRetry(0L);
         JSONObject params = new JSONObject();
         params.put("deviceSerial", devCodeArray[0]);
         params.put("channelNo", devCodeArray[1]);
-        params.put("direction", iotEzvizDevicePtzReqVo.getDirection());
+        params.put("direction", iotMonitorPtzReqVo.getDirection());
         cmd.setJsons(params);
         cmdModel.setFinalStatus(false);
         cmdModel.setTimeout(10);
@@ -115,32 +115,36 @@ public class IotEzvizMonitorServiceImpl extends IotDeviceBaseServiceImpl impleme
         cmdModel.setCmdDistribution(cmd);
         cmdGroupModel.getCmdModels().add(Collections.singletonList(cmdModel));
         cmdGroupModel.setRequestId(IdUtils.fastUUID());
-        cmdGroupModel.setDevCode(iotEzvizDevicePtzReqVo.getDevCode());
+        cmdGroupModel.setDevCode(iotDevice.getDevCode());
         cmdGroupModel.setCtBiztype("3");
-        cmdGroupModel.setCtBiztitle(IotDeviceTypeLv1Enum.JKSB.getName() + "：" + iotEzvizDevicePtzReqVo.getDevCode());
-        cmdGroupModel.setCtDevtype(iotEzvizDevicePtzReqVo.getDevtypeBid());
+        cmdGroupModel.setCtBiztitle(IotDeviceTypeLv1Enum.JKSB.getName() + "：" + iotDevice.getDevCode());
+        cmdGroupModel.setCtDevtype(iotDevice.getDevtypeBid());
         iIotCmdtaskService.handInternalCmd(cmdGroupModel);
         return cmdGroupModel.getTaskUuid();
     }
 
     @Override
-    public String capture(IotEzvizDeviceCaptureReqVo iotEzvizDeviceCaptureReqVo) {
-        if(ObjectUtil.isNull(redisCacheManager.getCacheObject(RedisCacheKey.IOT_DEVICE_STATUS,iotEzvizDeviceCaptureReqVo.getDevBid()))){
+    public String capture(IotMonitorCaptureReqVo iotMonitorCaptureReqVo) {
+        IotDevice iotDevice = iotMonitorCaptureReqVo.getIotDevice();
+        if(null == iotDevice){
+            iotDevice = iotDeviceMapper.selectIotDeviceByDevBid(iotMonitorCaptureReqVo.getDevBid());
+        }
+        if(ObjectUtil.isNull(redisCacheManager.getCacheObject(RedisCacheKey.IOT_DEVICE_STATUS, iotMonitorCaptureReqVo.getDevBid()))){
             throw new IotBizException(ErrorCode.FAILURE.getCode(),"设备已离线");
         }
-        String[] devCodeArray = iotEzvizDeviceCaptureReqVo.getDevCode().split("-");
+        String[] devCodeArray = iotDevice.getDevCode().split("-");
         CmdGroupModel cmdGroupModel = new CmdGroupModel();
         cmdGroupModel.setCId(CustomerIdUtil.getCustomerId());
         cmdGroupModel.setCmdModels(new LinkedList<>());
         CmdModel cmdModel = new CmdModel();
-        cmdModel.setDeviceId(iotEzvizDeviceCaptureReqVo.getDevBid());
+        cmdModel.setDeviceId(iotMonitorCaptureReqVo.getDevBid());
         CmdModel.Cmd cmd = new CmdModel.Cmd();
         cmd.setFunc("capture");
         cmd.setRetry(0L);
         JSONObject params = new JSONObject();
         params.put("deviceSerial", devCodeArray[0]);
         params.put("channelNo", devCodeArray[1]);
-        params.put("quality", iotEzvizDeviceCaptureReqVo.getQuality());
+        params.put("quality", iotMonitorCaptureReqVo.getQuality());
         cmd.setJsons(params);
         cmdModel.setFinalStatus(false);
         cmdModel.setTimeout(10);
@@ -148,36 +152,37 @@ public class IotEzvizMonitorServiceImpl extends IotDeviceBaseServiceImpl impleme
         cmdModel.setCmdDistribution(cmd);
         cmdGroupModel.getCmdModels().add(Collections.singletonList(cmdModel));
         cmdGroupModel.setRequestId(IdUtils.fastUUID());
-        cmdGroupModel.setDevCode(iotEzvizDeviceCaptureReqVo.getDevCode());
+        cmdGroupModel.setDevCode(iotDevice.getDevCode());
         cmdGroupModel.setCtBiztype("3");
-        cmdGroupModel.setCtBiztitle(IotDeviceTypeLv1Enum.JKSB.getName() + "：" + iotEzvizDeviceCaptureReqVo.getDevCode());
-        cmdGroupModel.setCtDevtype(iotEzvizDeviceCaptureReqVo.getDevtypeBid());
+        cmdGroupModel.setCtBiztitle(IotDeviceTypeLv1Enum.JKSB.getName() + "：" + iotDevice.getDevCode());
+        cmdGroupModel.setCtDevtype(iotDevice.getDevtypeBid());
         iIotCmdtaskService.handInternalCmd(cmdGroupModel);
         return cmdGroupModel.getTaskUuid();
     }
 
     @Override
-    public String video(IotEzvizDeviceVideoReqVo iotEzvizDeviceVideoReqVo) {
-        if(ObjectUtil.isNull(redisCacheManager.getCacheObject(RedisCacheKey.IOT_DEVICE_STATUS,iotEzvizDeviceVideoReqVo.getDevBid()))){
+    public String video(IotMonitorVideoReqVo iotMonitorVideoReqVo) {
+        IotDevice iotDevice = iotMonitorVideoReqVo.getIotDevice();
+        if(null == iotDevice){
+            iotDevice = iotDeviceMapper.selectIotDeviceByDevBid(iotMonitorVideoReqVo.getDevBid());
+        }
+        if(ObjectUtil.isNull(redisCacheManager.getCacheObject(RedisCacheKey.IOT_DEVICE_STATUS, iotMonitorVideoReqVo.getDevBid()))){
             throw new IotBizException(ErrorCode.FAILURE.getCode(),"设备已离线");
         }
-        String[] devCodeArray = iotEzvizDeviceVideoReqVo.getDevCode().split("-");
+        String[] devCodeArray = iotDevice.getDevCode().split("-");
         CmdGroupModel cmdGroupModel = new CmdGroupModel();
         cmdGroupModel.setCId(CustomerIdUtil.getCustomerId());
         cmdGroupModel.setCmdModels(new LinkedList<>());
         CmdModel cmdModel = new CmdModel();
-        cmdModel.setDeviceId(iotEzvizDeviceVideoReqVo.getDevBid());
+        cmdModel.setDeviceId(iotMonitorVideoReqVo.getDevBid());
         CmdModel.Cmd cmd = new CmdModel.Cmd();
         cmd.setFunc("video");
         cmd.setRetry(0L);
         JSONObject params = new JSONObject();
         params.put("deviceSerial", devCodeArray[0]);
         params.put("channelNo", devCodeArray[1]);
-        params.put("startTime", iotEzvizDeviceVideoReqVo.getStartTime());
-        params.put("endTime", iotEzvizDeviceVideoReqVo.getEndTime());
-        params.put("recType", iotEzvizDeviceVideoReqVo.getRecType());
-        params.put("version", iotEzvizDeviceVideoReqVo.getVersion());
-        params.put("pageSize", iotEzvizDeviceVideoReqVo.getPageSize());
+        params.put("startTime", iotMonitorVideoReqVo.getStartTime());
+        params.put("endTime", iotMonitorVideoReqVo.getEndTime());
         cmd.setJsons(params);
         cmdModel.setFinalStatus(false);
         cmdModel.setTimeout(10);
@@ -185,41 +190,37 @@ public class IotEzvizMonitorServiceImpl extends IotDeviceBaseServiceImpl impleme
         cmdModel.setCmdDistribution(cmd);
         cmdGroupModel.getCmdModels().add(Collections.singletonList(cmdModel));
         cmdGroupModel.setRequestId(IdUtils.fastUUID());
-        cmdGroupModel.setDevCode(iotEzvizDeviceVideoReqVo.getDevCode());
+        cmdGroupModel.setDevCode(iotDevice.getDevCode());
         cmdGroupModel.setCtBiztype("3");
-        cmdGroupModel.setCtBiztitle(IotDeviceTypeLv1Enum.JKSB.getName() + "：" + iotEzvizDeviceVideoReqVo.getDevCode());
-        cmdGroupModel.setCtDevtype(iotEzvizDeviceVideoReqVo.getDevtypeBid());
+        cmdGroupModel.setCtBiztitle(IotDeviceTypeLv1Enum.JKSB.getName() + "：" + iotDevice.getDevCode());
+        cmdGroupModel.setCtDevtype(iotDevice.getDevtypeBid());
         iIotCmdtaskService.handInternalCmd(cmdGroupModel);
         return cmdGroupModel.getTaskUuid();
     }
 
     @Override
-    public String address(IotEzvizDeviceAddressGetReqVo iotEzvizDeviceAddressGetReqVo) {
-        if(ObjectUtil.isNull(redisCacheManager.getCacheObject(RedisCacheKey.IOT_DEVICE_STATUS,iotEzvizDeviceAddressGetReqVo.getDevBid()))){
+    public String address(IotMonitorAddressGetReqVo iotMonitorAddressGetReqVo) {
+        IotDevice iotDevice = iotMonitorAddressGetReqVo.getIotDevice();
+        if(null == iotDevice){
+            iotDevice = iotDeviceMapper.selectIotDeviceByDevBid(iotMonitorAddressGetReqVo.getDevBid());
+        }
+        if(ObjectUtil.isNull(redisCacheManager.getCacheObject(RedisCacheKey.IOT_DEVICE_STATUS,iotMonitorAddressGetReqVo.getDevBid()))){
             throw new IotBizException(ErrorCode.FAILURE.getCode(),"设备已离线");
         }
-        String[] devCodeArray = iotEzvizDeviceAddressGetReqVo.getDevCode().split("-");
+        String[] devCodeArray = iotDevice.getDevCode().split("-");
         CmdGroupModel cmdGroupModel = new CmdGroupModel();
         cmdGroupModel.setCId(CustomerIdUtil.getCustomerId());
         cmdGroupModel.setCmdModels(new LinkedList<>());
         CmdModel cmdModel = new CmdModel();
-        cmdModel.setDeviceId(iotEzvizDeviceAddressGetReqVo.getDevBid());
+        cmdModel.setDeviceId(iotMonitorAddressGetReqVo.getDevBid());
         CmdModel.Cmd cmd = new CmdModel.Cmd();
         cmd.setFunc("address");
         cmd.setRetry(0L);
         JSONObject params = new JSONObject();
         params.put("deviceSerial", devCodeArray[0]);
         params.put("channelNo", devCodeArray[1]);
-        params.put("startTime", iotEzvizDeviceAddressGetReqVo.getStartTime());
-        params.put("stopTime", iotEzvizDeviceAddressGetReqVo.getStopTime());
-        params.put("protocol", iotEzvizDeviceAddressGetReqVo.getProtocol());
-        params.put("code", iotEzvizDeviceAddressGetReqVo.getCode());
-        params.put("expireTime", iotEzvizDeviceAddressGetReqVo.getExpireTime());
-        params.put("type", iotEzvizDeviceAddressGetReqVo.getType());
-        params.put("quality", iotEzvizDeviceAddressGetReqVo.getQuality());
-        params.put("supportH265", iotEzvizDeviceAddressGetReqVo.getSupportH265());
-        params.put("playbackSpeed", iotEzvizDeviceAddressGetReqVo.getPlaybackSpeed());
-        params.put("gbchannel", iotEzvizDeviceAddressGetReqVo.getGbchannel());
+        params.put("type", iotMonitorAddressGetReqVo.getType());
+        params.put("quality", iotMonitorAddressGetReqVo.getQuality());
         cmd.setJsons(params);
         cmdModel.setFinalStatus(false);
         cmdModel.setTimeout(10);
@@ -227,10 +228,10 @@ public class IotEzvizMonitorServiceImpl extends IotDeviceBaseServiceImpl impleme
         cmdModel.setCmdDistribution(cmd);
         cmdGroupModel.getCmdModels().add(Collections.singletonList(cmdModel));
         cmdGroupModel.setRequestId(IdUtils.fastUUID());
-        cmdGroupModel.setDevCode(iotEzvizDeviceAddressGetReqVo.getDevCode());
+        cmdGroupModel.setDevCode(iotDevice.getDevCode());
         cmdGroupModel.setCtBiztype("3");
-        cmdGroupModel.setCtBiztitle(IotDeviceTypeLv1Enum.JKSB.getName() + "：" + iotEzvizDeviceAddressGetReqVo.getDevCode());
-        cmdGroupModel.setCtDevtype(iotEzvizDeviceAddressGetReqVo.getDevtypeBid());
+        cmdGroupModel.setCtBiztitle(IotDeviceTypeLv1Enum.JKSB.getName() + "：" + iotDevice.getDevCode());
+        cmdGroupModel.setCtDevtype(iotDevice.getDevtypeBid());
 
         iIotCmdtaskService.handInternalCmd(cmdGroupModel);
         return cmdGroupModel.getTaskUuid();

src/main/java/com/yunfeiyun/agmp/iotm/device/monitor/service/impl/IotMonitorServiceImpl.java

@@ -0,0 +1,40 @@
+package com.yunfeiyun.agmp.iotm.device.monitor.service.impl;
+
+import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
+import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceTypeLv1Enum;
+import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
+import com.yunfeiyun.agmp.iot.common.domain.IotDevicetype;
+import com.yunfeiyun.agmp.iot.common.domain.dto.IotDeviceDto;
+import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseListReqVo;
+import com.yunfeiyun.agmp.iotm.device.common.service.impl.IotDeviceBaseServiceImpl;
+import com.yunfeiyun.agmp.iotm.device.monitor.service.IotMonitorService;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceListReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceListResVo;
+import com.yunfeiyun.agmp.iotm.web.mapper.IotDeviceMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+public class IotMonitorServiceImpl extends IotDeviceBaseServiceImpl implements IotMonitorService {
+    @Resource
+    private IotDeviceMapper iotDeviceMapper;
+
+    @Override
+    public List<IotDeviceListResVo> list(IotDeviceBaseListReqVo iotDeviceBaseListReqVo){
+        IotDeviceListReqVo iotDeviceListReqVo = new IotDeviceListReqVo();
+        BeanUtils.copyProperties(iotDeviceBaseListReqVo,iotDeviceListReqVo);
+        List<String> devTypeBidList = Arrays.asList(IotDeviceDictConst.TYPE_EZVIZ_JKSB,IotDeviceDictConst.TYPE_DAHUA_DEVICE,IotDeviceDictConst.TYPE_HIK_OPEN_DEVICE);
+        iotDeviceListReqVo.setDevtypeBidList(devTypeBidList);
+        return iotDeviceMapper.selectIotDeviceListByType(iotDeviceListReqVo);
+    }
+    @Override
+    public IotDevice info(IotDeviceBaseListReqVo iotDeviceBaseListReqVo){
+        return iotDeviceMapper.selectIotDeviceByDevBid(iotDeviceBaseListReqVo.getDevBid());
+    }
+
+}

src/main/java/com/yunfeiyun/agmp/iotm/device/pest/service/IotCbdService.java

@@ -4,10 +4,6 @@ import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.reqvo.IotCbdConfigEditReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseListReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceBaseService;
-import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotEzvizDeviceAddressGetReqVo;
-import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotEzvizDeviceCaptureReqVo;
-import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotEzvizDevicePtzReqVo;
-import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotEzvizDeviceVideoReqVo;
 
 import java.util.List;
 

src/main/java/com/yunfeiyun/agmp/iotm/device/pest/service/impl/IotCbdServiceImpl.java

@@ -1,33 +1,20 @@
 package com.yunfeiyun.agmp.iotm.device.pest.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
-import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
-import com.yunfeiyun.agmp.common.enums.RedisCacheKey;
-import com.yunfeiyun.agmp.common.framework.manager.RedisCacheManager;
 import com.yunfeiyun.agmp.common.log.LogCore;
 import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.utils.uuid.IdUtils;
 import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
-import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
-import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceTypeLv1Enum;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconfig;
 import com.yunfeiyun.agmp.iot.common.domain.reqvo.IotCbdConfigEditReqVo;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
-import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
-import com.yunfeiyun.agmp.iot.common.util.tmn.CustomerIdUtil;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseListReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.service.impl.IotDeviceBaseServiceImpl;
-import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotEzvizDeviceAddressGetReqVo;
-import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotEzvizDeviceCaptureReqVo;
-import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotEzvizDevicePtzReqVo;
-import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotEzvizDeviceVideoReqVo;
-import com.yunfeiyun.agmp.iotm.device.monitor.service.IotEzvizMonitorService;
 import com.yunfeiyun.agmp.iotm.device.pest.service.IotCbdService;
 import com.yunfeiyun.agmp.iotm.web.mapper.IotDeviceMapper;
 import com.yunfeiyun.agmp.iotm.web.service.IIotCmdtaskService;
@@ -38,8 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 

src/main/java/com/yunfeiyun/agmp/iotm/web/mapper/IotDeviceMapper.java

@@ -29,6 +29,8 @@ public interface IotDeviceMapper
      * @return 设备基础集合
      */
     public List<IotDevice> selectIotDeviceList(IotDevice iotDevice);
+    /**查询设备基础列表*/
+
 
     /**
      * 新增设备基础
@@ -57,7 +59,7 @@ public interface IotDeviceMapper
     /**
      * 删除设备基础
      *
-     * @param id 设备基础主键
+     * @param devBid 设备基础主键
      * @return 结果
      */
     public int deleteIotDeviceByDevBid(String devBid);