浏览代码

修改视频

hexiao 2 年之前
父节点
当前提交
b3fc81865c

+ 3 - 2
business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraResVo.java

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -38,7 +39,7 @@ public class BaseCameraResVo implements Serializable {
     /**
      * 开始时间
      */
-    @NotEmpty(message = "开始时间不能为空")
+    @NotNull(message = "开始时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
@@ -46,7 +47,7 @@ public class BaseCameraResVo implements Serializable {
      * 结束时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @NotEmpty(message = "结束时间不能为空")
+    @NotNull(message = "结束时间不能为空")
     private Date entTime;
 
 }

+ 1 - 1
hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -218,7 +218,7 @@ public class BaseCameraManagementController extends BaseController {
         if (ObjectUtils.isEmpty(one)) {
             throw new BaseException("相机编号【" + cameraCode + "】不存在");
         }
-        return success(CameraUtil.getPlayFlv(cameraCode, one.getChannel()));
+        return new AjaxResult(200, "ok", CameraUtil.getPlayFlv(cameraCode, one.getChannel()));
     }
 
     @ApiOperation("播放回放")