看课数据区分来源

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

@@ -40,6 +40,7 @@ import com.fs.sop.vo.QwCreateLinkByAppVO;
 import com.fs.sop.vo.SopUserLogsVo;
 import com.fs.system.service.ISysConfigService;
 import com.fs.voice.utils.StringUtil;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -2060,7 +2061,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
                 //小程序单独
                 case "4":
                     addWatchLogIfNeeded(sopLogs.getSopId(), st.getVideoId().intValue(), st.getCourseId().intValue(), sopLogs.getFsUserId(),  String.valueOf(qwUser.getId()),qwUser.getCompanyUserId().toString(), qwUser.getCompanyId().toString(),
-                            sopLogs.getExternalId(), newTimeString.substring(0, 10), dataTime);
+                            sopLogs.getExternalId(), newTimeString.substring(0, 10), dataTime, 2);
 
                     String linkByMiniApp = createLinkByMiniApp(st, sopLogs.getCorpId(), dataTime, finishTemp.getCourseId().intValue(), Integer.valueOf(st.getVideoId().toString()),
                             String.valueOf(qwUser.getId()), qwUser.getCompanyUserId().toString(), qwUser.getCompanyId().toString(), sopLogs.getExternalId(), config);
@@ -2237,7 +2238,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
      */
     private Long addWatchLogIfNeeded(String sopId, Integer videoId, Integer courseId,
                                      Long fsUserId, String qwUserId, String companyUserId,
-                                     String companyId, Long externalId, String startTime, Date createTime) {
+                                     String companyId, Long externalId, String startTime, Date createTime, Integer watchType) {
 
         try {
             FsCourseWatchLog watchLog = new FsCourseWatchLog();
@@ -2255,6 +2256,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
             watchLog.setLogType(3);
             watchLog.setUserId(fsUserId);
             watchLog.setCampPeriodTime(convertStringToDate(startTime, "yyyy-MM-dd"));
+            watchLog.setWatchType(watchType);
 
             //存看课记录
             int i = fsCourseWatchLogMapper.insertOrUpdateFsCourseWatchLog(watchLog);

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

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

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

@@ -45,7 +45,7 @@ public class FsUserCourseAddCompanyUserParam implements Serializable {
     private Long id;
 
     /**
-     * 来源标识 0小程序 1 app
+     * 来源标识 2小程序 1 app
      */
-    private Integer typeFlag=0;
+    private Integer typeFlag=2;
 }

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

@@ -1997,9 +1997,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
                 fsCourseWatchLog.setDuration(0L);
                 fsCourseWatchLog.setCreateTime(new Date());
                 fsCourseWatchLog.setLogType(1);
-//                if (param.getTypeFlag() != null) {
-//                    fsCourseWatchLog.setTypeFlag(param.getTypeFlag());
-//                }
+                if (param.getTypeFlag() != null) {
+                    fsCourseWatchLog.setWatchType(param.getTypeFlag());
+                }
                 courseWatchLogMapper.insertFsCourseWatchLog(fsCourseWatchLog);
                 String redisKey = "h5wxuser:watch:heartbeat:" + param.getUserId() + ":" + param.getVideoId() + ":" + 0;
                 redisCache.setCacheObject(redisKey, LocalDateTime.now().toString());
@@ -2013,7 +2013,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
         if (companyUser == null) {
             return ResponseResult.fail(405, "当前销售不存在");
         }
-        if(param.getTypeFlag()==0){
+        if(param.getTypeFlag()==2){
             //小程序看课需要判断是否注册
             //营期公司的开关状态
             List<Integer> selected = periodCompanyMapper.selectRegistrationSwitchByPeriodId(param.getPeriodId());
@@ -2114,9 +2114,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
             fsCourseWatchLog.setCreateTime(new Date());
             fsCourseWatchLog.setLogType(1);
             fsCourseWatchLog.setProject(courseProject);
-//            if (param.getTypeFlag() != null) {
-//                fsCourseWatchLog.setTypeFlag(param.getTypeFlag());
-//            }
+            if (param.getTypeFlag() != null) {
+                fsCourseWatchLog.setWatchType(param.getTypeFlag());
+            }
             courseWatchLogMapper.insertFsCourseWatchLog(fsCourseWatchLog);
 
             String redisKey = "h5wxuser:watch:heartbeat:" + param.getUserId() + ":" + param.getVideoId() + ":" + param.getCompanyUserId();
@@ -3182,9 +3182,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
             log.setCreateTime(new Date());
             log.setLogType(3);
             logger.info("【群聊生成看课记录】:{}", param);
-//            if(param.getTypeFlag()!=null){
-//                log.setTypeFlag(param.getTypeFlag());
-//            }
+            if(param.getTypeFlag()!=null){
+                log.setWatchType(param.getTypeFlag());
+            }
             courseWatchLogMapper.insertFsCourseWatchLog(log);
         } catch (BeansException e) {
             return R.error("群聊生成看课记录失败！");