看课记录日志区分来源

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

@@ -91,4 +91,6 @@ public class FsCourseWatchLog extends BaseEntity
     /** im发送消息详情id */
     private Long imMsgSendDetailId;
 
+    private Integer typeFlag; //0 小程序 1 app
+
 }

fs-service/src/main/java/com/fs/course/param/FsUserCourseVideoAddKfUParam.java

@@ -69,5 +69,6 @@ public class FsUserCourseVideoAddKfUParam implements Serializable {
     private String nickName;
 
     private Integer isOpenCourse;
+    private Integer typeFlag; //0 小程序 1 app
 
 }

fs-service/src/main/java/com/fs/course/param/newfs/FsUserCourseAddCompanyUserParam.java

@@ -1,6 +1,7 @@
 package com.fs.course.param.newfs;
 
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -42,4 +43,9 @@ public class FsUserCourseAddCompanyUserParam implements Serializable {
      * 营期课程id
      */
     private Long id;
+
+    /**
+     * 来源标识 0小程序 1 app
+     */
+    private Integer typeFlag;
 }

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

@@ -630,7 +630,10 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
             if (log.getUserId() == null || log.getUserId().equals(0L) || !log.getUserId().equals(param.getUserId())) {
                 log.setUserId(param.getUserId());
             }
-
+            //区分课程来源 0 小程序 1 app
+            if (param.getTypeFlag() != null) {
+                log.setTypeFlag(param.getTypeFlag());
+            }
             log.setUpdateTime(new Date());
             //重粉逻辑
             //
@@ -653,6 +656,10 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
             //绑定上之后 更新观看记录
             //看课记录中userId为0绑定userId
             log.setUserId(param.getUserId());
+            //区分课程来源
+            if (param.getTypeFlag() != null) {
+                log.setTypeFlag(param.getTypeFlag());
+            }
             log.setUpdateTime(new Date());
             courseWatchLogMapper.updateFsCourseWatchLog(log);
         }
@@ -775,6 +782,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
         log.setQwUserId(Long.valueOf(param.getQwUserId()));
         log.setCreateTime(new Date());
         log.setLogType(3);
+        if (param.getTypeFlag() != null) {
+            log.setTypeFlag(param.getTypeFlag());
+        }
         logger.info("【群聊生成看课记录】:{}", param);
         courseWatchLogMapper.insertFsCourseWatchLog(log);
     }
@@ -855,6 +865,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
             if (log.getUserId() == null || log.getUserId().equals(0L) || !log.getUserId().equals(param.getUserId())) {
                 log.setUserId(param.getUserId());
             }
+            if (param.getTypeFlag() != null) {
+                log.setTypeFlag(param.getTypeFlag());
+            }
             log.setUpdateTime(new Date());
             courseWatchLogMapper.updateFsCourseWatchLog(log);
 
@@ -895,7 +908,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
             if (log.getUserId() == null || log.getUserId().equals(0L) || !log.getUserId().equals(param.getUserId())) {
                 log.setUserId(param.getUserId());
             }
-
+            if (param.getTypeFlag() != null) {
+                log.setTypeFlag(param.getTypeFlag());
+            }
             log.setUpdateTime(new Date());
             courseWatchLogMapper.updateFsCourseWatchLog(log);
 
