删除 VideoFile 的 videoFileId 字段

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

@@ -14,9 +14,9 @@ import java.util.List;
  */
 @Mapper
 public interface VideoFileMapper extends BaseMapper<VideoFile> {
-    void deleteByVideoFileId(String videoFileId);
+    void updateDeleteByObjectId(String objectId);
 
     List<VideoUrlDto> findVideoUrls(String videoId);
-    VideoFile findByVideoFileId(String videoFileId);
-    List<VideoInfo> findVideoInfo(String videoFileId);
+    VideoFile findByVideoFileId(String objectId);
+    List<VideoInfo> findVideoInfo(String objectId);
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/repository/VideoRepository.java

@@ -74,7 +74,7 @@ public class VideoRepository {
 
     @Transactional(rollbackFor = Exception.class)
     public void deleteVideoFile0(String videoFileId) {
-        videoFileMapper.deleteByVideoFileId(videoFileId);
+        videoFileMapper.updateDeleteByObjectId(videoFileId);
     }
 
     public List<VideoInfo> getVideoInfos(String videoFileId) {

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

@@ -17,8 +17,6 @@ import lombok.Setter;
 @Getter
 public class VideoFile extends BaseObject<Integer> {
     private String videoId;
-    // 原始文件的 objectId
-    //private String videoFileId;
     private String objectId;
     private Integer channelCode;
     private String videoCodec;

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

@@ -4,38 +4,38 @@
 <mapper namespace="cn.reghao.tnb.content.app.vod.db.mapper.VideoFileMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into vod_video_file
-        (`video_id`,`video_file_id`,`object_id`,`channel_code`,`video_codec`,`vbit_rate`,`audio_codec`,`abit_rate`,`format_name`,`url_type`,`url`,`quality`,`width`,`height`,`horizontal`,`duration`)
+        (`video_id`,`object_id`,`channel_code`,`video_codec`,`vbit_rate`,`audio_codec`,`abit_rate`,`format_name`,`url_type`,`url`,`quality`,`width`,`height`,`horizontal`,`duration`)
         values
-        (#{videoId},#{videoFileId},#{objectId},#{channelCode},#{videoCodec},#{vbitRate},#{audioCodec},#{abitRate},#{formatName},#{urlType},#{url},#{quality},#{width},#{height},#{horizontal},#{duration})
+        (#{videoId},#{objectId},#{channelCode},#{videoCodec},#{vbitRate},#{audioCodec},#{abitRate},#{formatName},#{urlType},#{url},#{quality},#{width},#{height},#{horizontal},#{duration})
     </insert>
     <insert id="saveAll" useGeneratedKeys="true" keyProperty="id">
         insert into vod_video_file
-        (`video_id`,`video_file_id`,`object_id`,`channel_code`,`video_codec`,`vbit_rate`,`audio_codec`,`abit_rate`,`format_name`,`url_type`,`url`,`quality`,`width`,`height`,`horizontal`,`duration`)
+        (`video_id`,`object_id`,`channel_code`,`video_codec`,`vbit_rate`,`audio_codec`,`abit_rate`,`format_name`,`url_type`,`url`,`quality`,`width`,`height`,`horizontal`,`duration`)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.videoId},#{item.videoFileId},#{item.objectId},#{item.channelCode},#{item.videoCodec},#{item.vbitRate},#{item.audioCodec},#{item.abitRate},#{item.formatName},#{item.urlType},#{item.url},#{item.quality},#{item.width},#{item.height},#{item.horizontal},#{item.duration})
+            (#{item.videoId},#{item.objectId},#{item.channelCode},#{item.videoCodec},#{item.vbitRate},#{item.audioCodec},#{item.abitRate},#{item.formatName},#{item.urlType},#{item.url},#{item.quality},#{item.width},#{item.height},#{item.horizontal},#{item.duration})
         </foreach>
     </insert>
 
-    <delete id="deleteByVideoFileId">
+    <update id="updateDeleteByObjectId">
         update vod_video_file
         set deleted=1
-        where object_id=#{videoFileId}
-    </delete>
+        where object_id=#{objectId}
+    </update>
 
     <select id="findAll" resultType="cn.reghao.tnb.content.app.vod.model.po.VideoFile">
         select *
         from vod_video_file
     </select>
     <select id="findVideoInfo" resultType="cn.reghao.oss.sdk.model.dto.media.VideoInfo">
-        select video_file_id,duration,horizontal,quality,video_codec,audio_codec,url_type,url
+        select object_id,duration,horizontal,quality,video_codec,audio_codec,url_type,url
         from vod_video_file
-        where `deleted`=0 and object_id=#{videoFileId}
+        where `deleted`=0 and object_id=#{objectId}
     </select>
     <select id="findByVideoFileId" resultType="cn.reghao.tnb.content.app.vod.model.po.VideoFile">
         select *
         from vod_video_file
-        where `deleted`=0 and object_id=#{videoFileId}
+        where `deleted`=0 and object_id=#{objectId}
     </select>
     <select id="findVideoUrls" resultType="cn.reghao.oss.sdk.model.dto.media.VideoUrlDto">
         select object_id,channel_code,url_type as type,url,width,height,quality