Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/course/mapper/FsVideoResourceMapper.java

@@ -22,6 +22,11 @@ public interface FsVideoResourceMapper extends BaseMapper<FsVideoResource> {
     @Select("select * from fs_video_resource where line1 is not null and is_transcode = 0 and is_del = 0")
     List<FsVideoResource> selectVideoNotTranscode();
 
+
+    @Select("select * from fs_video_resource where file_key = 'course/20251020/1760932918788.mp4'")
+    List<FsVideoResource> selectVideoNotTranscodeTest();
+
+
     @Select("select * from fs_video_resource where is_transcode = 1 and is_del = 0 and transcode_file_key is null")
     List<FsVideoResource> selectVideoIsTranscode();
 

fs-service/src/main/java/com/fs/qw/service/impl/QwUserComplainRecordServiceImpl.java

@@ -1,6 +1,8 @@
 package com.fs.qw.service.impl;
 
 import java.util.List;
+
+import com.alibaba.fastjson.JSON;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.course.domain.FsUserCourseComplaintRecord;
@@ -155,7 +157,7 @@ public class QwUserComplainRecordServiceImpl extends ServiceImpl<QwUserComplainR
         textCard.setUrl("https://www.baidu.com/");
         textCard.setBtntxt("详情");
         sendMsgParam.setTextcard(textCard);
-        log.info("发送投诉信息请求体：{}",sendMsgParam);
+        log.info("发送投诉信息请求体：{}", JSON.toJSONString(sendMsgParam));
         //发送消息
         QwSendMsgResult result = qwApiService.sendMsg(sendMsgParam, qwCompany.getCorpId());
         log.info("发送投诉应用消息返回：{}",result);

fs-service/src/main/resources/mapper/sop/QwSopMapper.xml

@@ -294,6 +294,7 @@
             <if test="data.autoGroup != null">auto_group,</if>
             <if test="data.autoGroupLevel != null">auto_group_level,</if>
             <if test="data.groupName != null">group_name,</if>
+            <if test="data.isFixed != null">is_fixed,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="data.name != null">#{data.name},</if>
@@ -326,6 +327,7 @@
             <if test="data.autoGroup != null">#{data.autoGroup},</if>
             <if test="data.autoGroupLevel != null">#{data.autoGroupLevel},</if>
             <if test="data.groupName != null">#{data.groupName},</if>
+            <if test="data.isFixed != null">#{data.isFixed},</if>
         </trim>
     </insert>
 
@@ -505,6 +507,7 @@
             <if test="data.autoGroup != null">auto_group = #{data.autoGroup},</if>
             <if test="data.autoGroupLevel != null">auto_group_level = #{data.autoGroupLevel},</if>
             <if test="data.groupName != null">group_name = #{data.groupName},</if>
+            <if test="data.isFixed != null">is_fixed = #{data.isFixed},</if>
         </trim>
         where id = #{data.id}
     </update>