فهرست منبع

监控功能 增加一种类型(视频)

dsx 1 سال پیش
والد
کامیت
4fc1bab4d0

+ 20 - 0
src/main/java/com/fdkankan/scene/entity/Surveillance.java

@@ -65,6 +65,26 @@ public class Surveillance implements Serializable {
     private String playUrl;
     private String playUrl;
 
 
     /**
     /**
+     * 类型
+     */
+    @TableField("url_type")
+    private Integer urlType;
+
+
+    /**
+     * 播放地址
+     */
+    @TableField("file_name")
+    private String  fileName;
+
+    /**
+     * 封面图
+     */
+    @TableField("poster")
+    private String  poster;
+
+
+    /**
      * 创建时间
      * 创建时间
      */
      */
     @TableField("create_time")
     @TableField("create_time")

+ 15 - 0
src/main/java/com/fdkankan/scene/service/impl/SurveillanceServiceImpl.java

@@ -1,11 +1,13 @@
 package com.fdkankan.scene.service.impl;
 package com.fdkankan.scene.service.impl;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.scene.entity.SceneEditInfo;
 import com.fdkankan.scene.entity.SceneEditInfo;
 import com.fdkankan.scene.entity.SceneEditInfoExt;
 import com.fdkankan.scene.entity.SceneEditInfoExt;
@@ -47,6 +49,16 @@ public class SurveillanceServiceImpl extends ServiceImpl<ISurveillanceMapper, Su
     @Override
     @Override
     public ResultData saveSurveillance(SurveillanceParamVO param) {
     public ResultData saveSurveillance(SurveillanceParamVO param) {
 
 
+        if(param.getUrlType() == 1){
+            if(StrUtil.isEmpty(param.getPlayUrl())){
+                throw new BusinessException(ServerCode.PARAM_REQUIRED.code(), ServerCode.PARAM_REQUIRED.formatMessage("playUrl"));
+            }
+        }else{
+            if(StrUtil.isEmpty(param.getFileName()) || StrUtil.isEmpty(param.getPoster())){
+                throw new BusinessException(ServerCode.PARAM_REQUIRED.code(), ServerCode.PARAM_REQUIRED.formatMessage("fileName、poster"));
+            }
+        }
+
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
         if(Objects.isNull(scenePlus)){
         if(Objects.isNull(scenePlus)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
@@ -64,6 +76,9 @@ public class SurveillanceServiceImpl extends ServiceImpl<ISurveillanceMapper, Su
         surveillance.setName(param.getName());
         surveillance.setName(param.getName());
         surveillance.setData(param.getData().toJSONString());
         surveillance.setData(param.getData().toJSONString());
         surveillance.setPlayUrl(param.getPlayUrl());
         surveillance.setPlayUrl(param.getPlayUrl());
+        surveillance.setUrlType(param.getUrlType());
+        surveillance.setFileName(param.getFileName());
+        surveillance.setPoster(param.getPoster());
         this.saveOrUpdate(surveillance);
         this.saveOrUpdate(surveillance);
 
 
         sceneEditInfoExt.setSurveillances(CommonStatus.YES.code().intValue());
         sceneEditInfoExt.setSurveillances(CommonStatus.YES.code().intValue());

+ 9 - 1
src/main/java/com/fdkankan/scene/vo/SurveillanceParamVO.java

@@ -3,6 +3,8 @@ package com.fdkankan.scene.vo;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
@@ -25,9 +27,15 @@ public class SurveillanceParamVO {
     @NotBlank(message = "name不能为空")
     @NotBlank(message = "name不能为空")
     private String name;
     private String name;
 
 
-    @NotBlank(message = "playUrl不能为空")
     private String playUrl;
     private String playUrl;
 
 
+    @NotNull(message = "urlType不能为空")
+    private Integer urlType;
+
+    private String poster;
+
+    private String fileName;
+
     @NotBlank(message = "panoId不能为空")
     @NotBlank(message = "panoId不能为空")
     private String panoId;
     private String panoId;
 
 

+ 8 - 0
src/main/java/com/fdkankan/scene/vo/SurveillanceVO.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import java.io.Serializable;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.Data;
 
 
+import javax.validation.constraints.NotNull;
+
 /**
 /**
  * <p>
  * <p>
  * 监控推拉流信息
  * 监控推拉流信息
@@ -34,6 +36,12 @@ public class SurveillanceVO implements Serializable {
      */
      */
     private String playUrl;
     private String playUrl;
 
 
+    private Integer urlType;
+
+    private String poster;
+
+    private String fileName;
+
     private String sid;
     private String sid;
 
 
     private String panoId;
     private String panoId;