Merge remote-tracking branch 'origin/企微聊天' into 企微聊天

fs-company/src/main/java/com/fs/FsCompanyApplication.java

@@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 @EnableTransactionManagement
-@EnableAsync
+//@EnableAsync
 public class FsCompanyApplication
 {
     public static void main(String[] args)

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

@@ -128,4 +128,9 @@ public class FsUserCourseVideo extends BaseEntity
     private String jobId;
 
     private String vid;
+
+    /**
+     * 0横屏 1竖屏(默认0)
+     */
+    private Integer screenType;
 }

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

@@ -104,4 +104,9 @@ public class FsVideoResource {
     private String hsyVid;
 
     private String jobId;
+
+    /**
+     * 0横屏 1竖屏(默认0)
+     */
+    private Integer screenType;
 }

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

@@ -3198,6 +3198,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
             entity.setFileKey(e.getFileKey());
             entity.setIsTranscode(0);
             entity.setProjectId(vo.getProjectId());
+            entity.setScreenType(e.getScreenType());
             return entity;
         }).collect(Collectors.toList());
         fsUserCourseVideoMapper.insertBatchFsUserCourseVideo(collect);

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

@@ -66,4 +66,9 @@ public class FsUserCourseVideoH5DVO extends BaseEntity
      */
     private List<FsPackageAndTypeListVO> treatmentPackage;
 
+    /**
+     * 0横屏 1竖屏(默认0)
+     */
+    private Integer screenType;
+
 }

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

@@ -87,4 +87,9 @@ public class FsVideoResourceVO {
     private String projectIds;
 
     private Integer sort;
+
+    /**
+     * 0横屏 1竖屏(默认0)
+     */
+    private Integer screenType;
 }

fs-service/src/main/java/com/fs/course/vo/newfs/FsUserCourseVideoDetailsVO.java

@@ -51,4 +51,9 @@ public class FsUserCourseVideoDetailsVO {
      */
     private String showTreatment;
 
+    /**
+     * 0横屏 1竖屏(默认0)
+     */
+    private Integer screenType;
+
 }

fs-service/src/main/java/com/fs/qw/mapper/QwExternalContactMapper.java

@@ -230,12 +230,15 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
     public int deleteQwExternalContactByIds(Long[] ids);
 
     @Select({"<script> " +
-            "select ec.*,qu.qw_user_name,qd.dept_name as departmentName,cw.name way_name,wg.group_name way_group_name from qw_external_contact ec " +
+            "select ec.*,qu.qw_user_name,qd.dept_name as departmentName,cw.name way_name,wg.group_name way_group_name, " +
+            "case when fsuser.history_app is not null then '是' else '否' end as is_download_app " +
+            " from qw_external_contact ec " +
             "left join qw_user qu on ec.user_id=qu.qw_user_id and qu.corp_id=ec.corp_id " +
             "left join qw_dept qd on qd.dept_id=qu.department and qd.corp_id=qu.corp_id " +
             "left join company_user cu on ec.company_user_id=cu.user_id " +
             "left join qw_contact_way cw on cw.id = ec.way_id " +
-            "left join qw_contact_way_group wg on wg.id=cw.group_id" +
+            "left join qw_contact_way_group wg on wg.id=cw.group_id " +
+            "left join fs_user fsuser on ec.fs_user_id =  fsuser.user_id " +
             "<where>  \n" +
             "            <if test=\"userId != null  and userId != ''\"> and ec.user_id   like concat( #{userId}, '%') </if>\n" +
             "            <if test=\"qwUserName != null  and qwUserName != ''\"> and qu.qw_user_name   like concat( #{qwUserName}, '%') </if>\n" +
@@ -302,6 +305,14 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
             "<if test ='companyUser!=null'> " +
                 "and (cu.nick_name like concat('%', #{companyUser}, '%') or cu.phonenumber= #{companyUser})"+
             "</if> " +
+            "<if test = 'isDownloadApp != null'>" +
+            "   <if test='isDownloadApp == 1'> "+
+            "   and fsuser.history_app is not null " +
+            "   </if>" +
+            "   <if test='isDownloadApp == 0'>" +
+            "   and fsuser.history_app is null " +
+            "   </if>" +
+            "</if>" +
             "        </where>"+
             "order by ec.create_time desc,ec.id desc"+
             "</script>"})

fs-service/src/main/java/com/fs/qw/param/QwExternalContactParam.java

@@ -152,4 +152,7 @@ public class QwExternalContactParam {
      */
     private Integer isReply;
 
+    //是否下载app
+    private Integer isDownloadApp;
+
 }

fs-service/src/main/java/com/fs/qw/vo/QwExternalContactVO.java

@@ -143,4 +143,6 @@ public class QwExternalContactVO {
      * 联系我分组名称
      */
     private String wayGroupName;
+    //是否下载app
+    private String isDownloadApp;
 }

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

@@ -37,6 +37,7 @@
         <result property="lastJoinTime"    column="last_join_time"    />
         <result property="projectId"    column="project_id"    />
         <result property="isFirst"    column="is_first"    />
+        <result property="screenType"    column="screen_type"    />
     </resultMap>
 
     <sql id="selectFsUserCourseVideoVo">
@@ -112,6 +113,7 @@
             <if test="isSpeed != null">is_speed,</if>
             <if test="jobId != null">job_id,</if>
             <if test="vid != null">vid,</if>
+            <if test="screenType != null">screen_type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fileId != null">#{fileId},</if>
@@ -154,6 +156,7 @@
             <if test="isSpeed != null">#{isSpeed},</if>
             <if test="jobId != null">#{jobId},</if>
             <if test="vid != null">#{vid},</if>
+            <if test="screenType != null">#{screenType},</if>
         </trim>
     </insert>
     <insert id="insertBatchFsUserCourseVideo" parameterType="FsUserCourseVideo" useGeneratedKeys="true" keyProperty="videoId">
@@ -176,7 +179,8 @@
         file_key,
         is_transcode,
         user_id,
-        project_id
+        project_id,
+        screen_type
         )
         values
         <foreach collection="collect" item="item" separator=",">
@@ -198,7 +202,8 @@
             #{item.fileKey},
             #{item.isTranscode},
             #{item.userId},
-            #{item.projectId}
+            #{item.projectId},
+            #{item.screenType}
             )
         </foreach>
     </insert>
@@ -246,6 +251,7 @@
             <if test="isOnPut != null">is_on_put = #{isOnPut},</if>
             <if test="jobId != null">job_id = #{jobId},</if>
             <if test="vid != null">vid = #{vid},</if>
+            <if test="screenType != null">screen_type = #{screenType},</if>
         </trim>
         where video_id = #{videoId}
     </update>
@@ -279,6 +285,7 @@
         video.STATUS,
         video.course_sort,
         video.is_speed,
+        video.screen_type,
         course.course_name,
         fcpd.period_id,
         fcp.period_name,
@@ -335,6 +342,7 @@
         video.STATUS,
         video.course_sort,
         video.is_speed,
+        video.screen_type,
         course.course_name,
         fcpd.period_id,
         fcp.period_name,