Selaa lähdekoodia

更新 content-service/vod 的 dto 和 po 数据约束, 以及 po 的数据库表结构

reghao 6 kuukautta sitten
vanhempi
commit
6b6e5bdf16
28 muutettua tiedostoa jossa 194 lisäystä ja 34 poistoa
  1. 2 0
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/AlbumActionDto.java
  2. 3 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/AlbumCreateDto.java
  3. 2 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/CategoryAdd.java
  4. 2 4
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/NoticeAdd.java
  5. 11 0
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/SearchCriteria.java
  6. 3 0
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoCoverUpdate.java
  7. 2 0
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoErrorReport.java
  8. 4 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoInfoUpdate.java
  9. 2 0
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoScopeUpdate.java
  10. 6 0
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/BannerVideo.java
  11. 6 0
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PlayComplete.java
  12. 7 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PlayRecord.java
  13. 14 0
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostAlbum.java
  14. 12 5
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostCategory.java
  15. 12 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostItem.java
  16. 7 0
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostTag.java
  17. 7 0
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/SearchRecord.java
  18. 8 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/SiteNotice.java
  19. 12 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoCategoryPost.java
  20. 8 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoError.java
  21. 19 0
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoFile.java
  22. 20 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoPost.java
  23. 12 0
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoStatistic.java
  24. 6 0
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoTag.java
  25. 3 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/CategoryServiceImpl.java
  26. 0 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/VideoPlayServiceImpl.java
  27. 2 2
      content/content-service/src/main/resources/mapper/vod/PlayRecordMapper.xml
  28. 2 2
      content/content-service/src/main/resources/mapper/vod/VideoErrorMapper.xml

+ 2 - 0
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/AlbumActionDto.java

@@ -7,6 +7,7 @@ import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 
 /**
  * @author reghao
@@ -20,5 +21,6 @@ public class AlbumActionDto {
     @ValidEnum(value = AlbumAction.class, message = "操作类型不正确")
     private Integer action;
     @NotBlank
+    @Size(max = 10, message = "postId 不能超过 10 个字符")
     private String postId;
 }

+ 3 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/AlbumCreateDto.java

@@ -5,6 +5,7 @@ import cn.reghao.tnb.content.api.constant.PostScope;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
 /**
@@ -14,7 +15,8 @@ import javax.validation.constraints.Size;
 @Setter
 @Getter
 public class AlbumCreateDto {
-    @Size(min = 1, max = 20, message = "合集名字不能超过20个字符")
+    @NotBlank
+    @Size(min = 1, max = 20, message = "合集名字不能超过 20 个字符")
     private String albumName;
     @ValidEnum(value = PostScope.class, message = "可见范围不正确")
     private Integer scope;

+ 2 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/CategoryAdd.java

@@ -1,10 +1,10 @@
 package cn.reghao.tnb.content.app.vod.model.dto;
 
 import lombok.Getter;
-import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 
 /**
  * @author reghao
@@ -14,8 +14,7 @@ import javax.validation.constraints.NotNull;
 public class CategoryAdd {
     @NotNull
     private Integer pid;
-    @NotNull
     @NotBlank
-    @Length(min = 1, max = 10)
+    @Size(min = 1, max = 10, message = "分区名字不能超过 10 个字符")
     private String name;
 }

+ 2 - 4
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/NoticeAdd.java

@@ -1,10 +1,9 @@
 package cn.reghao.tnb.content.app.vod.model.dto;
 
 import lombok.Getter;
-import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 
 /**
  * @author reghao
@@ -12,8 +11,7 @@ import javax.validation.constraints.NotNull;
  */
 @Getter
 public class NoticeAdd {
-    @NotNull
     @NotBlank
-    @Length(min = 1, max = 225)
+    @Size(min = 1, max = 255, message = "站点公告内容不能超过 255 个字符")
     private String content;
 }

+ 11 - 0
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/SearchCriteria.java

