From 31b9220a32f642e097cc60408d6932e225c64f70 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Sat, 10 Jan 2026 20:30:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(notification):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=BB=BB=E5=8A=A1=E7=BB=9F=E8=AE=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=88=B0=E5=BE=AE=E4=BF=A1=E8=AE=A2=E9=98=85=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在任务服务中添加视频设备数量、镜头数量和拍摄时间变量 - 注入VideoTaskRepository依赖以获取任务统计数据 - 更新下载通知任务器中的变量映射逻辑 - 格式化日期时间为yyyy-MM-dd HH:mm格式 - 移除未使用的导入和重复的依赖注入 --- .../service/task/impl/TaskTaskServiceImpl.java | 3 +++ .../basic/task/DownloadNotificationTasker.java | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java index 7c4f3dbb..aad74d8a 100644 --- a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java @@ -641,6 +641,9 @@ public class TaskTaskServiceImpl implements TaskService { variables.put("scenicName", scenic.getName()); variables.put("faceId", item.getFaceId()); 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")); WechatSubscribeNotifyTriggerRequest request = WechatSubscribeNotifyTriggerRequest.builder() diff --git a/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java b/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java index d631c947..2128c09d 100644 --- a/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java +++ b/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java @@ -14,11 +14,9 @@ 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.repository.VideoTaskRepository; import com.ycwl.basic.service.notify.WechatSubscribeNotifyTriggerService; import com.ycwl.basic.utils.NotificationAuthUtils; import lombok.extern.slf4j.Slf4j; @@ -56,6 +54,8 @@ public class DownloadNotificationTasker { private ZtMessageProducerService ztMessageProducerService; @Autowired private NotificationAuthUtils notificationAuthUtils; + @Autowired + private VideoTaskRepository videoTaskRepository; @Scheduled(cron = "0 0 21 * * *") public void sendDownloadNotification() { @@ -81,6 +81,9 @@ public class DownloadNotificationTasker { variables.put("scenicName", scenic.getName()); variables.put("scenicId", scenic.getId()); 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() .scenicId(item.getScenicId()) .memberId(item.getMemberId()) @@ -122,7 +125,10 @@ public class DownloadNotificationTasker { variables.put("scenicName", scenic.getName()); variables.put("scenicId", scenic.getId()); 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() .scenicId(item.getScenicId()) .memberId(item.getMemberId()) @@ -182,6 +188,9 @@ public class DownloadNotificationTasker { variables.put("scenicName", scenic.getName()); variables.put("scenicId", scenic.getId()); 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() .scenicId(item.getScenicId()) .memberId(item.getMemberId())