新增企微员工打备注

fs-qw-api-msg/src/main/java/com/fs/app/controller/QwMsgController.java

@@ -293,7 +293,7 @@ public class QwMsgController {
             case 100007:
                 log.info("id:{}, 异常断开:"+wxWorkMsgResp.getJson(), id);
                 JSONObject jsonObject3 = new JSONObject(wxWorkMsgResp.getJson());
-                qwUserStatus(wxWorkMsgResp.getUuid(),0, "异常断开 - " + jsonObject3.getString("msg"));
+                qwUserStatus(wxWorkMsgResp.getUuid(),0, "链接断开 - " + jsonObject3.getString("msg"));
                 break;
             case 100009:
                 log.info("id:{}, 二次验证:"+wxWorkMsgResp.getJson(), id);

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

@@ -1782,27 +1782,29 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
 
             switch (setting.getContentType()) {
 
-                case "18" :
-                    FsUserCourseVideo video = fsUserCourseVideoMapper.selectFsUserCourseVideoByVideoId(videoId);
-                    //飞书看课链接
-                    Long companyIdLong = Long.parseLong(companyId);
-                    Long companyUserIdLong = Long.parseLong(companyUserId);
-                    long externalIdLong = Long.parseLong(externalId);
-
-
-                    String key = "fei_shu_doc_id:" + externalIdLong + "_" + videoId;
-                    String feiShuDocId = redisCache.getCacheObject(key);
-                    if (org.apache.commons.lang3.StringUtils.isBlank(feiShuDocId)) {
-                        feiShuDocId = getFeiShuDocId(video, companyIdLong, companyUserIdLong);
-                        if (org.apache.commons.lang3.StringUtils.isNotBlank(feiShuDocId)) {
-                            redisCache.setCacheObject("fei_shu_doc_id:" + externalIdLong + "_" + video.getVideoId(), feiShuDocId,2,TimeUnit.DAYS);
-                        }
-                    }
-                    break;
+//                case "18" :
+//                    FsUserCourseVideo video = fsUserCourseVideoMapper.selectFsUserCourseVideoByVideoId(videoId);
+//                    //飞书看课链接
+//                    Long companyIdLong = Long.parseLong(companyId);
+//                    Long companyUserIdLong = Long.parseLong(companyUserId);
+//                    long externalIdLong = Long.parseLong(externalId);
+//
+//
+//                    String key = "fei_shu_doc_id:" + externalIdLong + "_" + videoId;
+//                    String feiShuDocId = redisCache.getCacheObject(key);
+//                    if (org.apache.commons.lang3.StringUtils.isBlank(feiShuDocId)) {
+//                        feiShuDocId = getFeiShuDocId(video, companyIdLong, companyUserIdLong);
+//                        if (org.apache.commons.lang3.StringUtils.isNotBlank(feiShuDocId)) {
+//                            redisCache.setCacheObject("fei_shu_doc_id:" + externalIdLong + "_" + video.getVideoId(), feiShuDocId,2,TimeUnit.DAYS);
+//                        }
+//                    }
+//                    break;
                 case "19" :
+                    log.info("生成notion看课记录参数：sopId:{},videoId:{},senTime:{},startTime:{}",sopLogs.getSopId(),videoId,sopLogs.getSendTime(),logVo.getStartTime());
                     Long notionWatchLogId = addNotionWatchLog(sopLogs.getSopId(), videoId, courseId,
                             sopLogs.getFsUserId(), qwUserId, companyUserId, companyId,
                             Long.valueOf(externalId), sopLogs.getSendTime(), logVo.getStartTime());
+                    log.info("看课记录id：{}",notionWatchLogId);
                     //2.创建课程短链
                     createNotionLinkByMiniApp(setting, sopLogs.getCorpId(), sendTime, courseId, videoId,
                             qwUserId, companyUserId, companyId, Long.valueOf(externalId), cachedCourseConfig);
@@ -1810,6 +1812,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
                     request.setTitle(setting.getLinkDescribe());
                     request.setIframeUrl(notionLink + notionWatchLogId);
                     NotionPageResponse page = notionService.createPage(request);
+                    log.info("notion页面数据：{}",page.toString());
                     redisCache.setCacheObject("notion_course:"+videoId+"_"+externalId+"_"+qwUserId,page.getPublicUrl(),3,TimeUnit.DAYS);
                     break;
                 default:
@@ -3246,8 +3249,8 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
             watchLog.setUpdateTime(new Date());
             watchLog.setLogType(3);
             watchLog.setUserId(fsUserId);
-            watchLog.setCampPeriodTime(convertStringToDate(createTime,"yyyy-MM-dd HH:mm:ss"));
-
+            watchLog.setCampPeriodTime(convertStringToDate(createTime,"yyyy-MM-dd"));
+            log.info("生成看课记录watchLog:{}",watchLog);
             //存看课记录
             fsCourseWatchLogMapper.insertOrUpdateFsCourseWatchLog(watchLog);
             return watchLog.getLogId();

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

@@ -94,4 +94,5 @@ public class QwUserVO {
     private String isAuto;
 
     private Long doctorId;
+    private String remark;
 }