From 05a87429b7460c6fd1e0c4eb8793a4d4d443e6ef Mon Sep 17 00:00:00 2001 From: qinyulong Date: Thu, 29 Jan 2026 18:30:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=BC=82?= =?UTF-8?q?=E6=AD=A5=E6=89=A7=E8=A1=8C=EF=BC=8C=E6=89=93=E5=8D=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processor/device/IotEquipmentProcessor.java | 16 ++++++++++++++-- .../job/processor/device/IotFeiBaProcessor.java | 14 +++++++++++++- .../processor/device/IotRecorderProcessor.java | 14 +++++++++++++- .../CertificateMaintenanceProcessor.java | 14 +++++++++++++- .../jobtransfer/CultivateDetailProcessor.java | 14 +++++++++++++- .../EquipmentMaintenanceProcessor.java | 14 +++++++++++++- 6 files changed, 79 insertions(+), 7 deletions(-) diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/device/IotEquipmentProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/device/IotEquipmentProcessor.java index a9e006c0..08af9303 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/device/IotEquipmentProcessor.java +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/device/IotEquipmentProcessor.java @@ -1,6 +1,7 @@ package org.springblade.job.processor.device; import jakarta.annotation.Resource; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springblade.desk.device.feign.IotEquipmentTaskClient; import org.springblade.desk.quality.feign.ILquidTankTaskClient; @@ -10,9 +11,12 @@ import tech.powerjob.worker.core.processor.TaskContext; import tech.powerjob.worker.core.processor.sdk.BasicProcessor; import tech.powerjob.worker.log.OmsLogger; +import java.util.concurrent.CompletableFuture; + /** - * 同步设备数据任务 + * 同步IOT设备数据任务 */ +@Data @Component @Slf4j public class IotEquipmentProcessor implements BasicProcessor { @@ -22,7 +26,15 @@ public class IotEquipmentProcessor implements BasicProcessor { @Override public ProcessResult process(TaskContext context) throws Exception { - iotEquipmentTaskClient.synchronizeEquipmentTask(); + log.info("同步IOT设备数据任务开始"); + CompletableFuture runFuture = CompletableFuture.runAsync(() -> iotEquipmentTaskClient.synchronizeEquipmentTask()); + runFuture.whenComplete((result, exception) -> { + if (exception != null) { + log.error("同步IOT设备数据任务失败", exception); + } else { + log.info("同步IOT设备数据任务完毕"); + } + }); return new ProcessResult(true); } } diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/device/IotFeiBaProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/device/IotFeiBaProcessor.java index e8f42868..e2cb5899 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/device/IotFeiBaProcessor.java +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/device/IotFeiBaProcessor.java @@ -1,6 +1,7 @@ package org.springblade.job.processor.device; import jakarta.annotation.Resource; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springblade.desk.device.feign.IotEquipmentTaskClient; import org.springframework.stereotype.Component; @@ -8,9 +9,12 @@ import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.TaskContext; import tech.powerjob.worker.core.processor.sdk.BasicProcessor; +import java.util.concurrent.CompletableFuture; + /** * 同步飞靶数据任务 */ +@Data @Component @Slf4j public class IotFeiBaProcessor implements BasicProcessor { @@ -20,7 +24,15 @@ public class IotFeiBaProcessor implements BasicProcessor { @Override public ProcessResult process(TaskContext context) throws Exception { - iotEquipmentTaskClient.synchronizeFeibaTask(); + log.info("同步飞靶数据任务开始"); + CompletableFuture runFuture = CompletableFuture.runAsync(() -> iotEquipmentTaskClient.synchronizeFeibaTask()); + runFuture.whenComplete((result, exception) -> { + if (exception != null) { + log.error("同步飞靶数据任务失败", exception); + } else { + log.info("同步飞靶数据任务完毕"); + } + }); return new ProcessResult(true); } } diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/device/IotRecorderProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/device/IotRecorderProcessor.java index 4999449c..f2cb331d 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/device/IotRecorderProcessor.java +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/device/IotRecorderProcessor.java @@ -1,6 +1,7 @@ package org.springblade.job.processor.device; import jakarta.annotation.Resource; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springblade.desk.device.feign.IotEquipmentTaskClient; import org.springframework.stereotype.Component; @@ -8,9 +9,12 @@ import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.TaskContext; import tech.powerjob.worker.core.processor.sdk.BasicProcessor; +import java.util.concurrent.CompletableFuture; + /** * 同步记录仪记录数据任务 */ +@Data @Component @Slf4j public class IotRecorderProcessor implements BasicProcessor { @@ -20,7 +24,15 @@ public class IotRecorderProcessor implements BasicProcessor { @Override public ProcessResult process(TaskContext context) throws Exception { - iotEquipmentTaskClient.synchronizeRecorderTask(); + log.info("同步记录仪记录数据任务开始"); + CompletableFuture runFuture = CompletableFuture.runAsync(() -> iotEquipmentTaskClient.synchronizeRecorderTask()); + runFuture.whenComplete((result, exception) -> { + if (exception != null) { + log.error("同步记录仪记录数据任务失败", exception); + } else { + log.info("同步记录仪记录数据任务完毕"); + } + }); return new ProcessResult(true); } } diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/CertificateMaintenanceProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/CertificateMaintenanceProcessor.java index 6ca47821..a5fe625b 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/CertificateMaintenanceProcessor.java +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/CertificateMaintenanceProcessor.java @@ -1,6 +1,7 @@ package org.springblade.job.processor.jobtransfer; import jakarta.annotation.Resource; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springblade.desk.device.feign.IotEquipmentTaskClient; import org.springblade.desk.jobtransfer.feign.JobTransferTaskClient; @@ -9,9 +10,12 @@ import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.TaskContext; import tech.powerjob.worker.core.processor.sdk.BasicProcessor; +import java.util.concurrent.CompletableFuture; + /** * 证书状态更新任务 */ +@Data @Component @Slf4j public class CertificateMaintenanceProcessor implements BasicProcessor { @@ -21,7 +25,15 @@ public class CertificateMaintenanceProcessor implements BasicProcessor { @Override public ProcessResult process(TaskContext context) throws Exception { - jobTransferTaskClient.certificateMaintenanceTask(); + log.info("证书状态更新任务开始"); + CompletableFuture runFuture = CompletableFuture.runAsync(() -> jobTransferTaskClient.certificateMaintenanceTask()); + runFuture.whenComplete((result, exception) -> { + if (exception != null) { + log.error("证书状态更新任务执行失败", exception); + } else { + log.info("证书状态更新任务执行完毕"); + } + }); return new ProcessResult(true); } } diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/CultivateDetailProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/CultivateDetailProcessor.java index fc1d94a9..021c4607 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/CultivateDetailProcessor.java +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/CultivateDetailProcessor.java @@ -1,6 +1,7 @@ package org.springblade.job.processor.jobtransfer; import jakarta.annotation.Resource; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springblade.desk.jobtransfer.feign.JobTransferTaskClient; import org.springframework.stereotype.Component; @@ -8,9 +9,12 @@ import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.TaskContext; import tech.powerjob.worker.core.processor.sdk.BasicProcessor; +import java.util.concurrent.CompletableFuture; + /** * 培训安排状态更新任务 */ +@Data @Component @Slf4j public class CultivateDetailProcessor implements BasicProcessor { @@ -20,7 +24,15 @@ public class CultivateDetailProcessor implements BasicProcessor { @Override public ProcessResult process(TaskContext context) throws Exception { - jobTransferTaskClient.cultivateDetailTask(); + log.info("培训安排状态更新任务开始"); + CompletableFuture runFuture = CompletableFuture.runAsync(() -> jobTransferTaskClient.cultivateDetailTask()); + runFuture.whenComplete((result, exception) -> { + if (exception != null) { + log.error("培训安排状态更新任务执行失败", exception); + } else { + log.info("培训安排状态更新任务执行完毕"); + } + }); return new ProcessResult(true); } } diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/EquipmentMaintenanceProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/EquipmentMaintenanceProcessor.java index 5105021d..0a336729 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/EquipmentMaintenanceProcessor.java +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/EquipmentMaintenanceProcessor.java @@ -1,6 +1,7 @@ package org.springblade.job.processor.jobtransfer; import jakarta.annotation.Resource; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springblade.desk.jobtransfer.feign.JobTransferTaskClient; import org.springframework.stereotype.Component; @@ -8,9 +9,12 @@ import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.TaskContext; import tech.powerjob.worker.core.processor.sdk.BasicProcessor; +import java.util.concurrent.CompletableFuture; + /** * 设备状态更新任务 */ +@Data @Component @Slf4j public class EquipmentMaintenanceProcessor implements BasicProcessor { @@ -20,7 +24,15 @@ public class EquipmentMaintenanceProcessor implements BasicProcessor { @Override public ProcessResult process(TaskContext context) throws Exception { - jobTransferTaskClient.equipmentMaintenanceTask(); + log.info("设备状态更新任务开始"); + CompletableFuture runFuture = CompletableFuture.runAsync(() -> jobTransferTaskClient.equipmentMaintenanceTask()); + runFuture.whenComplete((result, exception) -> { + if (exception != null) { + log.error("设备状态更新任务执行失败", exception); + } else { + log.info("设备状态更新任务执行完毕"); + } + }); return new ProcessResult(true); } }