From 4aaab689ed4e94dd9e34ec22c661b3227befe8a8 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 27 四月 2022 18:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/quartz/LightTimerJob.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/quartz/LightTimerJob.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/quartz/LightTimerJob.java
index e00c14b..4c5de3c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/quartz/LightTimerJob.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/quartz/LightTimerJob.java
@@ -1,9 +1,11 @@
package com.sandu.ximon.admin.quartz;
import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.common.util.ThrowableUtil;
import com.sandu.ximon.admin.service.*;
+import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.domain.LightTaskQuartz;
import com.sandu.ximon.dao.domain.LightTaskQuartzLog;
import org.quartz.JobExecutionContext;
@@ -43,6 +45,7 @@
try {
// 浠诲姟缁戝畾鐨勭伅鏉�
List<Long> poleIdList = lightTaskPoleRelationService.listPoleIdByTaskId(taskId);
+ String lightAdress = lightTaskService.getOne(Wrappers.lambdaQuery(LightTask.class).eq(LightTask::getTaskId, taskId)).getLightAdress();
// 鐏潌鐨勮澶囩爜
List<String> deviceCodeList = poleService.listDeviceCodeByIds(poleIdList);
@@ -51,7 +54,7 @@
if (lightTaskQuartz != null) {
for (String deviceCode : deviceCodeList) {
// 瀹氭椂缁欐瘡涓澶囧悧鍙戦�佺伅鎺ц姹�
- lightTaskService.sendTimeRRpc(lightTaskQuartz.getFramePayload(), deviceCode);
+ lightTaskService.sendTimeRRpc(lightTaskQuartz.getFramePayload(), deviceCode, lightAdress);
}
log.setFramePayload(lightTaskQuartz.getFramePayload());
}
--
Gitblit v1.9.3