content-service 修改 PostCategory 和 VideoTag 的 mapper 名字

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/mapper/VideoCategoryMapper.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/mapper/PostCategoryMapper.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @date 2021-11-22 10:41:35
  */
 @Mapper
-public interface VideoCategoryMapper extends BaseMapper<PostCategory> {
+public interface PostCategoryMapper extends BaseMapper<PostCategory> {
     @Deprecated
     List<BiliRegion> findAllCategoryIds();
     @Deprecated

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/mapper/VideoPostTagMapper.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/mapper/VideoTagMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2023-05-11 15:21:31
  */
 @Mapper
-public interface VideoPostTagMapper extends BaseMapper<VideoTag> {
+public interface VideoTagMapper extends BaseMapper<VideoTag> {
     void updateSetScope(@Param("videoId") String videoId, @Param("scope") int scope);
 
     int countVideosByTag(@Param("tagId") String tagId, @Param("scopes") List<Integer> scopes);

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

@@ -4,7 +4,7 @@ import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.vod.db.mapper.PostTagMapper;
-import cn.reghao.tnb.content.app.vod.db.mapper.VideoPostTagMapper;
+import cn.reghao.tnb.content.app.vod.db.mapper.VideoTagMapper;
 import cn.reghao.tnb.content.app.vod.model.po.PostTag;
 import cn.reghao.tnb.content.app.vod.model.po.VideoTag;
 import org.springframework.stereotype.Service;
@@ -23,13 +23,13 @@ import java.util.UUID;
 public class TagService {
     private final int pageSize = 12;
     private final PostTagMapper postTagMapper;
-    private final VideoPostTagMapper videoPostTagMapper;
+    private final VideoTagMapper videoTagMapper;
     private final ContentPermission contentPermission;
 
-    public TagService(PostTagMapper postTagMapper, VideoPostTagMapper videoPostTagMapper,
+    public TagService(PostTagMapper postTagMapper, VideoTagMapper videoTagMapper,
                       ContentPermission contentPermission) {
         this.postTagMapper = postTagMapper;
-        this.videoPostTagMapper = videoPostTagMapper;
+        this.videoTagMapper = videoTagMapper;
         this.contentPermission = contentPermission;
     }
 
@@ -58,12 +58,12 @@ public class TagService {
         }
 
         if (!list1.isEmpty()) {
-            videoPostTagMapper.saveAll(list1);
+            videoTagMapper.saveAll(list1);
         }
     }
 
     public List<String> getVideoTagNames(String videoId) {
-        List<String> tagNames = videoPostTagMapper.findVideoTags(videoId);
+        List<String> tagNames = videoTagMapper.findVideoTags(videoId);
         return tagNames;
     }
 
@@ -77,9 +77,9 @@ public class TagService {
         }
         String tagId = postTag.getTagId();
 
-        int total = videoPostTagMapper.countVideosByTag(tagId, userScopes);
+        int total = videoTagMapper.countVideosByTag(tagId, userScopes);
         Page page = new Page(pageNumber, pageSize);
-        List<String> videoIds = videoPostTagMapper.findVideosByPage(page, tagId, userScopes);
+        List<String> videoIds = videoTagMapper.findVideosByPage(page, tagId, userScopes);
         return PageList.pageList(pageNumber, pageSize, total, videoIds);
     }
 }

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

@@ -3,7 +3,7 @@ package cn.reghao.tnb.content.app.vod.service.impl;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.tnb.content.api.dto.VideoRegion;
-import cn.reghao.tnb.content.app.vod.db.mapper.VideoCategoryMapper;
+import cn.reghao.tnb.content.app.vod.db.mapper.PostCategoryMapper;
 import cn.reghao.tnb.content.app.vod.db.mapper.VideoCategoryPostMapper;
 import cn.reghao.tnb.content.app.vod.model.dto.CategoryAdd;
 import cn.reghao.tnb.content.app.vod.model.po.PostCategory;
@@ -24,13 +24,13 @@ import java.util.stream.Collectors;
  */
 @Service
 public class CategoryServiceImpl implements CategoryService {
-    private final VideoCategoryMapper videoCategoryMapper;
+    private final PostCategoryMapper postCategoryMapper;
     private final RedisStringObject redisStringObject;
     private final VideoCategoryPostMapper videoCategoryPostMapper;
 
-    public CategoryServiceImpl(VideoCategoryMapper videoCategoryMapper, RedisStringObject redisStringObject,
+    public CategoryServiceImpl(PostCategoryMapper postCategoryMapper, RedisStringObject redisStringObject,
                                VideoCategoryPostMapper videoCategoryPostMapper) {
-        this.videoCategoryMapper = videoCategoryMapper;
+        this.postCategoryMapper = postCategoryMapper;
         this.redisStringObject = redisStringObject;
         this.videoCategoryPostMapper = videoCategoryPostMapper;
     }
@@ -74,21 +74,21 @@ public class CategoryServiceImpl implements CategoryService {
         int pageNumber = 1;
         int pageSize = 1000;
         Page page = new Page(pageNumber, pageSize);
-        List<PostCategory> list = videoCategoryMapper.findVideoCategoryByPage(page, categoryQuery);
+        List<PostCategory> list = postCategoryMapper.findVideoCategoryByPage(page, categoryQuery);
         if (list.isEmpty()) {
             initVideoCategory();
         }
 
-        return videoCategoryMapper.findVideoCategoryByPage(page, categoryQuery);
+        return postCategoryMapper.findVideoCategoryByPage(page, categoryQuery);
     }
 
     private void initVideoCategory() {
         PostCategory postCategory1 = new PostCategory(0, "大杂烩");
-        videoCategoryMapper.save(postCategory1);
+        postCategoryMapper.save(postCategory1);
 
         int pid = postCategory1.getId();
         PostCategory postCategory2 = new PostCategory(pid, "杂");
-        videoCategoryMapper.save(postCategory2);
+        postCategoryMapper.save(postCategory2);
     }
 
     private void setVideoCategory(List<PostCategory> list) {
@@ -115,7 +115,7 @@ public class CategoryServiceImpl implements CategoryService {
     public void addVideoCategory(CategoryAdd categoryAdd) {
         PostCategory postCategory1 = new PostCategory(categoryAdd);
         List<PostCategory> list = List.of(postCategory1);
-        videoCategoryMapper.saveAll(list);
+        postCategoryMapper.saveAll(list);
     }
 
     @Override

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

@@ -1,7 +1,7 @@
 <?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.VideoCategoryMapper">
+<mapper namespace="cn.reghao.tnb.content.app.vod.db.mapper.PostCategoryMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into vod_post_category
         (`pid`,`name`,`region_id`,`icon`,`sort`,`vip`)

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

@@ -1,7 +1,7 @@
 <?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.VideoPostTagMapper">
+<mapper namespace="cn.reghao.tnb.content.app.vod.db.mapper.VideoTagMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into vod_video_tag
         (`video_id`,`scope`,`tag_id`)

content/content-service/src/test/java/cn/reghao/tnb/content/app/vod/service/VideoPostTest.java

@@ -48,7 +48,7 @@ public class VideoPostTest {
     @Autowired
     VideoStatisticMapper videoStatisticMapper;
     @Autowired
-    VideoCategoryMapper videoCategoryMapper;
+    PostCategoryMapper postCategoryMapper;
     @Autowired
     VideoPostService videoPostService;
 
@@ -97,7 +97,7 @@ public class VideoPostTest {
     }
 
     @Autowired
-    VideoPostTagMapper videoPostTagMapper;
+    VideoTagMapper videoTagMapper;
     @Autowired
     UserInterestBased userInterestBased;
     @Test
@@ -380,7 +380,7 @@ public class VideoPostTest {
             }
         }
 
-        videoPostTagMapper.saveAll(list);
+        videoTagMapper.saveAll(list);
         System.out.println(sb.toString());
     }
 
@@ -433,6 +433,6 @@ public class VideoPostTest {
         PostCategory postCategory2 = new PostCategory(1, "bili");
 
         List<PostCategory> list = List.of(postCategory1, postCategory2);
-        videoCategoryMapper.saveAll(list);
+        postCategoryMapper.saveAll(list);
     }
 }