修改完课模板

fs-company/src/main/java/com/fs/company/controller/course/FsCourseFinishTempParentController.java

@@ -2,6 +2,7 @@ package com.fs.company.controller.course;
 
 import java.util.List;
 
+import com.fs.common.annotation.RepeatSubmit;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.security.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,7 +26,7 @@ import com.fs.common.core.page.TableDataInfo;
 
 /**
  * 完课模板Controller
- * 
+ *
  * @author 吴树波
  * @date 2025-05-22
  */

fs-company/src/main/resources/application.yml

@@ -7,9 +7,9 @@ spring:
 #    active: dev
 #    active: druid-jzzx-test
 #    active: druid-hdt
-    active: dev
+#    active: dev
 #    active: druid-yzt
 #    active: druid-myhk
 #    active: druid-sft
 #    active: dev-yjb
-#    active: druid-myhk-test
+    active: druid-syysy-test

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -20,6 +20,7 @@ import com.fs.course.config.CourseConfig;
 import com.fs.course.domain.*;
 import com.fs.course.mapper.*;
 import com.fs.course.param.FsCourseLinkCreateParam;
+import com.fs.course.service.IFsCourseFinishTempService;
 import com.fs.course.service.IFsCourseLinkService;
 import com.fs.course.service.IFsUserCourseService;
 import com.fs.qw.domain.*;
@@ -149,6 +150,9 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
     @Autowired
     private CloudHostProper cloudHostProper;
 
+    @Autowired
+    IFsCourseFinishTempService fsCourseFinishTempService;
+
     // Blocking queues with bounded capacity to implement backpressure
     private final BlockingQueue<QwSopLogs> qwSopLogsQueue = new LinkedBlockingQueue<>(20000);
     private final BlockingQueue<FsCourseWatchLog> watchLogsQueue = new LinkedBlockingQueue<>(20000);
@@ -1918,7 +1922,15 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
                 }
 
                 // 查询完课模板信息
-                FsCourseFinishTemp finishTemp = fsCourseFinishTempMapper.selectFsCourseFinishTempByCompanyId(finishLog.getCompanyUserId(),finishLog.getCompanyId(), finishLog.getVideoId());
+//                FsCourseFinishTemp finishTemp = fsCourseFinishTempMapper.selectFsCourseFinishTempByCompanyId(finishLog.getCompanyUserId(),finishLog.getCompanyId(), finishLog.getVideoId());
+
+                FsCourseFinishTemp finishTemp = null;
+                try {
+                    finishTemp = fsCourseFinishTempService.getFsCourseFinishTempSop(finishLog.getQwUserId(), finishLog.getCompanyId(), finishLog.getVideoId(), finishLog.getCompanyUserId());
+                } catch (Exception e) {
+                    log.error("完课模板-出错：" + e);
+                    continue;
+                }
 
                 // 设置 finishLog 为已发送状态，并加入批量更新列表
                 finishLog.setSendFinishMsg(1);

fs-service/src/main/java/com/fs/company/service/ICompanyUserService.java

@@ -151,6 +151,8 @@ public interface ICompanyUserService {
 
     List<Long> selectUserAllCompanyUserId(Long companyUserId);
 
+    CompanyUser selectCompanyUserByCompanyUserId(Long companyUserId);
+
     List<CompanyUser> getAllUserListLimit(Long companyId, String keywords);
 
     List<CompanyUser> selectAllCompanyUserAndSelf(Long userId);

fs-service/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -749,6 +749,12 @@ public class CompanyUserServiceImpl implements ICompanyUserService
         return companyUserMapper.selectUserAllCompanyUserId(companyUserId);
     }
 
+    @Override
+    public CompanyUser selectCompanyUserByCompanyUserId(Long companyUserId)
+    {
+        return companyUserMapper.selectCompanyUserByCompanyUserId(companyUserId);
+    }
+
     @Override
     public List<CompanyUser> getAllUserListLimit(Long companyId, String keywords) {
         return companyUserMapper.getAllUserListLimit(companyId,keywords);

fs-service/src/main/java/com/fs/course/domain/FsCourseFinishTemp.java

@@ -57,4 +57,9 @@ public class FsCourseFinishTemp extends BaseEntity
 
     @Excel(name = "全选销售标志")
     private Integer isAllCompanyUser;
+
+    /**
+     * 部门ids，逗号分隔的部门id(对多)
+     */
+    private String deptIds;
 }

