sop、一键群发文档2都改成执行飞书

fs-ipad-task/src/main/java/com/fs/app/service/IpadSendServer.java

@@ -348,8 +348,8 @@ public class IpadSendServer {
             // 新飞书逻辑
             completeFeishuCourseLink(vo, content,qwSopLogs, externalId,qwUser.getId());
         } else if ("19".equals(content.getContentType())){
-//            completeFeishuCourseLink(vo, content,qwSopLogs, externalId,qwUser.getId());
-            completeNotionCourseLink(vo, content,qwSopLogs, externalId,qwUser);
+            completeFeishuCourseLink(vo, content,qwSopLogs, externalId,qwUser.getId());
+//            completeNotionCourseLink(vo, content,qwSopLogs, externalId,qwUser);
         }
 
         // ---- 如果链接获取失败，则不发送 ----
@@ -386,8 +386,8 @@ public class IpadSendServer {
             NotionPageRequest request = new NotionPageRequest();
             request.setTitle(content.getLinkDescribe());
             request.setIframeUrl(notionLink + logId);
-//            NotionPageResponse page = notionService.createPage(request);
-//            if (!page.isSuccess() || page.getPublicUrl() == null) {
+            NotionPageResponse page = notionService.createPage(request);
+            if (!page.isSuccess() || page.getPublicUrl() == null) {
 //                content.setSendStatus(2);
 //                content.setSendRemarks("获取Notion文档链接异常：" + page.getError());
 //                return;
@@ -397,11 +397,11 @@ public class IpadSendServer {
                         String.valueOf(qwUser.getId()), String.valueOf(qwUser.getCompanyUserId()), String.valueOf(qwUser.getCompanyId()), externalId);
                 content.setLinkUrl("https://www.feishu.cn/docx/" + notionLinkByMiniApp.get("link"));
                 completeFeishuCourseLink(vo, content,qwSopLogs, externalId,qwUser.getId());
-//            } else {
-//                content.setLinkUrl(page.getPublicUrl());
-//                redisCache.setCacheObject("notion_course:"+content.getVideoId()+"_"+externalId+"_"+qwUser.getId(),content.getLinkUrl(),3,TimeUnit.DAYS);
-//                qwSopLogsService.updateLinkUrlInContentJson(qwSopLogs, page.getPublicUrl());
-//            }
+            } else {
+                content.setLinkUrl(page.getPublicUrl());
+                redisCache.setCacheObject("notion_course:"+content.getVideoId()+"_"+externalId+"_"+qwUser.getId(),content.getLinkUrl(),3,TimeUnit.DAYS);
+                qwSopLogsService.updateLinkUrlInContentJson(qwSopLogs, page.getPublicUrl());
+            }
 
         }
     }

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

@@ -1659,23 +1659,24 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
                     setting.setMiniprogramPage(phoneLinkBy);
                     setting.setContentType("17");
                     break;
-                case "19" :
-                    //1.添加待看课记录
-                    addWatchLogIfNeeded(sopLogs, videoId, courseId, sendTime, qwUserId, companyUserId, companyId, externalId, logVo);
-                    //2.创建课程短链
-                    createNotionLinkByMiniApp(setting, sopLogs.getCorpId(), sendTime, courseId, videoId,
-                            qwUserId, companyUserId, companyId, Long.valueOf(externalId), cachedCourseConfig);
-                    String url = redisCache.getCacheObject("notion_course:" + videoId + "_" + externalId + "_" + qwUserId);
-                    if (StringUtils.isNotEmpty(url)) {
-                        log.info("notion缓存命中");
-                    }
-                    if (StringUtils.isEmpty(url)) {
-                        url ="";
-                    }
-                    setting.setLinkUrl(url);
-                    break;
+//                case "19" :
+//                    //1.添加待看课记录
+//                    addWatchLogIfNeeded(sopLogs, videoId, courseId, sendTime, qwUserId, companyUserId, companyId, externalId, logVo);
+//                    //2.创建课程短链
+//                    createNotionLinkByMiniApp(setting, sopLogs.getCorpId(), sendTime, courseId, videoId,
+//                            qwUserId, companyUserId, companyId, Long.valueOf(externalId), cachedCourseConfig);
+//                    String url = redisCache.getCacheObject("notion_course:" + videoId + "_" + externalId + "_" + qwUserId);
+//                    if (StringUtils.isNotEmpty(url)) {
+//                        log.info("notion缓存命中");
+//                    }
+//                    if (StringUtils.isEmpty(url)) {
+//                        url ="";
+//                    }
+//                    setting.setLinkUrl(url);
+//                    break;
 
                 case "18" :
+                case "19" :
                 case "20" :
                     //飞书看课链接
                     //Long companyIdLong = Long.parseLong(companyId);

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -706,7 +706,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                                 break;
                             //飞书看课
                             case "18":
