You've already forked FrameTour-BE
refactor(notifications): 重构通知系统使用统一的微信订阅通知触发服务
- 移除 UserNotificationAuthController 中的 getScenicTemplatesWithAuth 方法 - 从 ScenicRepository 中删除微信模板ID相关方法和配置 - 重命名 WechatSubscribeNotifyTriggerService 为 notifyTriggerService - 更新 TaskTaskServiceImpl 中的视频生成通知逻辑 - 重构 DownloadNotificationTasker 中的通知发送方式 - 统一使用 WechatSubscribeNotifyTriggerRequest 和 WechatSubscribeNotifyTriggerResult - 移除 ZT 消息服务相关代码 - 简化变量传递和通知模板逻辑
This commit is contained in:
@@ -12,11 +12,14 @@ import com.ycwl.basic.model.pc.coupon.resp.CouponRespVO;
|
||||
import com.ycwl.basic.model.pc.member.resp.MemberRespVO;
|
||||
import com.ycwl.basic.model.pc.mp.MpConfigEntity;
|
||||
import com.ycwl.basic.integration.common.manager.ScenicConfigManager;
|
||||
import com.ycwl.basic.model.pc.notify.req.WechatSubscribeNotifyTriggerRequest;
|
||||
import com.ycwl.basic.model.pc.notify.resp.WechatSubscribeNotifyTriggerResult;
|
||||
import com.ycwl.basic.model.pc.scenic.entity.ScenicEntity;
|
||||
import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
|
||||
import com.ycwl.basic.repository.ScenicRepository;
|
||||
import com.ycwl.basic.repository.TemplateRepository;
|
||||
import com.ycwl.basic.integration.common.manager.ScenicConfigManager;
|
||||
import com.ycwl.basic.service.notify.WechatSubscribeNotifyTriggerService;
|
||||
import com.ycwl.basic.utils.NotificationAuthUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
@@ -48,7 +51,7 @@ public class DownloadNotificationTasker {
|
||||
@Autowired
|
||||
private MemberMapper memberMapper;
|
||||
@Autowired
|
||||
private CouponMapper couponMapper;
|
||||
private WechatSubscribeNotifyTriggerService notifyTriggerService;
|
||||
@Autowired
|
||||
private ZtMessageProducerService ztMessageProducerService;
|
||||
@Autowired
|
||||
@@ -61,70 +64,31 @@ public class DownloadNotificationTasker {
|
||||
Set<Long> sentMemberIds = ConcurrentHashMap.newKeySet();
|
||||
videoMapper.listRelationByCreateTime(new Date(System.currentTimeMillis() - 24 * 60 * 60 * 1000), new Date())
|
||||
.forEach(item -> {
|
||||
if (item.getIsBuy() == 1) {
|
||||
return;
|
||||
}
|
||||
// 检查该用户是否已经发送过通知，避免重复发送
|
||||
if (sentMemberIds.contains(item.getMemberId())) {
|
||||
log.debug("用户[memberId={}]已发送过下载通知，跳过", item.getMemberId());
|
||||
return;
|
||||
}
|
||||
sentMemberIds.add(item.getMemberId());
|
||||
|
||||
if (item.getIsBuy() == 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
MemberRespVO member = memberMapper.getById(item.getMemberId());
|
||||
// 发送模板消息
|
||||
String templateId = scenicRepository.getVideoDownloadTemplateId(item.getScenicId());
|
||||
if (StringUtils.isBlank(templateId)) {
|
||||
log.info("模板消息为空");
|
||||
return;
|
||||
}
|
||||
|
||||
// 检查并消费通知授权
|
||||
if (!notificationAuthUtils.checkAndConsumeAuthorization(item.getMemberId(), templateId, item.getScenicId())) {
|
||||
log.debug("用户[memberId={}]对模板[templateId={}]授权不足，跳过下载通知", item.getMemberId(), templateId);
|
||||
return;
|
||||
}
|
||||
|
||||
HashMap<String, Object> variables = new HashMap<>();
|
||||
ScenicV2DTO scenic = scenicRepository.getScenicBasic(item.getScenicId());
|
||||
ScenicConfigManager configManager = scenicRepository.getScenicConfigManager(item.getScenicId());
|
||||
String configTitle = configManager.getString("second_notification_title");
|
||||
String configContent = configManager.getString("second_notification_content");
|
||||
|
||||
if (StringUtils.isBlank(configTitle) || StringUtils.isBlank(configContent)) {
|
||||
log.info("景区[{}]未配置第二次通知内容，跳过发送通知", scenic.getName());
|
||||
return;
|
||||
}
|
||||
|
||||
String title = configTitle.replace("【景区】", scenic.getName());
|
||||
String page;
|
||||
if (configManager.getBoolean("grouping_enable", false)) {
|
||||
page = "pages/travelVideoCenter/index?type=2&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId();
|
||||
} else {
|
||||
page = "pages/videoSynthesis/index?type=2&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId();
|
||||
}
|
||||
/**
|
||||
* 景区 {{thing1.DATA}}
|
||||
* 备注 {{thing3.DATA}}
|
||||
*/
|
||||
Map<String, Object> dataParam = new HashMap<>();
|
||||
dataParam.put("thing1", title);
|
||||
dataParam.put("thing3", configContent);
|
||||
|
||||
// 构建extra，只包含data和page
|
||||
Map<String, Object> extra = new HashMap<>();
|
||||
extra.put("data", dataParam);
|
||||
extra.put("page", page);
|
||||
|
||||
// 使用ZT消息服务发送通知（第二次通知）
|
||||
ZtMessage msg = new ZtMessage();
|
||||
msg.setChannelId(templateId);
|
||||
msg.setTitle(title);
|
||||
msg.setContent("【" + item.getFaceId() + "】"+configContent);
|
||||
msg.setTarget(member.getOpenId());
|
||||
msg.setExtra(extra);
|
||||
msg.setSendReason("第二次通知");
|
||||
msg.setSendBiz("定时通知");
|
||||
ztMessageProducerService.send(msg);
|
||||
variables.put("scenicName", scenic.getName());
|
||||
variables.put("scenicId", scenic.getId());
|
||||
variables.put("faceId", item.getFaceId());
|
||||
WechatSubscribeNotifyTriggerRequest request = WechatSubscribeNotifyTriggerRequest.builder()
|
||||
.scenicId(item.getScenicId())
|
||||
.memberId(item.getMemberId())
|
||||
.openId(member.getOpenId())
|
||||
.bizId(String.valueOf(item.getId()))
|
||||
.variables(variables)
|
||||
.build();
|
||||
WechatSubscribeNotifyTriggerResult result = notifyTriggerService.trigger("NOT_BUY_NOTIFY", request);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -151,62 +115,22 @@ public class DownloadNotificationTasker {
|
||||
if (videoStoreDay == null) {
|
||||
videoStoreDay = 3;
|
||||
}
|
||||
// 发送模板消息
|
||||
String templateId = scenicRepository.getVideoPreExpireTemplateId(item.getScenicId());
|
||||
if (StringUtils.isBlank(templateId)) {
|
||||
log.info("模板消息为空");
|
||||
return;
|
||||
}
|
||||
|
||||
// 检查并消费通知授权
|
||||
if (!notificationAuthUtils.checkAndConsumeAuthorization(item.getMemberId(), templateId, item.getScenicId())) {
|
||||
log.debug("用户[memberId={}]对模板[templateId={}]授权不足，跳过过期提醒通知", item.getMemberId(), templateId);
|
||||
return;
|
||||
}
|
||||
|
||||
ScenicV2DTO scenic = scenicRepository.getScenicBasic(item.getScenicId());
|
||||
ScenicConfigManager configManager = scenicRepository.getScenicConfigManager(item.getScenicId());
|
||||
String configTitle = configManager.getString("third_notification_title");
|
||||
String configContent = configManager.getString("third_notification_content");
|
||||
|
||||
if (StringUtils.isBlank(configTitle) || StringUtils.isBlank(configContent)) {
|
||||
log.info("景区[{}]未配置第三次通知内容，跳过发送通知", scenic.getName());
|
||||
return;
|
||||
}
|
||||
|
||||
String title = configTitle.replace("【景区】", scenic.getName());
|
||||
String page;
|
||||
if (configManager.getBoolean("grouping_enable", false)) {
|
||||
page = "pages/travelVideoCenter/index?type=3&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId();
|
||||
} else {
|
||||
page = "pages/videoSynthesis/index?type=3&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId();
|
||||
}
|
||||
/**
|
||||
* 影像名称 {{thing1.DATA}}
|
||||
* 过期时间 {{time2.DATA}}
|
||||
* 备注 {{thing3.DATA}}
|
||||
*/
|
||||
Date expireDate = new Date(item.getCreateTime().getTime() + videoStoreDay * 24 * 60 * 60 * 1000);
|
||||
Map<String, Object> dataParam = new HashMap<>();
|
||||
dataParam.put("thing1", title);
|
||||
dataParam.put("time2", DateUtil.format(expireDate, "yyyy-MM-dd HH:mm"));
|
||||
dataParam.put("thing3", configContent);
|
||||
|
||||
// 构建extra，只包含data和page
|
||||
Map<String, Object> extra = new HashMap<>();
|
||||
extra.put("data", dataParam);
|
||||
extra.put("page", page);
|
||||
|
||||
// 使用ZT消息服务发送通知（第三次通知 - 过期提醒）
|
||||
ZtMessage msg = new ZtMessage();
|
||||
msg.setChannelId(templateId);
|
||||
msg.setTitle(title);
|
||||
msg.setContent("【" + item.getFaceId() + "】"+configContent);
|
||||
msg.setTarget(member.getOpenId());
|
||||
msg.setExtra(extra);
|
||||
msg.setSendReason("第三次通知");
|
||||
msg.setSendBiz("定时通知");
|
||||
ztMessageProducerService.send(msg);
|
||||
// 发送模板消息
|
||||
HashMap<String, Object> variables = new HashMap<>();
|
||||
ScenicV2DTO scenic = scenicRepository.getScenicBasic(item.getScenicId());
|
||||
variables.put("scenicName", scenic.getName());
|
||||
variables.put("scenicId", scenic.getId());
|
||||
variables.put("faceId", item.getFaceId());
|
||||
variables.put("expireDate", expireDate);
|
||||
WechatSubscribeNotifyTriggerRequest request = WechatSubscribeNotifyTriggerRequest.builder()
|
||||
.scenicId(item.getScenicId())
|
||||
.memberId(item.getMemberId())
|
||||
.openId(member.getOpenId())
|
||||
.bizId(String.valueOf(item.getId()))
|
||||
.variables(variables)
|
||||
.build();
|
||||
WechatSubscribeNotifyTriggerResult result = notifyTriggerService.trigger("EXPIRE_NOTIFY", request);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -254,57 +178,18 @@ public class DownloadNotificationTasker {
|
||||
|
||||
MemberRespVO member = memberMapper.getById(item.getMemberId());
|
||||
// 发送模板消息
|
||||
String templateId = scenicRepository.getVideoDownloadTemplateId(item.getScenicId());
|
||||
if (StringUtils.isBlank(templateId)) {
|
||||
log.info("模板消息为空");
|
||||
return;
|
||||
}
|
||||
|
||||
// 检查并消费通知授权
|
||||
if (!notificationAuthUtils.checkAndConsumeAuthorization(item.getMemberId(), templateId, item.getScenicId())) {
|
||||
log.debug("用户[memberId={}]对模板[templateId={}]授权不足，跳过额外下载通知", item.getMemberId(), templateId);
|
||||
return;
|
||||
}
|
||||
|
||||
ScenicConfigManager configManager = scenicRepository.getScenicConfigManager(scenicId);
|
||||
String configTitle = configManager.getString("second_notification_title");
|
||||
String configContent = configManager.getString("second_notification_content");
|
||||
|
||||
if (StringUtils.isBlank(configTitle) || StringUtils.isBlank(configContent)) {
|
||||
log.info("景区[{}]未配置第一次通知内容，跳过发送通知", scenic.getName());
|
||||
return;
|
||||
}
|
||||
|
||||
String title = configTitle.replace("【景区】", scenic.getName());
|
||||
String page;
|
||||
if (configManager.getBoolean("grouping_enable", false)) {
|
||||
page = "pages/travelVideoCenter/index?type=2&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId();
|
||||
} else {
|
||||
page = "pages/videoSynthesis/index?type=2&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId();
|
||||
}
|
||||
/**
|
||||
* 景区 {{thing1.DATA}}
|
||||
* 备注 {{thing3.DATA}}
|
||||
*/
|
||||
Map<String, Object> dataParam = new HashMap<>();
|
||||
dataParam.put("thing1", title);
|
||||
dataParam.put("thing3", configContent);
|
||||
|
||||
// 构建extra，只包含data和page
|
||||
Map<String, Object> extra = new HashMap<>();
|
||||
extra.put("data", dataParam);
|
||||
extra.put("page", page);
|
||||
|
||||
// 使用ZT消息服务发送通知（额外下载通知）
|
||||
ZtMessage msg = new ZtMessage();
|
||||
msg.setChannelId(templateId);
|
||||
msg.setTitle(title);
|
||||
msg.setContent("【" + item.getFaceId() + "】"+configContent);
|
||||
msg.setTarget(member.getOpenId());
|
||||
msg.setExtra(extra);
|
||||
msg.setSendReason("景区额外配置：" + scenicConfig.getString("extra_notification_time"));
|
||||
msg.setSendBiz("定时通知");
|
||||
ztMessageProducerService.send(msg);
|
||||
HashMap<String, Object> variables = new HashMap<>();
|
||||
variables.put("scenicName", scenic.getName());
|
||||
variables.put("scenicId", scenic.getId());
|
||||
variables.put("faceId", item.getFaceId());
|
||||
WechatSubscribeNotifyTriggerRequest request = WechatSubscribeNotifyTriggerRequest.builder()
|
||||
.scenicId(item.getScenicId())
|
||||
.memberId(item.getMemberId())
|
||||
.openId(member.getOpenId())
|
||||
.bizId(String.valueOf(item.getId()))
|
||||
.variables(variables)
|
||||
.build();
|
||||
WechatSubscribeNotifyTriggerResult result = notifyTriggerService.trigger("TIME_TRIGGER_NOTIFY", request);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user