fs-service/src/main/java/com/fs/course/domain/FsCourseFinishTempParent.java

@@ -45,4 +45,10 @@ public class FsCourseFinishTempParent extends BaseEntity{
     private String companyUserIds;
     @TableField(exist = false)
     private Integer isAllCompanyUser;
+
+    /**
+     * 部门ids，逗号分隔的部门id(对多)
+     */
+    @TableField(exist = false)
+    private String deptIds;
 }

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

@@ -94,6 +94,11 @@ public interface FsCourseFinishTempMapper
             "and find_in_set(#{userId},company_user_ids) and is_del= 0 AND status= 1 order by create_time desc  limit 1 ")
     FsCourseFinishTemp selectFsCourseFinishTempByCompanyUserId(@Param("userId") Long companyUserId, @Param("videoId")Long videoId);
 
+    @Select("select * from fs_course_finish_temp where video_id = #{videoId} " +
+            "and find_in_set(#{userId},company_user_ids) and company_id = #{companyId} and is_del= 0  AND status= 1 order by create_time desc  limit 1 ")
+    FsCourseFinishTemp selectFsCourseFinishTempByCompanyUserIdAndCompanyId(@Param("userId") Long companyUserId, @Param("videoId")Long videoId,@Param("companyId")Long companyId);
+
+
     @Select("    SELECT *\n" +
             "    FROM fs_course_finish_temp\n" +
             "    WHERE video_id = #{videoId}\n" +
@@ -111,4 +116,13 @@ public interface FsCourseFinishTempMapper
     public FsCourseFinishTempVO selectFsCourseFinishTempByIdVO(Long id);
 
     void deleteByParentIds(@Param("ids") Long[] ids);
+
+    @Select("  select * from fs_course_finish_temp where FIND_IN_SET(#{deptId},dept_ids) and video_id = #{videoId} and is_del= 0  AND status= 1 " +
+            " order by COALESCE(update_time, create_time) desc  limit 1")
+    FsCourseFinishTemp selectFsCourseFinishTempByDeptId(@Param("deptId") Long deptId,@Param("videoId") Long videoId);
+
+    @Select(" select * from fs_course_finish_temp where is_del= 0  AND status= 1 and video_id = #{videoId} " +
+            " and (is_all_company_user = 1 AND company_id = #{companyId}) " +
+            " order by COALESCE(update_time, create_time) desc  limit 1")
+    FsCourseFinishTemp selectAllCompanyFsCourseFinishTempByCompanyId(@Param("companyId") Long companyId, @Param("videoId") Long videoId);
 }

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