-//                            case "19":
+                            case "19":
                             case "20":
                                 // 参数转换
                                 Integer videoId = param.getVideoId() != null ? param.getVideoId().intValue() : null;
@@ -728,18 +728,18 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                                 String feishuLink = "https://www.feishu.cn/docx/"+shortCode;
                                 st.setLinkUrl(feishuLink);
                                 break;
-                            case "19":
-                                String qwUserId = qwUser.getQwUserId();
-                                String companyId = qwUser.getCompanyId().toString();
-                                Long notionWatchLogId = addNotionWatchLog(param.getSopId(), param.getVideoId(), param.getCourseId(), null, qwUserId, companyUserId, companyId, externalId, param.getStartTime(), createTime);
-                                createNotionH5Link(st, param.getCorpId(), createTime, param.getCourseId(), param.getVideoId(), String.valueOf(qwUser.getId()), companyUserId, companyId, externalId, config);
-                                NotionPageRequest request = new NotionPageRequest();
-                                request.setTitle(st.getLinkDescribe());
-                                request.setIframeUrl(notionLink + notionWatchLogId);
-
-                                NotionPageResponse page = notionService.createPage(request);
-                                st.setLinkUrl(page.getPublicUrl());
-                                break;
+//                            case "19":
+//                                String qwUserId = qwUser.getQwUserId();
+//                                String companyId = qwUser.getCompanyId().toString();
+//                                Long notionWatchLogId = addNotionWatchLog(param.getSopId(), param.getVideoId(), param.getCourseId(), null, qwUserId, companyUserId, companyId, externalId, param.getStartTime(), createTime);
+//                                createNotionH5Link(st, param.getCorpId(), createTime, param.getCourseId(), param.getVideoId(), String.valueOf(qwUser.getId()), companyUserId, companyId, externalId, config);
+//                                NotionPageRequest request = new NotionPageRequest();
+//                                request.setTitle(st.getLinkDescribe());
+//                                request.setIframeUrl(notionLink + notionWatchLogId);
+//
+//                                NotionPageResponse page = notionService.createPage(request);
+//                                st.setLinkUrl(page.getPublicUrl());
+//                                break;
                         }
                     }
                     setting.setSetting(list);
@@ -883,7 +883,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                                 break;
                             //飞书看课
                             case "18":
-//                            case "19":
+                            case "19":
                             case "20":
                                 // 参数转换
                                 Integer videoId = param.getVideoId() != null ? param.getVideoId().intValue() : null;
@@ -904,21 +904,21 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                                 String feishuLink = "https://www.feishu.cn/docx/"+shortCode;
                                 st.setLinkUrl(feishuLink);
                                 break;
-                            case "19":
-                                String qwUserId = qwUser.getQwUserId();
-                                String companyId = qwUser.getCompanyId().toString();
-                                Long externalId = Long.valueOf(groupChat.getChatId());
-                                Long companyUserId = Long.valueOf(qwUser.getCompanyUserId().toString());
-
-                                Long notionWatchLogId = addNotionWatchLog(param.getSopId(), param.getVideoId(), param.getCourseId(), null, qwUserId, String.valueOf(companyUserId), companyId, externalId, param.getStartTime(), createTime);
-                                createNotionH5Link(st, param.getCorpId(), createTime, param.getCourseId(), param.getVideoId(), String.valueOf(qwUser.getId()), String.valueOf(companyUserId), companyId, externalId, config);
-                                NotionPageRequest request = new NotionPageRequest();
-                                request.setTitle(st.getLinkDescribe());
-                                request.setIframeUrl(notionLink + notionWatchLogId);
-
-                                NotionPageResponse page = notionService.createPage(request);
-                                st.setLinkUrl(page.getPublicUrl());
-                                break;
+//                            case "19":
+//                                String qwUserId = qwUser.getQwUserId();
+//                                String companyId = qwUser.getCompanyId().toString();
+//                                Long externalId = Long.valueOf(groupChat.getChatId());
+//                                Long companyUserId = Long.valueOf(qwUser.getCompanyUserId().toString());
+//
+//                                Long notionWatchLogId = addNotionWatchLog(param.getSopId(), param.getVideoId(), param.getCourseId(), null, qwUserId, String.valueOf(companyUserId), companyId, externalId, param.getStartTime(), createTime);
+//                                createNotionH5Link(st, param.getCorpId(), createTime, param.getCourseId(), param.getVideoId(), String.valueOf(qwUser.getId()), String.valueOf(companyUserId), companyId, externalId, config);
+//                                NotionPageRequest request = new NotionPageRequest();
+//                                request.setTitle(st.getLinkDescribe());
+//                                request.setIframeUrl(notionLink + notionWatchLogId);
+//
+//                                NotionPageResponse page = notionService.createPage(request);
+//                                st.setLinkUrl(page.getPublicUrl());
+//                                break;
                         }
                     }
                     setting.setSetting(list);