@@ -4,6 +4,10 @@ import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.tnb.content.api.constant.VideoStatus;
 import lombok.Getter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.List;
 
 /**
@@ -12,9 +16,16 @@ import java.util.List;
  */
 @Getter
 public class SearchCriteria {
+    @NotEmpty
+    @Size(min = 1, max = 10, message = "status 10 个元素")
     private final List<Integer> status;
+    @NotEmpty
+    @Size(min = 1, max = 10, message = "scope 10 个元素")
     private final List<Integer> scope;
+    @NotBlank
+    @Size(min = 1, max = 64, message = "视频名字不能超过 64 个字符")
     private final String title;
+    @NotNull
     private final Integer nextId;
 
     private SearchCriteria(Builder builder) {

+ 3 - 0
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoCoverUpdate.java

@@ -3,6 +3,7 @@ package cn.reghao.tnb.content.app.vod.model.dto;
 import lombok.Getter;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 /**
  * @author reghao
@@ -11,7 +12,9 @@ import javax.validation.constraints.NotBlank;
 @Getter
 public class VideoCoverUpdate {
     @NotBlank
+    @Size(min = 1, max = 10, message = "videoId 不能超过 10 个字符")
     private String videoId;
     @NotBlank
+    @Size(min = 1, max = 20, message = "coverFileId 不能超过 20 个字符")
     private String coverFileId;
 }

+ 2 - 0
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoErrorReport.java

@@ -6,6 +6,7 @@ import cn.reghao.tnb.content.api.constant.VideoStatus;
 import lombok.Getter;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 /**
  * @author reghao
@@ -14,6 +15,7 @@ import javax.validation.constraints.NotBlank;
 @Getter
 public class VideoErrorReport {
     @NotBlank
+    @Size(min = 1, max = 10, message = "videoId 不能超过 10 个字符")
     private String videoId;
     @ValidEnum(value = VideoErrorType.class, message = "错误类型不正确")
     private Integer errorCode;

+ 4 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoInfoUpdate.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 /**
  * @author reghao
@@ -12,8 +13,10 @@ import javax.validation.constraints.NotBlank;
 @Getter
 public class VideoInfoUpdate {
     @NotBlank
+    @Size(min = 1, max = 10, message = "videoId 不能超过 10 个字符")
     private String videoId;
-    @Length(min = 1, max = 50, message = "")
+    @NotBlank
+    @Size(min = 1, max = 64, message = "视频名字不能超过 64 个字符")
     private String title;
     private String description;
     private String pubDate;

+ 2 - 0
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoScopeUpdate.java

@@ -5,6 +5,7 @@ import cn.reghao.jutil.web.validator.ValidEnum;
 import lombok.Getter;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 /**
  * @author reghao
@@ -13,6 +14,7 @@ import javax.validation.constraints.NotBlank;
 @Getter
 public class VideoScopeUpdate {
     @NotBlank
+    @Size(min = 1, max = 10, message = "videoId 不能超过 10 个字符")
     private String videoId;
     @ValidEnum(value = PostScope.class, message = "可见范围不正确")
     private Integer scope;

+ 6 - 0
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/BannerVideo.java

@@ -5,6 +5,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**
@@ -15,9 +17,13 @@ import java.time.LocalDateTime;
 @Setter
 @Getter
 public class BannerVideo extends BaseObject<Integer> {
+    @NotNull
     private Long createAt;
+    @NotBlank
     private String videoId;
+    @NotBlank
     private String title;
+    @NotBlank
     private String coverUrl;
 
     public BannerVideo(VideoPost videoPost, long createAt) {

+ 6 - 0
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PlayComplete.java

@@ -5,6 +5,9 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * @author reghao
  * @date 2025-08-03 12:26:06
@@ -13,8 +16,11 @@ import lombok.Setter;
 @Getter
 @Setter
 public class PlayComplete extends BaseObject<Integer> {
+    @NotNull
     private Long userId;
+    @NotBlank
     private String videoId;
+    @NotNull
     // ms 时间戳
     private Long createAt;
 

+ 7 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PlayRecord.java

@@ -4,6 +4,9 @@ import cn.reghao.jutil.jdk.db.BaseObject;
 import cn.reghao.tnb.message.api.dto.MediaProgress;
 import lombok.*;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * 视频播放记录
  *
@@ -15,18 +18,20 @@ import lombok.*;
 @Setter
 @Getter
 public class PlayRecord extends BaseObject<Integer> {
+    @NotNull
     private Long userId;
+    @NotBlank
     private String videoId;
+    @NotNull
     private Double currentTime;
+    @NotNull
     // ms 时间戳
     private Long createAt;
-    private Boolean ended;
 
     public PlayRecord(long userId, MediaProgress mediaProgress) {
         this.userId = userId;
         this.videoId = mediaProgress.getMediaId();
         this.currentTime = mediaProgress.getCurrentTime();
         this.createAt = System.currentTimeMillis();
-        this.ended = mediaProgress.getEnded();
     }
 }

+ 14 - 0
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostAlbum.java

@@ -9,6 +9,10 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
 /**
  * @author reghao
  * @date 2024-10-31 13:55:19
@@ -17,14 +21,24 @@ import lombok.Setter;
 @Setter
 @Getter
 public class PostAlbum extends BaseObject<Integer> {
+    @NotNull
     private Long albumId;
+    @NotBlank
+    @Size(min = 1, max = 20, message = "合集名字不能超过 20 个字符")
     private String albumName;
+    @NotNull
     private Integer channelCode;
+    @NotNull
     private String coverUrl;
+    @NotNull
     private Integer postType;
+    @NotNull
     private Integer total;
+    @NotNull
     private Integer scope;
+    @NotNull
     private Long createAt;
+    @NotNull
     private Long createBy;
 
     public PostAlbum(long albumId, AlbumCreateDto albumCreateDto) {

+ 12 - 5
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostCategory.java

@@ -6,6 +6,10 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
 /**
  * @author reghao
  * @date 2021-11-23 18:24:30
@@ -14,12 +18,15 @@ import lombok.Setter;
 @Setter
 @Getter
 public class PostCategory extends BaseObject<Integer> {
-    private int pid;
-    private int regionId;
+    @NotNull
+    private Integer pid;
+    @NotBlank
+    @Size(min = 1, max = 10, message = "分区名字不能超过 10 个字符")
     private String name;
-    private String icon;
-    private int sort;
-    private boolean vip;
+    @NotNull
+    private Integer sort;
+    @NotNull
+    private Boolean vip;
 
     public PostCategory(int pid, String name) {
         this.pid = pid;

+ 12 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostItem.java

@@ -5,6 +5,8 @@ import cn.reghao.oss.api.dto.media.ImageInfo;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**
@@ -14,18 +16,26 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @Getter
 public class PostItem extends BaseObject<Integer> {
+    @NotNull
     private Long albumId;
+    @NotBlank
     private String postId;
+    @NotNull
     private Integer pos;
+    @NotNull
     private Integer channelCode;
+    @NotNull
     private String objectId;
+    @NotNull
     private String format;
+    @NotNull
     private String url;
+    @NotNull
     private Integer width;
+    @NotNull
     private Integer height;
+    @NotNull
     private Boolean horizontal;
-    @Deprecated
-    private LocalDateTime addedAt;
 
     public PostItem(long albumId, String postId) {
         this.albumId = albumId;
@@ -38,7 +48,6 @@ public class PostItem extends BaseObject<Integer> {
         this.width = 0;
         this.height = 0;
         this.horizontal = false;
-        this.addedAt = LocalDateTime.now();
     }
 
     public PostItem(long albumId, int channelCode, ImageInfo imageInfo) {

+ 7 - 0
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostTag.java

@@ -6,6 +6,10 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
 /**
  * 稿件标签
  *
@@ -17,6 +21,9 @@ import lombok.Setter;
 @Setter
 @Getter
 public class PostTag extends BaseObject<Integer> {
+    @NotNull
     private String tagId;
+    @NotBlank
+    @Size(min = 1, max = 5, message = "标签名字不能超过 5 个字符")
     private String tagName;
 }

+ 7 - 0
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/SearchRecord.java

@@ -7,6 +7,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.time.LocalDateTime;
 
 /**
@@ -18,8 +21,12 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class SearchRecord extends BaseObject<Integer> {
+    @NotBlank
+    @Size(min = 1, max = 64, message = "查询关键字不能超过 64 个字符")
     private String keyword;
+    @NotNull
     private Long searchBy;
+    @NotNull
     private LocalDateTime searchAt;
 
     public SearchRecord(String keyword) {

+ 8 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/SiteNotice.java

@@ -5,6 +5,10 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
 /**
  * @author reghao
  * @date 2023-12-07 14:03:51
@@ -13,6 +17,9 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Getter
 public class SiteNotice extends BaseObject<Integer> {
+    @NotBlank
+    @Size(min = 1, max = 255, message = "站点公告内容不能超过 255 个字符")
     private String content;
-    private long createBy;
+    @NotNull
+    private Long createBy;
 }

+ 12 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoCategoryPost.java

@@ -5,6 +5,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**
@@ -15,13 +17,21 @@ import java.time.LocalDateTime;
 @Setter
 @Getter
 public class VideoCategoryPost extends BaseObject<Integer> {
+    @NotBlank
     private String videoId;
+    @NotNull
     private Integer categoryPid;
+    @NotNull
     private Integer categoryId;
-    private int duration;
+    @NotNull
+    private Integer duration;
+    @NotNull
     private Boolean horizontal;
-    private int scope;
+    @NotNull
+    private Integer scope;
+    @NotNull
     private LocalDateTime publishAt;
+    @NotNull
     private Long publishBy;
 
     public VideoCategoryPost(VideoPost videoPost) {

+ 8 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoError.java

@@ -6,6 +6,9 @@ import cn.reghao.tnb.content.app.vod.model.dto.VideoErrorReport;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * 视频错误
  *
@@ -15,9 +18,13 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Getter
 public class VideoError extends BaseObject<Integer> {
+    @NotBlank
     private String videoId;
-    private int errorCode;
+    @NotNull
+    private Integer errorCode;
+    @NotNull
     private String errorInfo;
+    @NotNull
     private Boolean solved;
 
     public VideoError(VideoErrorReport videoErrorReport) {

+ 19 - 0
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoFile.java

@@ -6,6 +6,9 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * 视频文件
  *
@@ -16,22 +19,38 @@ import lombok.Setter;
 @Setter
 @Getter
 public class VideoFile extends BaseObject<Integer> {
+    @NotBlank
     private String videoId;
+    @NotBlank
     private String objectId;
+    @NotNull
     private Integer channelCode;
+    @NotBlank
     private String videoCodec;
+    @NotNull
     private Long vbitRate;
+    @NotBlank
     private String audioCodec;
+    @NotNull
     private Long abitRate;
+    @NotBlank
     private String formatName;
+    @NotBlank
     private String urlType;
+    @NotBlank
     private String url;
+    @NotBlank
     private String quality;
+    @NotNull
     private Integer width;
+    @NotNull
     private Integer height;
+    @NotNull
     private Boolean horizontal;
+    @NotNull
     // 单位秒
     private Integer duration;
+    @NotNull
     private Long size;
 
     public VideoFile(String videoId, VideoInfo videoInfo, int channelCode) {

+ 20 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoPost.java

@@ -12,6 +12,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.time.LocalDateTime;
 
 /**
@@ -24,17 +27,31 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class VideoPost extends BaseObject<Integer> {
+    @NotBlank
     private String videoId;
+    @NotBlank
+    @Size(min = 1, max = 64, message = "视频名字不能超过 64 个字符")
     private String title;
+    @NotNull
+    @Size(max = 10_000, message = "视频描述不能超过 10_000 个字符")
     private String description;
+    @NotNull
     private Integer categoryPid;
+    @NotNull
     private Integer categoryId;
-    private int duration;
+    @NotNull
+    private Integer duration;
+    @NotNull
     private Boolean horizontal;
+    @NotBlank
     private String coverUrl;
-    private int scope;
-    private int status;
+    @NotNull
+    private Integer scope;
+    @NotNull
+    private Integer status;
+    @NotNull
     private LocalDateTime publishAt;
+    @NotNull
     private Long publishBy;
 
     public VideoPost(String videoId, VideoPublishSbt video, String coverUrl,

+ 12 - 0
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoStatistic.java

@@ -6,6 +6,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * 视频数据统计
  *
@@ -16,14 +19,23 @@ import lombok.NoArgsConstructor;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class VideoStatistic extends BaseObject<Integer> {
+    @NotBlank
     private String videoId;
+    @NotNull
     private Integer view;
+    @NotNull
     private Integer danmaku;
+    @NotNull
     private Integer comment;
+    @NotNull
     private Integer favorite;
+    @NotNull
     private Integer share;
+    @NotNull
     private Integer thumbUp;
+    @NotNull
     private Integer thumbDown;
+    @NotNull
     private Integer coin;
 
     public VideoStatistic(String videoId) {

+ 6 - 0
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoTag.java

@@ -5,6 +5,9 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * @author reghao
  * @date 2023-05-11 15:20:07
@@ -13,7 +16,10 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Getter
 public class VideoTag extends BaseObject<Integer> {
+    @NotBlank
     private String videoId;
+    @NotNull
     private Integer scope;
+    @NotBlank
     private String tagId;
 }

+ 3 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/CategoryServiceImpl.java

@@ -43,15 +43,15 @@ public class CategoryServiceImpl implements CategoryService {
 
         Map<Integer, VideoRegion> map = new HashMap<>(list.size());
         for (PostCategory category : list) {
-            if (category.isVip() && !vip) {
+            if (category.getVip() && !vip) {
                 continue;
             }
 
             int pid = category.getPid();
             int id = category.getId();
             String name = category.getName();
-            int regionId = category.getRegionId();
-            String icon = category.getIcon();
+            int regionId = 0;
+            String icon = "";
             int sort = category.getSort();
             if (pid == 0) {
                 map.put(id, new VideoRegion(pid, regionId, id, name, icon, sort));

+ 0 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/VideoPlayServiceImpl.java

@@ -142,7 +142,6 @@ public class VideoPlayServiceImpl implements VideoPlayService {
         } else {
             playRecord.setCurrentTime(currentTime);
             playRecord.setCreateAt(createAt);
-            playRecord.setEnded(ended);
             playRecordMapper.update(playRecord);
 
             if (ended) {

+ 2 - 2
content/content-service/src/main/resources/mapper/vod/PlayRecordMapper.xml

@@ -4,9 +4,9 @@
 <mapper namespace="cn.reghao.tnb.content.app.vod.db.mapper.PlayRecordMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into vod_play_record
-        (`id`,`deleted`,`create_time`,`update_time`,`user_id`,`video_id`,`current_time`,`create_at`)
+        (`user_id`,`video_id`,`current_time`,`create_at`)
         values 
-        (#{id},#{deleted},#{createTime},#{updateTime},#{userId},#{videoId},#{currentTime},#{createAt})
+        (#{userId},#{videoId},#{currentTime},#{createAt})
     </insert>
 
     <update id="update">

+ 2 - 2
content/content-service/src/main/resources/mapper/vod/VideoErrorMapper.xml

@@ -4,9 +4,9 @@
 <mapper namespace="cn.reghao.tnb.content.app.vod.db.mapper.VideoErrorMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into vod_video_error
-        (`id`,`deleted`,`create_time`,`update_time`,`video_id`,`error_code`,`error_info`,`solved`)
+        (`video_id`,`error_code`,`error_info`,`solved`)
         values 
-        (#{id},#{deleted},#{createTime},#{updateTime},#{videoId},#{errorCode},#{errorInfo},#{solved})
+        (#{videoId},#{errorCode},#{errorInfo},#{solved})
     </insert>
 
     <delete id="deleteByErrorCode">