@@ -3,17 +3,20 @@ package com.fs.course.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.course.domain.FsCourseFinishTempParent;
+import com.fs.course.vo.FsCourseFinishTempParentVO;
+import com.fs.course.vo.FsCourseFinishTempVO;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 完课模板Mapper接口
- * 
+ *
  * @author 吴树波
  * @date 2025-05-22
  */
 public interface FsCourseFinishTempParentMapper extends BaseMapper<FsCourseFinishTempParent>{
     /**
      * 查询完课模板
-     * 
+     *
      * @param id 完课模板主键
      * @return 完课模板
      */
@@ -21,7 +24,7 @@ public interface FsCourseFinishTempParentMapper extends BaseMapper<FsCourseFinis
 
     /**
      * 查询完课模板列表
-     * 
+     *
      * @param fsCourseFinishTempParent 完课模板
      * @return 完课模板集合
      */
@@ -29,7 +32,7 @@ public interface FsCourseFinishTempParentMapper extends BaseMapper<FsCourseFinis
 
     /**
      * 新增完课模板
-     * 
+     *
      * @param fsCourseFinishTempParent 完课模板
      * @return 结果
      */
@@ -37,7 +40,7 @@ public interface FsCourseFinishTempParentMapper extends BaseMapper<FsCourseFinis
 
     /**
      * 修改完课模板
-     * 
+     *
      * @param fsCourseFinishTempParent 完课模板
      * @return 结果
      */
@@ -45,7 +48,7 @@ public interface FsCourseFinishTempParentMapper extends BaseMapper<FsCourseFinis
 
     /**
      * 删除完课模板
-     * 
+     *
      * @param id 完课模板主键
      * @return 结果
      */
@@ -53,7 +56,7 @@ public interface FsCourseFinishTempParentMapper extends BaseMapper<FsCourseFinis
 
     /**
      * 批量删除完课模板
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

fs-service/src/main/java/com/fs/course/service/IFsCourseFinishTempParentService.java

@@ -3,17 +3,19 @@ package com.fs.course.service;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.course.domain.FsCourseFinishTempParent;
+import com.fs.course.vo.FsCourseFinishTempParentVO;
+import com.fs.course.vo.FsCourseFinishTempVO;
 
 /**
  * 完课模板Service接口
- * 
+ *
  * @author 吴树波
  * @date 2025-05-22
  */
 public interface IFsCourseFinishTempParentService extends IService<FsCourseFinishTempParent>{
     /**
      * 查询完课模板
-     * 
+     *
      * @param id 完课模板主键
      * @return 完课模板
      */
@@ -21,7 +23,7 @@ public interface IFsCourseFinishTempParentService extends IService<FsCourseFinis
 
     /**
      * 查询完课模板列表
-     * 
+     *
      * @param fsCourseFinishTempParent 完课模板
      * @return 完课模板集合
      */
@@ -29,7 +31,7 @@ public interface IFsCourseFinishTempParentService extends IService<FsCourseFinis
 
     /**
      * 新增完课模板
-     * 
+     *
      * @param fsCourseFinishTempParent 完课模板
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface IFsCourseFinishTempParentService extends IService<FsCourseFinis
 
     /**
      * 修改完课模板
-     * 
+     *
      * @param fsCourseFinishTempParent 完课模板
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface IFsCourseFinishTempParentService extends IService<FsCourseFinis
 
     /**
      * 批量删除完课模板
-     * 
+     *
      * @param ids 需要删除的完课模板主键集合
      * @return 结果
      */
@@ -53,7 +55,7 @@ public interface IFsCourseFinishTempParentService extends IService<FsCourseFinis
 
     /**
      * 删除完课模板信息
-     * 
+     *
      * @param id 完课模板主键
      * @return 结果
      */

fs-service/src/main/java/com/fs/course/service/IFsCourseFinishTempService.java

@@ -77,4 +77,14 @@ public interface IFsCourseFinishTempService
      * 完课用户打备注
      */
     public void finishCourseExtContactIdByRemark(FsCourseWatchLog watchLog);
+
+    /**
+     * 根据配置顺序决定完课模板 单选客服>选部门>全选
+     * @param companyUserId
+     * @param companyId
+     * @param videoId
+     * @param userId
+     * @return
+     */
+    FsCourseFinishTemp getFsCourseFinishTempSop(Long companyUserId, Long companyId, Long videoId, Long userId);
 }

fs-service/src/main/java/com/fs/course/service/impl/FsCourseFinishTempParentServiceImpl.java

@@ -1,16 +1,23 @@
 package com.fs.course.service.impl;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fs.common.utils.StringUtils;
 import com.fs.course.domain.FsCourseFinishTemp;
 import com.fs.course.domain.FsUserCourse;
 import com.fs.course.domain.FsUserCourseVideo;
 import com.fs.course.service.IFsCourseFinishTempService;
 import com.fs.course.service.IFsUserCourseService;
 import com.fs.course.service.IFsUserCourseVideoService;
+import com.fs.course.vo.FsCourseFinishTempParentVO;
+import com.fs.course.vo.FsCourseFinishTempVO;
+import com.fs.qw.mapper.QwUserMapper;
+import com.fs.qw.vo.QwUserVO;
+import com.fs.voice.utils.StringUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,6 +39,12 @@ public class FsCourseFinishTempParentServiceImpl extends ServiceImpl<FsCourseFin
     private final IFsUserCourseVideoService fsUserCourseVideoService;
     private final IFsCourseFinishTempService fsCourseFinishTempService;
 
+    @Autowired
+    private  FsCourseFinishTempParentMapper fsCourseFinishTempParentMapper;
+
+    @Autowired
+    private QwUserMapper qwUserMapper;
+
     /**
      * 查询完课模板
      *
@@ -44,6 +57,7 @@ public class FsCourseFinishTempParentServiceImpl extends ServiceImpl<FsCourseFin
         return baseMapper.selectFsCourseFinishTempParentById(id);
     }
 
+
     /**
      * 查询完课模板列表
      *
@@ -80,6 +94,7 @@ public class FsCourseFinishTempParentServiceImpl extends ServiceImpl<FsCourseFin
             temp.setCourseId(e.getCourseId());
             temp.setVideoId(e.getVideoId());
             temp.setCompanyUserIds(fsCourseFinishTempParent.getCompanyUserIds());
+            temp.setDeptIds(fsCourseFinishTempParent.getDeptIds());
             temp.setIsAllCompanyUser(fsCourseFinishTempParent.getIsAllCompanyUser());
             temp.setParentId(fsCourseFinishTempParent.getId());
             fsCourseFinishTempService.insertFsCourseFinishTemp(temp);

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

@@ -3,7 +3,10 @@ package com.fs.course.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.fs.common.utils.DateUtils;
+import com.fs.common.utils.StringUtils;
+import com.fs.company.domain.CompanyUser;
 import com.fs.company.mapper.CompanyUserMapper;
+import com.fs.company.service.impl.CompanyUserServiceImpl;
 import com.fs.course.domain.FsCourseFinishTemp;
 import com.fs.course.domain.FsCourseWatchLog;
 import com.fs.course.mapper.FsCourseFinishTempMapper;
@@ -37,6 +40,7 @@ import java.util.*;
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * 完课模板Service业务层处理
@@ -73,6 +77,9 @@ public class FsCourseFinishTempServiceImpl implements IFsCourseFinishTempService
     @Autowired
     private IQwCourseFinishRemarkRtyService finishRemarkRtyService;
 
+    @Autowired
+    private CompanyUserServiceImpl companyUserServiceImpl;
+
     /**
      * 查询完课模板
      *
@@ -87,13 +94,27 @@ public class FsCourseFinishTempServiceImpl implements IFsCourseFinishTempService
 
     @Override
     public FsCourseFinishTempVO selectFsCourseFinishTempByIdVO(Long id) {
+
         FsCourseFinishTempVO fsCourseFinishTemp = fsCourseFinishTempMapper.selectFsCourseFinishTempByIdVO(id);
+        //处理部门ids
+        if (null != fsCourseFinishTemp) {
+            String deptIds = fsCourseFinishTemp.getDeptIds();
+            if (StringUtils.isNotBlank(deptIds)) {
+                List<Integer> collect = Arrays.stream(deptIds.split(",")).mapToInt(Integer::parseInt).boxed().collect(Collectors.toList());
+                fsCourseFinishTemp.setDeptArrs(collect);
+            }
+        }
 
         String companyUserIds = fsCourseFinishTemp.getCompanyUserIds();
-        List<String> qwUserIdsList = Arrays.asList(companyUserIds.split(","));
 
-        List<QwUserVO> qwUserByIds = qwUserMapper.getQwUserByIdsNoCropId(qwUserIdsList);
-        fsCourseFinishTemp.setUserSelectList(qwUserByIds);
+        if (!StringUtil.strIsNullOrEmpty(companyUserIds)) {
+            List<String> qwUserIdsList = Arrays.asList(companyUserIds.split(","));
+
+            List<QwUserVO> qwUserByIds = qwUserMapper.getQwUserByIdsNoCropId(qwUserIdsList);
+
+            fsCourseFinishTemp.setUserSelectList(qwUserByIds);
+
+        }
 
         return fsCourseFinishTemp;
     }
@@ -385,6 +406,32 @@ public class FsCourseFinishTempServiceImpl implements IFsCourseFinishTempService
 
     }
 
+    @Override
+    public FsCourseFinishTemp getFsCourseFinishTempSop(Long companyUserId, Long companyId, Long videoId, Long userId) {
+
+        FsCourseFinishTemp userTemp = fsCourseFinishTempMapper.selectFsCourseFinishTempByCompanyUserIdAndCompanyId(companyUserId, videoId,companyId);
+        if (userTemp != null) {
+            return userTemp;
+        }
+
+        //获取用户部门id userId
+        CompanyUser companyUser = companyUserServiceImpl.selectCompanyUserByCompanyUserId(userId);
+        Long deptId = companyUser.getDeptId();
+
+
+        FsCourseFinishTemp deptTemp = fsCourseFinishTempMapper.selectFsCourseFinishTempByDeptId(deptId, videoId);
+        if(null != deptTemp){
+            return deptTemp;
+        }
+
+        FsCourseFinishTemp companyTemp = fsCourseFinishTempMapper.selectAllCompanyFsCourseFinishTempByCompanyId(companyId, videoId);
+        if(null != companyTemp){
+            return companyTemp;
+        }
+
+        return null;
+    }
+
 //    @Override
 //    public void updateFsCourseFinishTempByCompanyUserId() {
 //        List<FsCourseFinishTemp> fsCourseFinishTemps = fsCourseFinishTempMapper.selectFsCourseFinishTempByCompanyList();

fs-service/src/main/java/com/fs/course/vo/FsCourseFinishTempParentVO.java

@@ -0,0 +1,64 @@
+package com.fs.course.vo;
+
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import com.fs.qw.vo.QwUserVO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FsCourseFinishTempParentVO  extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 模板名称 */
+    @Excel(name = "模板名称")
+    private String name;
+
+    /** 状态 1正常 0停用 */
+    @Excel(name = "状态 1正常 0停用")
+    private Long status;
+
+    /** 规则 */
+    @Excel(name = "规则")
+    private String setting;
+
+    /** 公司id */
+    @Excel(name = "公司id")
+    private Long companyId;
+
+    /** 课程id */
+    @Excel(name = "课程id")
+    private Long courseId;
+
+    /** 小节视频id */
+    @Excel(name = "小节视频id")
+    private Long videoId;
+
+    /** 归属客服id(对多) */
+    @Excel(name = "归属客服id(对多)")
+    private String companyUserIds;
+
+    /** 删除标志 */
+    @Excel(name = "删除标志")
+    private Long isDel;
+
+    /** 是否整客服公司可用 */
+    @Excel(name = "是否整客服公司可用")
+    private Integer isAllCompanyUser;
+
+    public List<QwUserVO> userSelectList;
+
+    /**
+     * 部门ids，逗号分隔的部门id(对多)
+     */
+    private String deptIds;
+
+    /**
+     * 存放部门idList
+     */
+    private List<Integer> deptArrs;
+}

