delete SiteNotice

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/AdminVodController.java

@@ -2,7 +2,6 @@ package cn.reghao.tnb.content.app.vod.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.tnb.common.auth.AuthUser;
-import cn.reghao.tnb.common.web.ServletUtil;
 import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.auth.api.iface.AdminAccountService;
 import cn.reghao.tnb.content.app.vod.model.vo.AdminVideo;
@@ -11,7 +10,6 @@ import cn.reghao.tnb.content.app.vod.model.vo.AuditVideo;
 import cn.reghao.tnb.content.api.dto.VideoRegion;
 import cn.reghao.tnb.content.api.dto.VideoSearch;
 import cn.reghao.tnb.content.app.vod.model.dto.CategoryAdd;
-import cn.reghao.tnb.content.app.vod.model.dto.NoticeAdd;
 import cn.reghao.tnb.content.app.vod.service.AdminVodService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -69,20 +67,6 @@ public class AdminVodController {
         return WebResult.success(nextVideoId);
     }
 
-    @Operation(summary = "站点公告", description = "N")
-    @GetMapping(value = "/site_notice", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String siteNoticePage() {
-        String content = adminVodService.getSiteNotice();
-        return WebResult.success(content);
-    }
-
-    @Operation(summary = "添加站点公告", description = "N")
-    @PostMapping(value = "/site_notice", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String addSiteNotice(@RequestBody @Validated NoticeAdd noticeAdd) {
-        adminVodService.setSiteNotice(noticeAdd);
-        return WebResult.success();
-    }
-
     @Operation(summary = "视频分区", description = "N")
     @GetMapping(value = "/video_category", produces = MediaType.APPLICATION_JSON_VALUE)
     public String index() {

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/ContentController.java

@@ -3,7 +3,6 @@ package cn.reghao.tnb.content.app.vod.controller;
 import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.content.app.vod.model.vo.UserContentData;
-import cn.reghao.tnb.content.app.vod.service.AdminVodService;
 import cn.reghao.tnb.content.app.vod.service.ContentService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -24,21 +23,12 @@ public class ContentController {
     @DubboReference(check = false, retries = 0, timeout = 60_000)
     private AccountQuery accountQuery;
 
-    private final AdminVodService adminVodService;
     private final ContentService contentService;
 
-    public ContentController(AdminVodService adminVodService, ContentService contentService) {
-        this.adminVodService = adminVodService;
+    public ContentController(ContentService contentService) {
         this.contentService = contentService;
     }
 
-    @Operation(summary = "获取站点公告", description = "N")
-    @GetMapping("/site/notice")
-    public String getSiteNotice() {
-        String notice = adminVodService.getSiteNotice();
-        return WebResult.success(notice);
-    }
-
     @Operation(summary = "获取用户内容数据", description = "N")
     @GetMapping(value = "/userdata", produces = MediaType.APPLICATION_JSON_VALUE)
     public String getUserContentData(@RequestParam("userId") String userId) {

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/mapper/SiteNoticeMapper.java

@@ -1,14 +0,0 @@
-package cn.reghao.tnb.content.app.vod.db.mapper;
-
-import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.content.app.vod.model.po.SiteNotice;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author reghao
- * @date 2023-12-07 14:04:13
- */
-@Mapper
-public interface SiteNoticeMapper extends BaseMapper<SiteNotice> {
-    SiteNotice findLatest();
-}

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

@@ -1,17 +0,0 @@
-package cn.reghao.tnb.content.app.vod.model.dto;
-
-import lombok.Getter;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-
-/**
- * @author reghao
- * @date 2025-10-19 14:40:57
- */
-@Getter
-public class NoticeAdd {
-    @NotBlank
-    @Size(min = 1, max = 255, message = "站点公告内容不能超过 255 个字符")
-    private String content;
-}

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

@@ -1,25 +0,0 @@
-package cn.reghao.tnb.content.app.vod.model.po;
-
-import cn.reghao.jutil.jdk.web.db.BaseObject;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * @author reghao
- * @date 2023-12-07 14:03:51
- */
-@AllArgsConstructor
-@NoArgsConstructor
-@Getter
-public class SiteNotice extends BaseObject<Integer> {
-    @NotBlank
-    @Size(min = 1, max = 255, message = "站点公告内容不能超过 255 个字符")
-    private String content;
-    @NotNull
-    private Long createBy;
-}

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/AdminVodService.java

@@ -9,14 +9,10 @@ import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.common.util.StringUtil;
 import cn.reghao.tnb.content.api.constant.VideoStatus;
 import cn.reghao.tnb.content.api.dto.*;
-import cn.reghao.tnb.content.app.vod.db.mapper.SiteNoticeMapper;
 import cn.reghao.tnb.content.app.vod.db.mapper.VideoPostMapper;
 import cn.reghao.tnb.content.app.vod.db.repository.VideoRepository;
 import cn.reghao.tnb.content.app.vod.model.dto.CategoryAdd;
-import cn.reghao.tnb.content.app.vod.model.dto.NoticeAdd;
-import cn.reghao.tnb.content.app.vod.model.dto.SearchCriteria;
 import cn.reghao.tnb.content.app.vod.model.po.BannerVideo;
-import cn.reghao.tnb.content.app.vod.model.po.SiteNotice;
 import cn.reghao.tnb.content.app.vod.model.po.VideoFile;
 import cn.reghao.tnb.content.app.vod.model.po.VideoPost;
 import cn.reghao.tnb.content.app.vod.model.query.VideoQuery;
@@ -48,31 +44,18 @@ public class AdminVodService {
     private MessageService messageService;
 
     private RabbitTemplate rabbitTemplate;
-    private SiteNoticeMapper siteNoticeMapper;
     private VideoPostMapper videoPostMapper;
     private VideoRepository videoRepository;
     private CategoryService categoryService;
 
-    public AdminVodService(RabbitTemplate rabbitTemplate, SiteNoticeMapper siteNoticeMapper, VideoPostMapper videoPostMapper,
+    public AdminVodService(RabbitTemplate rabbitTemplate, VideoPostMapper videoPostMapper,
                            VideoRepository videoRepository, CategoryService categoryService) {
         this.rabbitTemplate = rabbitTemplate;
-        this.siteNoticeMapper = siteNoticeMapper;
         this.videoPostMapper = videoPostMapper;
         this.videoRepository = videoRepository;
         this.categoryService = categoryService;
     }
 
-    public void setSiteNotice(NoticeAdd noticeAdd) {
-        long createBy = 10001;
-        SiteNotice siteNotice = new SiteNotice(noticeAdd.getContent(), createBy);
-        siteNoticeMapper.save(siteNotice);
-    }
-
-    public String getSiteNotice() {
-        SiteNotice siteNotice = siteNoticeMapper.findLatest();
-        return siteNotice != null ? siteNotice.getContent() : "N/A";
-    }
-
     public PageList<AdminVideo> getUserVideoPosts(VideoSearch videoSearch) {
         PageList<AdminVideo> pageList = getVideoPosts(videoSearch);
         return pageList;
@@ -152,15 +135,11 @@ public class AdminVodService {
             return PageList.pageList(pageNumber, pageSize, total, list);
         }*/
         VideoQuery videoQuery = new VideoQuery.Builder()
-                .status(null)
-                .scope(null)
                 .orderBy(videoSearch.getOrderBy())
                 .orderDirection(videoSearch.getOrderDirection())
                 .build();
         if (title != null && !title.isEmpty()) {
             videoQuery = new VideoQuery.Builder()
-                    .status(null)
-                    .scope(null)
                     .title(title)
                     .orderBy(videoSearch.getOrderBy())
                     .orderDirection(videoSearch.getOrderDirection())
@@ -170,7 +149,6 @@ public class AdminVodService {
         if (videoSearch.getStatus() != null) {
             videoQuery = new VideoQuery.Builder()
                     .status(videoSearch.getStatus())
-                    .scope(null)
                     .orderBy(videoSearch.getOrderBy())
                     .orderDirection(videoSearch.getOrderDirection())
                     .build();

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/ContentService.java

@@ -2,6 +2,7 @@ package cn.reghao.tnb.content.app.vod.service;
 
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.api.constant.PostType;
+import cn.reghao.tnb.content.api.constant.VideoStatus;
 import cn.reghao.tnb.content.app.vod.db.mapper.PostAlbumMapper;
 import cn.reghao.tnb.content.app.vod.db.mapper.VideoPostMapper;
 import cn.reghao.tnb.content.app.vod.model.query.AlbumQuery;
@@ -32,10 +33,10 @@ public class ContentService {
         long owner = UserContext.getUserId();
         VideoQuery videoQuery;
         if (owner == userId) {
-            videoQuery = new VideoQuery.Builder().userId(userId).build();
+            videoQuery = new VideoQuery.Builder().status(VideoStatus.PUBLISHED.getCode()).userId(userId).build();
         } else {
             List<Integer> scopes = contentPermission.getUserScopes();
-            videoQuery = new VideoQuery.Builder().scope(scopes).userId(userId).build();
+            videoQuery = new VideoQuery.Builder().status(VideoStatus.PUBLISHED.getCode()).scope(scopes).userId(userId).build();
         }
         int videoCount = videoPostMapper.countByCriteria(videoQuery);
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/VideoPostQuery.java

@@ -76,6 +76,7 @@ public class VideoPostQuery {
         int pid = postCategory.getPid();
         if (pid == 0) {
             videoQuery = new VideoQuery.Builder()
+                    .status(VideoStatus.PUBLISHED.getCode())
                     .scope(scopes)
                     .categoryPid(categoryId)
                     .groupBy("publish_by")
@@ -84,6 +85,7 @@ public class VideoPostQuery {
                     .build();
         } else {
             videoQuery = new VideoQuery.Builder()
+                    .status(VideoStatus.PUBLISHED.getCode())
                     .scope(scopes)
                     .categoryId(categoryId)
                     .groupBy("publish_by")
@@ -154,10 +156,10 @@ public class VideoPostQuery {
         VideoQuery videoQuery;
         long loginUser = UserContext.getUserId();
         if (loginUser == userId) {
-            videoQuery = new VideoQuery.Builder().userId(userId).build();
+            videoQuery = new VideoQuery.Builder().status(VideoStatus.PUBLISHED.getCode()).userId(userId).build();
         } else {
             List<Integer> scopes = contentPermission.getUserScopes();
-            videoQuery = new VideoQuery.Builder().scope(scopes).userId(userId).build();
+            videoQuery = new VideoQuery.Builder().status(VideoStatus.PUBLISHED.getCode()).scope(scopes).userId(userId).build();
         }
 
         return getVideoCards(videoQuery, page, false);
@@ -287,7 +289,7 @@ public class VideoPostQuery {
         Page page1 = new Page(pageNumber, pageSize);
         long userId = UserContext.getUserId();
 
-        VideoQuery videoQuery = new VideoQuery.Builder().userId(userId).build();
+        VideoQuery videoQuery = new VideoQuery.Builder().status(VideoStatus.PUBLISHED.getCode()).userId(userId).build();
         int total = videoPostMapper.countByCriteria(videoQuery);
         List<UserVideoPost> list = videoPostMapper.findVideoPostByPage(page1, videoQuery).stream()
                 .map(this::getUserVideoPost)

content/content-service/src/main/resources/mapper/vod/SiteNoticeMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="cn.reghao.tnb.content.app.vod.db.mapper.SiteNoticeMapper">
-    <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into vod_site_notice
-        (`content`,`create_by`)
-        values 
-        (#{content},#{createBy})
-    </insert>
-
-    <select id="findLatest" resultType="cn.reghao.tnb.content.app.vod.model.po.SiteNotice">
-        select *
-        from vod_site_notice
-        order by id desc
-        limit 1
-    </select>
-</mapper>