You've already forked FrameTour-BE
feat(notification): 添加视频任务统计信息到微信订阅通知
- 在任务服务中添加视频设备数量、镜头数量和拍摄时间变量 - 注入VideoTaskRepository依赖以获取任务统计数据 - 更新下载通知任务器中的变量映射逻辑 - 格式化日期时间为yyyy-MM-dd HH:mm格式 - 移除未使用的导入和重复的依赖注入
This commit is contained in:
@@ -641,6 +641,9 @@ public class TaskTaskServiceImpl implements TaskService {
|
|||||||
variables.put("scenicName", scenic.getName());
|
variables.put("scenicName", scenic.getName());
|
||||||
variables.put("faceId", item.getFaceId());
|
variables.put("faceId", item.getFaceId());
|
||||||
variables.put("videoId", item.getVideoId());
|
variables.put("videoId", item.getVideoId());
|
||||||
|
variables.put("videoDeviceCount", videoTaskRepository.getTaskDeviceNum(taskId));
|
||||||
|
variables.put("videoLensCount", videoTaskRepository.getTaskLensNum(taskId));
|
||||||
|
variables.put("videoShotTime", DateUtil.format(videoTaskRepository.getTaskShotDate(taskId), "yyyy-MM-dd HH:mm"));
|
||||||
variables.put("videoCreateTime", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm"));
|
variables.put("videoCreateTime", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm"));
|
||||||
|
|
||||||
WechatSubscribeNotifyTriggerRequest request = WechatSubscribeNotifyTriggerRequest.builder()
|
WechatSubscribeNotifyTriggerRequest request = WechatSubscribeNotifyTriggerRequest.builder()
|
||||||
|
|||||||
@@ -14,11 +14,9 @@ import com.ycwl.basic.model.pc.mp.MpConfigEntity;
|
|||||||
import com.ycwl.basic.integration.common.manager.ScenicConfigManager;
|
import com.ycwl.basic.integration.common.manager.ScenicConfigManager;
|
||||||
import com.ycwl.basic.model.pc.notify.req.WechatSubscribeNotifyTriggerRequest;
|
import com.ycwl.basic.model.pc.notify.req.WechatSubscribeNotifyTriggerRequest;
|
||||||
import com.ycwl.basic.model.pc.notify.resp.WechatSubscribeNotifyTriggerResult;
|
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.model.pc.scenic.req.ScenicReqQuery;
|
||||||
import com.ycwl.basic.repository.ScenicRepository;
|
import com.ycwl.basic.repository.ScenicRepository;
|
||||||
import com.ycwl.basic.repository.TemplateRepository;
|
import com.ycwl.basic.repository.VideoTaskRepository;
|
||||||
import com.ycwl.basic.integration.common.manager.ScenicConfigManager;
|
|
||||||
import com.ycwl.basic.service.notify.WechatSubscribeNotifyTriggerService;
|
import com.ycwl.basic.service.notify.WechatSubscribeNotifyTriggerService;
|
||||||
import com.ycwl.basic.utils.NotificationAuthUtils;
|
import com.ycwl.basic.utils.NotificationAuthUtils;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -56,6 +54,8 @@ public class DownloadNotificationTasker {
|
|||||||
private ZtMessageProducerService ztMessageProducerService;
|
private ZtMessageProducerService ztMessageProducerService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private NotificationAuthUtils notificationAuthUtils;
|
private NotificationAuthUtils notificationAuthUtils;
|
||||||
|
@Autowired
|
||||||
|
private VideoTaskRepository videoTaskRepository;
|
||||||
|
|
||||||
@Scheduled(cron = "0 0 21 * * *")
|
@Scheduled(cron = "0 0 21 * * *")
|
||||||
public void sendDownloadNotification() {
|
public void sendDownloadNotification() {
|
||||||
@@ -81,6 +81,9 @@ public class DownloadNotificationTasker {
|
|||||||
variables.put("scenicName", scenic.getName());
|
variables.put("scenicName", scenic.getName());
|
||||||
variables.put("scenicId", scenic.getId());
|
variables.put("scenicId", scenic.getId());
|
||||||
variables.put("faceId", item.getFaceId());
|
variables.put("faceId", item.getFaceId());
|
||||||
|
variables.put("videoDeviceCount", videoTaskRepository.getTaskDeviceNum(item.getTaskId()));
|
||||||
|
variables.put("videoLensCount", videoTaskRepository.getTaskLensNum(item.getTaskId()));
|
||||||
|
variables.put("videoShotTime", DateUtil.format(videoTaskRepository.getTaskShotDate(item.getTaskId()), "yyyy-MM-dd"));
|
||||||
WechatSubscribeNotifyTriggerRequest request = WechatSubscribeNotifyTriggerRequest.builder()
|
WechatSubscribeNotifyTriggerRequest request = WechatSubscribeNotifyTriggerRequest.builder()
|
||||||
.scenicId(item.getScenicId())
|
.scenicId(item.getScenicId())
|
||||||
.memberId(item.getMemberId())
|
.memberId(item.getMemberId())
|
||||||
@@ -122,7 +125,10 @@ public class DownloadNotificationTasker {
|
|||||||
variables.put("scenicName", scenic.getName());
|
variables.put("scenicName", scenic.getName());
|
||||||
variables.put("scenicId", scenic.getId());
|
variables.put("scenicId", scenic.getId());
|
||||||
variables.put("faceId", item.getFaceId());
|
variables.put("faceId", item.getFaceId());
|
||||||
variables.put("expireDate", expireDate);
|
variables.put("expireDate", DateUtil.format(expireDate, "yyyy-MM-dd"));
|
||||||
|
variables.put("videoDeviceCount", videoTaskRepository.getTaskDeviceNum(item.getTaskId()));
|
||||||
|
variables.put("videoLensCount", videoTaskRepository.getTaskLensNum(item.getTaskId()));
|
||||||
|
variables.put("videoShotTime", DateUtil.format(videoTaskRepository.getTaskShotDate(item.getTaskId()), "yyyy-MM-dd HH:mm"));
|
||||||
WechatSubscribeNotifyTriggerRequest request = WechatSubscribeNotifyTriggerRequest.builder()
|
WechatSubscribeNotifyTriggerRequest request = WechatSubscribeNotifyTriggerRequest.builder()
|
||||||
.scenicId(item.getScenicId())
|
.scenicId(item.getScenicId())
|
||||||
.memberId(item.getMemberId())
|
.memberId(item.getMemberId())
|
||||||
@@ -182,6 +188,9 @@ public class DownloadNotificationTasker {
|
|||||||
variables.put("scenicName", scenic.getName());
|
variables.put("scenicName", scenic.getName());
|
||||||
variables.put("scenicId", scenic.getId());
|
variables.put("scenicId", scenic.getId());
|
||||||
variables.put("faceId", item.getFaceId());
|
variables.put("faceId", item.getFaceId());
|
||||||
|
variables.put("videoDeviceCount", videoTaskRepository.getTaskDeviceNum(item.getTaskId()));
|
||||||
|
variables.put("videoLensCount", videoTaskRepository.getTaskLensNum(item.getTaskId()));
|
||||||
|
variables.put("videoShotTime", DateUtil.format(videoTaskRepository.getTaskShotDate(item.getTaskId()), "yyyy-MM-dd HH:mm"));
|
||||||
WechatSubscribeNotifyTriggerRequest request = WechatSubscribeNotifyTriggerRequest.builder()
|
WechatSubscribeNotifyTriggerRequest request = WechatSubscribeNotifyTriggerRequest.builder()
|
||||||
.scenicId(item.getScenicId())
|
.scenicId(item.getScenicId())
|
||||||
.memberId(item.getMemberId())
|
.memberId(item.getMemberId())
|
||||||
|
|||||||
Reference in New Issue
Block a user