fs-service/src/main/java/com/fs/course/vo/FsCourseFinishTempVO.java

@@ -54,4 +54,14 @@ public class FsCourseFinishTempVO extends BaseEntity {
     private String chatSetting;
 
     public List<QwUserVO> userSelectList;
+
+    /**
+     * 部门ids，逗号分隔的部门id(对多)
+     */
+    private String deptIds;
+
+    /**
+     * 存放部门idList
+     */
+    private List<Integer> deptArrs;
 }

fs-service/src/main/resources/mapper/company/CompanyUserMapper.xml

@@ -539,9 +539,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.userId}
         </foreach>
     </update>
+
     <select id="selectCompanyUserByCompanyUserId" resultMap="CompanyUserResult">
         select  * from company_user where user_id = #{companyUserId}
     </select>
+
     <select id="selectCompanyByIpadStatus" resultType="com.fs.company.vo.QwIpadTotalVo">
         select company_id companyId,company_name companyName,
         sum(bind_count) bindCount,stat_time statTime from qw_ipad_total

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

@@ -20,7 +20,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, company_id, create_by, create_time, course_id, video_id, company_user_ids,parent_id, update_time, is_del,is_all_company_user from fs_course_finish_temp
     </sql>
 
     <select id="selectFsCourseFinishTempList" parameterType="FsCourseFinishTemp" resultMap="FsCourseFinishTempResult">
@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="videoId != null "> and video_id = #{videoId}</if>
             <if test="companyUserIds != null  and companyUserIds != ''"> and company_user_ids = #{companyUserIds}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
+            <if test="isAllCompanyUser != null "> and is_all_company_user = #{isAllCompanyUser}</if>
         </where>
     </select>
 
@@ -59,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chatSetting != null">chat_setting,</if>
             <if test="parentId != null">parent_id,</if>
             <if test="isAllCompanyUser != null">is_all_company_user,</if>
+            <if test="deptIds != null">dept_ids,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
@@ -75,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chatSetting != null">#{chatSetting},</if>
             <if test="parentId != null">#{parentId},</if>
             <if test="isAllCompanyUser != null">#{isAllCompanyUser},</if>
+            <if test="deptIds != null">#{deptIds},</if>
          </trim>
     </insert>
 
@@ -93,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isAllCompanyUser != null">is_all_company_user = #{isAllCompanyUser},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="deptIds != null">dept_ids = #{deptIds},</if>
         </trim>
         where id = #{id}
     </update>