فهرست منبع

ipad发送方式

xw 2 هفته پیش
والد
کامیت
13ae0797a6

+ 1 - 0
fs-ipad-task/src/main/java/com/fs/app/service/IpadSendServer.java

@@ -185,6 +185,7 @@ public class IpadSendServer {
     private void sendFile(BaseVo vo, QwSopCourseFinishTempSetting.Setting content) {
         FileVo fileVo = FileVo.builder()
                 .url(content.getFileUrl())
+                .fileName(content.getFileName())  // 传递文件名
                 .build();
         fileVo.setBase(vo);
         WxWorkResponseDTO<WxwSendCDNFileMsgRespDTO> resp = ipadSendUtils.sendFile(fileVo);

+ 1 - 0
fs-service/src/main/java/com/fs/course/service/impl/FsCourseFinishTempServiceImpl.java

@@ -174,6 +174,7 @@ public class FsCourseFinishTempServiceImpl implements IFsCourseFinishTempService
         fsCourseFinishTemp.setUpdateTime(DateUtils.getNowDate());
         //清理一下违禁词
         fsCourseFinishTemp.setSetting(JSON.toJSONString(processAndReplaceCrouseContent(fsCourseFinishTemp.getSetting())));
+        fsCourseFinishTemp.setChatSetting(JSON.toJSONString(processAndReplaceCrouseContent(fsCourseFinishTemp.getChatSetting())));
 
         return fsCourseFinishTempMapper.updateFsCourseFinishTemp(fsCourseFinishTemp);
     }

+ 5 - 1
fs-service/src/main/java/com/fs/ipad/IpadSendUtils.java

@@ -134,7 +134,11 @@ public class IpadSendUtils {
         dto.setAeskey(resp.getAes_key());
         dto.setMd5(resp.getMd5());
         dto.setFileSize(resp.getSize().longValue());
-        dto.setFile_name(vo.getUrl().substring(vo.getUrl().lastIndexOf('/') + 1));
+        // 优先使用传入的fileName,如果没有则从 URL 中截取
+        String fileName = (vo.getFileName() != null && !vo.getFileName().isEmpty()) 
+            ? vo.getFileName() 
+            : vo.getUrl().substring(vo.getUrl().lastIndexOf('/') + 1);
+        dto.setFile_name(fileName);
         dto.setUuid(vo.getUuid());
         dto.setSend_userid(userIds(vo));
         dto.setIsRoom(vo.isRoom());

+ 1 - 0
fs-service/src/main/java/com/fs/ipad/vo/FileVo.java

@@ -10,5 +10,6 @@ import lombok.EqualsAndHashCode;
 public class FileVo extends BaseVo {
 
     private String url;
+    private String fileName;  // 添加文件名字段
     private Integer voiceTime;
 }

+ 2 - 0
fs-service/src/main/java/com/fs/qw/vo/QwSopCourseFinishTempSetting.java

@@ -97,6 +97,8 @@ public class QwSopCourseFinishTempSetting implements Serializable,Cloneable{
         private String appLinkUrl;
         //文件地址
         private String fileUrl;
+        //文件名称
+        private String fileName;
         //视频地址
         private String videoUrl;
         //语音地址

+ 1 - 1
fs-service/src/main/resources/application-config-druid-bjczwh.yml

@@ -87,7 +87,7 @@ cloud_host:
   company_name: 北京存在文化
   projectCode: CZWH
   spaceName: czwh-2114522511
-  volcengineUrl: https://myhkvolcengine.ylrztop.com
+  volcengineUrl: https://bjczvolcengine.ylrztop.com
 headerImg:
   imgUrl:
 

+ 3 - 1
fs-service/src/main/resources/mapper/course/FsCourseFinishTempMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="name"    column="name"    />
         <result property="status"    column="status"    />
         <result property="setting"    column="setting"    />
+        <result property="chatSetting"    column="chat_setting"    />
         <result property="companyId"    column="company_id"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsCourseFinishTempVo">
-        select id, name, status, setting, company_id, create_by, create_time, course_id, video_id, company_user_ids, update_time, is_del from fs_course_finish_temp
+        select id, name, status, setting, chat_setting, company_id, create_by, create_time, course_id, video_id, company_user_ids, update_time, is_del from fs_course_finish_temp
     </sql>
 
     <select id="selectFsCourseFinishTempList" parameterType="FsCourseFinishTemp" resultMap="FsCourseFinishTempResult">
@@ -84,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null">name = #{name},</if>
             <if test="status != null">status = #{status},</if>
             <if test="setting != null">setting = #{setting},</if>
+            <if test="chatSetting != null">chat_setting = #{chatSetting},</if>
             <if test="companyId != null">company_id = #{companyId},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>