|
@@ -931,66 +931,66 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
|
|
//文字和短链一起
|
|
//文字和短链一起
|
|
case "1":
|
|
case "1":
|
|
case "3":
|
|
case "3":
|
|
- if ("1".equals(setting.getIsBindUrl())) {
|
|
|
|
- String link;
|
|
|
|
- if (isGroupChat) {
|
|
|
|
- FsCourseLinkCreateParam createParam = new FsCourseLinkCreateParam();
|
|
|
|
- createParam.setCourseId(courseId);
|
|
|
|
- createParam.setVideoId(videoId);
|
|
|
|
- createParam.setCorpId(logVo.getCorpId());
|
|
|
|
- createParam.setCompanyUserId(Long.parseLong(companyUserId));
|
|
|
|
- createParam.setCompanyId(Long.parseLong(companyId));
|
|
|
|
- createParam.setChatId(logVo.getChatId());
|
|
|
|
- createParam.setQwUserId(Long.valueOf(qwUserId));
|
|
|
|
- createParam.setDays(setting.getExpiresDays());
|
|
|
|
- R createLink = courseLinkService.createRoomLinkUrl(createParam);
|
|
|
|
- if (createLink.get("code").equals(500)) {
|
|
|
|
- throw new BaseException("链接生成失败!");
|
|
|
|
- }
|
|
|
|
- try {
|
|
|
|
- groupChat.getChatUserList().stream().filter(e -> e.getUserList() != null && !e.getUserList().isEmpty()).forEach(e -> {
|
|
|
|
- Map<String, GroupUserExternalVo> userMap = PubFun.listToMapByGroupObject(e.getUserList(), GroupUserExternalVo::getUserId);
|
|
|
|
- GroupUserExternalVo vo = userMap.get(groupChat.getOwner());
|
|
|
|
- if (vo != null && vo.getId() != null) {
|
|
|
|
- sopLogs.setFsUserId(vo.getFsUserId());
|
|
|
|
- addWatchLogIfNeeded(sopLogs, videoId, courseId, sendTime, qwUserId, companyUserId, companyId, vo.getId().toString(), logVo);
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
- } catch (Exception e) {
|
|
|
|
- log.error("群聊创建看课记录失败!", e);
|
|
|
|
- }
|
|
|
|
- link = (String) createLink.get("url");
|
|
|
|
- } else {
|
|
|
|
- addWatchLogIfNeeded(sopLogs, videoId, courseId, sendTime, qwUserId, companyUserId, companyId, externalId, logVo);
|
|
|
|
- link = generateShortLink(setting, logVo, sendTime, courseId, videoId,
|
|
|
|
- qwUserId, companyUserId, companyId, externalId,isOfficial,sopLogs.getFsUserId());
|
|
|
|
- }
|
|
|
|
|
|
+// if ("1".equals(setting.getIsBindUrl())) {
|
|
|
|
+// String link;
|
|
|
|
+// if (isGroupChat) {
|
|
|
|
+// FsCourseLinkCreateParam createParam = new FsCourseLinkCreateParam();
|
|
|
|
+// createParam.setCourseId(courseId);
|
|
|
|
+// createParam.setVideoId(videoId);
|
|
|
|
+// createParam.setCorpId(logVo.getCorpId());
|
|
|
|
+// createParam.setCompanyUserId(Long.parseLong(companyUserId));
|
|
|
|
+// createParam.setCompanyId(Long.parseLong(companyId));
|
|
|
|
+// createParam.setChatId(logVo.getChatId());
|
|
|
|
+// createParam.setQwUserId(Long.valueOf(qwUserId));
|
|
|
|
+// createParam.setDays(setting.getExpiresDays());
|
|
|
|
+// R createLink = courseLinkService.createRoomLinkUrl(createParam);
|
|
|
|
+// if (createLink.get("code").equals(500)) {
|
|
|
|
+// throw new BaseException("链接生成失败!");
|
|
|
|
+// }
|
|
|
|
+// try {
|
|
|
|
+// groupChat.getChatUserList().stream().filter(e -> e.getUserList() != null && !e.getUserList().isEmpty()).forEach(e -> {
|
|
|
|
+// Map<String, GroupUserExternalVo> userMap = PubFun.listToMapByGroupObject(e.getUserList(), GroupUserExternalVo::getUserId);
|
|
|
|
+// GroupUserExternalVo vo = userMap.get(groupChat.getOwner());
|
|
|
|
+// if (vo != null && vo.getId() != null) {
|
|
|
|
+// sopLogs.setFsUserId(vo.getFsUserId());
|
|
|
|
+// addWatchLogIfNeeded(sopLogs, videoId, courseId, sendTime, qwUserId, companyUserId, companyId, vo.getId().toString(), logVo);
|
|
|
|
+// }
|
|
|
|
+// });
|
|
|
|
+// } catch (Exception e) {
|
|
|
|
+// log.error("群聊创建看课记录失败!", e);
|
|
|
|
+// }
|
|
|
|
+// link = (String) createLink.get("url");
|
|
|
|
+// } else {
|
|
|
|
+// addWatchLogIfNeeded(sopLogs, videoId, courseId, sendTime, qwUserId, companyUserId, companyId, externalId, logVo);
|
|
|
|
+// link = generateShortLink(setting, logVo, sendTime, courseId, videoId,
|
|
|
|
+// qwUserId, companyUserId, companyId, externalId,isOfficial,sopLogs.getFsUserId());
|
|
|
|
+// }
|
|
|
|
|
|
- if (StringUtils.isNotEmpty(link)) {
|
|
|
|
- if ("3".equals(setting.getContentType())) {
|
|
|
|
- setting.setLinkUrl(link);
|
|
|
|
- } else {
|
|
|
|
- String currentValue = setting.getValue();
|
|
|
|
- if (currentValue == null) {
|
|
|
|
- setting.setValue(link);
|
|
|
|
- } else {
|
|
|
|
- setting.setValue(currentValue
|
|
|
|
- .replaceAll("#销售称呼#", StringUtil.strIsNullOrEmpty(welcomeText) ? "" : welcomeText)
|
|
|
|
- .replaceAll("#客户称呼#", contact == null || StringUtil.strIsNullOrEmpty(contact.getStageStatus())|| "0".equals(contact.getStageStatus())?"同学":contact.getStageStatus())
|
|
|
|
- + "\n" + link);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- log.error("生成短链失败,跳过设置 URL。");
|
|
|
|
- }
|
|
|
|
|
|
+// if (StringUtils.isNotEmpty(link)) {
|
|
|
|
+// if ("3".equals(setting.getContentType())) {
|
|
|
|
+// setting.setLinkUrl(link);
|
|
|
|
+// } else {
|
|
|
|
+// String currentValue = setting.getValue();
|
|
|
|
+// if (currentValue == null) {
|
|
|
|
+// setting.setValue(link);
|
|
|
|
+// } else {
|
|
|
|
+// setting.setValue(currentValue
|
|
|
|
+// .replaceAll("#销售称呼#", StringUtil.strIsNullOrEmpty(welcomeText) ? "" : welcomeText)
|
|
|
|
+// .replaceAll("#客户称呼#", contact == null || StringUtil.strIsNullOrEmpty(contact.getStageStatus())|| "0".equals(contact.getStageStatus())?"同学":contact.getStageStatus())
|
|
|
|
+// + "\n" + link);
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// } else {
|
|
|
|
+// log.error("生成短链失败,跳过设置 URL。");
|
|
|
|
+// }
|
|
|
|
|
|
- } else {
|
|
|
|
|
|
+// } else {
|
|
if ("1".equals(setting.getContentType())) {
|
|
if ("1".equals(setting.getContentType())) {
|
|
setting.setValue(setting.getValue()
|
|
setting.setValue(setting.getValue()
|
|
.replaceAll("#销售称呼#", StringUtil.strIsNullOrEmpty(welcomeText) ? "" : welcomeText)
|
|
.replaceAll("#销售称呼#", StringUtil.strIsNullOrEmpty(welcomeText) ? "" : welcomeText)
|
|
.replaceAll("#客户称呼#", contact == null || StringUtil.strIsNullOrEmpty(contact.getStageStatus())|| "0".equals(contact.getStageStatus())?"同学":contact.getStageStatus()));
|
|
.replaceAll("#客户称呼#", contact == null || StringUtil.strIsNullOrEmpty(contact.getStageStatus())|| "0".equals(contact.getStageStatus())?"同学":contact.getStageStatus()));
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+// }
|
|
break;
|
|
break;
|
|
//小程序单独
|
|
//小程序单独
|
|
case "4":
|
|
case "4":
|