参数调整

iot-module/iot-module-stream/iot-module-stream-biz/src/main/java/com/middle/platform/stream/biz/domain/res/StreamPageRes.java

@@ -1,7 +1,8 @@
 package com.middle.platform.stream.biz.domain.res;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
@@ -9,7 +10,6 @@ import java.time.LocalDateTime;
  * @author Aick Spt
  * @date 2024-05-06 10:31
  */
-@Slf4j
 @Data
 public class StreamPageRes {
 
@@ -47,17 +47,20 @@ public class StreamPageRes {
     /**
      * 分片存储规则 1-1小时
      */
-    private Boolean saveRule;
+    private Integer saveRule;
+    private String saveRuleLabel;
 
     /**
      * 使用状态 1-使用中 2-禁用
      */
-    private int useFlag;
+    private Integer useFlag;
+    private String useFlagLabel;
 
     /**
      * 视频流类型 1-rtsp 2-rtmp
      */
-    private int type;
+    private Integer type;
+    private String typeLabel;
 
     /**
      * 创建人
@@ -67,6 +70,8 @@ public class StreamPageRes {
     /**
      * 创建时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**
@@ -77,8 +82,9 @@ public class StreamPageRes {
     /**
      * 更新时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
 
-
 }

iot-module/iot-module-stream/iot-module-stream-biz/src/main/java/com/middle/platform/stream/biz/entity/SDevice.java

@@ -4,19 +4,18 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.middle.platform.mybatis.core.dataobject.BaseDO;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.LocalDateTime;
-
 /**
-* @date 2024-05-06 09:54:48
-* @author xucaiqin
-*/
+ * @author xucaiqin
+ * @date 2024-05-06 09:54:48
+ */
 @Getter
 @Setter
 @TableName(value = "s_device")
-public class SDevice {
+public class SDevice extends BaseDO {
     /**
      * id
      */
@@ -51,7 +50,7 @@ public class SDevice {
      * 分片存储规则 1-1小时
      */
     @TableField(value = "save_rule")
-    private Boolean saveRule;
+    private Integer saveRule;
 
     /**
      * 使用状态 1-使用中 2-禁用
@@ -63,38 +62,7 @@ public class SDevice {
      * 视频流类型 1-rtsp 2-rtmp
      */
     @TableField(value = "`type`")
-    private Boolean type;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    private Long createBy;
+    private Integer type;
 
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
 
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    @TableField(value = "delete_time")
-    private LocalDateTime deleteTime;
-
-    /**
-     * 删除标识
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
 }

iot-module/iot-module-stream/iot-module-stream-biz/src/main/java/com/middle/platform/stream/biz/pojo/VideoPage.java

@@ -1,6 +1,7 @@
 package com.middle.platform.stream.biz.pojo;
 
 import com.middle.platform.common.core.modle.BasePara;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,5 +12,9 @@ import lombok.Setter;
 @Getter
 @Setter
 public class VideoPage extends BasePara {
+    /**
+     * 1-rtsp 2-rtmp
+     */
+    @NotNull(message = "类型不能为空")
     private Integer type;
 }