@@ -1224,7 +1224,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                             break;
                         //飞书看课
                         case "18":
-//                        case "19":
+                        case "19":
                         case "20":
                             // 参数转换
                             Integer videoId = param.getVideoId() != null ? param.getVideoId().intValue() : null;
@@ -1264,18 +1264,18 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                             String feishuLink = "https://www.feishu.cn/docx/"+shortCode;
                             st.setLinkUrl(feishuLink);
                             break;
-                        case "19":
-                            Long notionWatchLogId = addNotionWatchLog(param.getSopId(), param.getVideoId(), param.getCourseId(),
-                                    item.getFsUserId(), qwUserId, companyUserId, companyId,
-                                    item.getExternalId(), param.getStartTime(), createTime);
-                            createNotionH5Link(st, param.getCorpId(), createTime, param.getCourseId(), param.getVideoId(), String.valueOf(qwUser.getId()), companyUserId, companyId, item.getExternalId(), config);
-                            NotionPageRequest request = new NotionPageRequest();
-                            request.setTitle(st.getLinkDescribe());
-                            request.setIframeUrl(notionLink + notionWatchLogId);
-
-                            NotionPageResponse page = notionService.createPage(request);
-                            st.setLinkUrl(page.getPublicUrl());
-                            break;
+//                        case "19":
+//                            Long notionWatchLogId = addNotionWatchLog(param.getSopId(), param.getVideoId(), param.getCourseId(),
+//                                    item.getFsUserId(), qwUserId, companyUserId, companyId,
+//                                    item.getExternalId(), param.getStartTime(), createTime);
+//                            createNotionH5Link(st, param.getCorpId(), createTime, param.getCourseId(), param.getVideoId(), String.valueOf(qwUser.getId()), companyUserId, companyId, item.getExternalId(), config);
+//                            NotionPageRequest request = new NotionPageRequest();
+//                            request.setTitle(st.getLinkDescribe());
+//                            request.setIframeUrl(notionLink + notionWatchLogId);
+//
+//                            NotionPageResponse page = notionService.createPage(request);
+//                            st.setLinkUrl(page.getPublicUrl());
+//                            break;
                         case "21":
                             if (sopLogs.getFsUserId() != null && !Long.valueOf(0L).equals(sopLogs.getFsUserId())) {
                                 addWatchLogIfNeeded(item.getSopId(), param.getVideoId(), param.getCourseId(), item.getFsUserId(), qwUserId, companyUserId, companyId,
@@ -1924,7 +1924,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                     break;
                 //飞书看课
                 case "18":
-//                case "19":
+                case "19":
                 case "20":
                     // 参数转换
                     Integer videoId = param.getVideoId() != null ? param.getVideoId().intValue() : null;
@@ -1982,18 +1982,18 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                         log.error("生成飞书注册链接失败，sopId={}", item.getSopId());
                     }
                     break;
-                case "19":
-                    Long notionWatchLogId = addNotionWatchLog(item.getSopId(), param.getVideoId(), param.getCourseId(),
-                            item.getFsUserId(), String.valueOf(qwUser.getId()), companyUserId, companyId,
-                            item.getExternalId(), item.getStartTime(), dataTime);
-                    createNotionH5Link(st, param.getCorpId(), dataTime, param.getCourseId(), param.getVideoId(), String.valueOf(qwUser.getId()), companyUserId, companyId, item.getExternalId(), config);
-                    NotionPageRequest request = new NotionPageRequest();
-                    request.setTitle(st.getLinkDescribe());
-                    request.setIframeUrl(notionLink + notionWatchLogId);
-
-                    NotionPageResponse page = notionService.createPage(request);
-                    st.setLinkUrl(page.getPublicUrl());
-                    break;
+//                case "19":
+//                    Long notionWatchLogId = addNotionWatchLog(item.getSopId(), param.getVideoId(), param.getCourseId(),
+//                            item.getFsUserId(), String.valueOf(qwUser.getId()), companyUserId, companyId,
+//                            item.getExternalId(), item.getStartTime(), dataTime);
+//                    createNotionH5Link(st, param.getCorpId(), dataTime, param.getCourseId(), param.getVideoId(), String.valueOf(qwUser.getId()), companyUserId, companyId, item.getExternalId(), config);
+//                    NotionPageRequest request = new NotionPageRequest();
+//                    request.setTitle(st.getLinkDescribe());
+//                    request.setIframeUrl(notionLink + notionWatchLogId);
+//
+//                    NotionPageResponse page = notionService.createPage(request);
+//                    st.setLinkUrl(page.getPublicUrl());
+//                    break;
                 case "21":
                     if (sopLogs.getFsUserId() != null && !Long.valueOf(0L).equals(sopLogs.getFsUserId())) {
                         addWatchLogIfNeeded(item.getSopId(), param.getVideoId(), param.getCourseId(), item.getFsUserId(), String.valueOf(qwUser.getId()), companyUserId, companyId,