@@ -1927,6 +1942,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
             if (watchCourseVideo != null) {
                 FsCourseWatchLog updateLog = new FsCourseWatchLog();
                 updateLog.setUpdateTime(new Date());
+                if (param.getTypeFlag() != null) {
+                    updateLog.setTypeFlag(param.getTypeFlag());
+                }
                 courseWatchLogMapper.updateFsCourseWatchLog(updateLog);
             } else {
                 FsCourseWatchLog fsCourseWatchLog = new FsCourseWatchLog();
@@ -1935,6 +1953,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
                 fsCourseWatchLog.setDuration(0L);
                 fsCourseWatchLog.setCreateTime(new Date());
                 fsCourseWatchLog.setLogType(1);
+                if (param.getTypeFlag() != null) {
+                    fsCourseWatchLog.setTypeFlag(param.getTypeFlag());
+                }
                 courseWatchLogMapper.insertFsCourseWatchLog(fsCourseWatchLog);
                 String redisKey = "h5wxuser:watch:heartbeat:" + param.getUserId() + ":" + param.getVideoId() + ":" + 0;
                 redisCache.setCacheObject(redisKey, LocalDateTime.now().toString());
@@ -2034,6 +2055,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
             updateLog.setPeriodId(param.getPeriodId());
             updateLog.setProject(courseProject);
             updateLog.setUpdateTime(new Date());
+            if (param.getTypeFlag() != null) {
+                updateLog.setTypeFlag(param.getTypeFlag());
+            }
             courseWatchLogMapper.updateFsCourseWatchLog(updateLog);
         } else {
             FsCourseWatchLog fsCourseWatchLog = new FsCourseWatchLog();
@@ -2043,6 +2067,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
             fsCourseWatchLog.setCreateTime(new Date());
             fsCourseWatchLog.setLogType(1);
             fsCourseWatchLog.setProject(courseProject);
+            if (param.getTypeFlag() != null) {
+                fsCourseWatchLog.setTypeFlag(param.getTypeFlag());
+            }
             courseWatchLogMapper.insertFsCourseWatchLog(fsCourseWatchLog);
 
             String redisKey = "h5wxuser:watch:heartbeat:" + param.getUserId() + ":" + param.getVideoId() + ":" + param.getCompanyUserId();
@@ -3105,6 +3132,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
             log.setCreateTime(new Date());
             log.setLogType(3);
             logger.info("【群聊生成看课记录】:{}", param);
+            if(param.getTypeFlag()!=null){
+                log.setTypeFlag(param.getTypeFlag());
+            }
             courseWatchLogMapper.insertFsCourseWatchLog(log);
         } catch (BeansException e) {
             return R.error("群聊生成看课记录失败！");

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

@@ -254,6 +254,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="campPeriodTime != null">camp_period_time,</if>
             <if test="periodId != null">period_id,</if>
             <if test="project != null">project,</if>
+            <if test="typeFlag != null">type_flag,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
@@ -275,6 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="campPeriodTime != null">#{campPeriodTime},</if>
             <if test="periodId != null">#{periodId},</if>
             <if test="project != null">#{project},</if>
+            <if test="typeFlag != null">#{typeFlag},</if>
         </trim>
     </insert>
 
@@ -299,6 +301,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sendFinishMsg != null">send_finish_msg,</if>
             <if test="campPeriodTime != null">camp_period_time,</if>
             <if test="project != null">project,</if>
+            <if test="typeFlag != null">type_flag,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
@@ -319,6 +322,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sendFinishMsg != null">#{sendFinishMsg},</if>
             <if test="campPeriodTime != null">#{campPeriodTime},</if>
             <if test="project != null">#{project},</if>
+            <if test="typeFlag != null">#{typeFlag},</if>
         </trim>
         on duplicate key update
         <trim suffixOverrides=",">
@@ -347,7 +351,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         camp_period_time,
         project,
         period_id,
-        im_msg_send_detail_id
+        im_msg_send_detail_id,
+        type_flag
         )
         VALUES
         <foreach collection="watchLogs" item="log" separator=",">
@@ -369,7 +374,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{log.campPeriodTime},
             #{log.project},
             #{log.periodId},
-            #{log.imMsgSendDetailId}
+            #{log.imMsgSendDetailId},
+            #{log.typeFlag}
             )
         </foreach>
         ON DUPLICATE KEY UPDATE
@@ -401,6 +407,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lastHeartbeatTime != null">last_heartbeat_time = #{lastHeartbeatTime},</if>
             <if test="periodId != null">period_id = #{periodId},</if>
             <if test="project != null">project = #{project},</if>
+            <if test="typeFlag != null">type_flag = #{typeFlag},</if>
         </trim>
         where log_id = #{logId}
     </update>