|
|
@@ -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());
|
|
|
+// }
|
|
|
|
|
|
}
|
|
|
}
|