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 new file mode 100644 index 00000000..6ca47821 --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/CertificateMaintenanceProcessor.java @@ -0,0 +1,27 @@ +package org.springblade.job.processor.jobtransfer; + +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.device.feign.IotEquipmentTaskClient; +import org.springblade.desk.jobtransfer.feign.JobTransferTaskClient; +import org.springframework.stereotype.Component; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; + +/** + * 证书状态更新任务 + */ +@Component +@Slf4j +public class CertificateMaintenanceProcessor implements BasicProcessor { + + @Resource + private JobTransferTaskClient jobTransferTaskClient; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + jobTransferTaskClient.certificateMaintenanceTask(); + 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 new file mode 100644 index 00000000..fc1d94a9 --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/CultivateDetailProcessor.java @@ -0,0 +1,26 @@ +package org.springblade.job.processor.jobtransfer; + +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.jobtransfer.feign.JobTransferTaskClient; +import org.springframework.stereotype.Component; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; + +/** + * 培训安排状态更新任务 + */ +@Component +@Slf4j +public class CultivateDetailProcessor implements BasicProcessor { + + @Resource + private JobTransferTaskClient jobTransferTaskClient; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + jobTransferTaskClient.cultivateDetailTask(); + 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 new file mode 100644 index 00000000..5105021d --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/jobtransfer/EquipmentMaintenanceProcessor.java @@ -0,0 +1,26 @@ +package org.springblade.job.processor.jobtransfer; + +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.jobtransfer.feign.JobTransferTaskClient; +import org.springframework.stereotype.Component; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; + +/** + * 设备状态更新任务 + */ +@Component +@Slf4j +public class EquipmentMaintenanceProcessor implements BasicProcessor { + + @Resource + private JobTransferTaskClient jobTransferTaskClient; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + jobTransferTaskClient.equipmentMaintenanceTask(); + return new ProcessResult(true); + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/feign/JobTransferTaskClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/feign/JobTransferTaskClient.java new file mode 100644 index 00000000..50a98c6c --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/feign/JobTransferTaskClient.java @@ -0,0 +1,45 @@ +package org.springblade.desk.jobtransfer.feign; + +import org.springblade.core.launch.constant.AppConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +@FeignClient( + value = AppConstant.APPLICATION_DESK_NAME +) +/** + * 更新上岗证相关信息 + */ +public interface JobTransferTaskClient { + + String API_PREFIX = "/feign/job-transfer/update-task"; + + //证书状态更新 + String CERTIFICATE_MAINTENANCE_TASK = API_PREFIX + "/certificate-maintenance-task"; + + //设备状态更新 + String EQUIPMENT_MAINTENANCE_TASK = API_PREFIX + "/equipment-maintenance-task"; + + //培训安排状态更新 + String CULTIVATE_DETAIL_TASK = API_PREFIX + "/cultivate-detail-task"; + + + /** + * 证书状态更新 + */ + @GetMapping(CERTIFICATE_MAINTENANCE_TASK) + void certificateMaintenanceTask(); + + /** + * 设备状态更新 + */ + @GetMapping(EQUIPMENT_MAINTENANCE_TASK) + void equipmentMaintenanceTask(); + + /** + * 培训安排状态更新 + */ + @GetMapping(CULTIVATE_DETAIL_TASK) + void cultivateDetailTask(); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java index d62f8fc9..1d71459e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java @@ -201,18 +201,18 @@ public class CertificateMaintenanceController extends BladeController { return certificateMaintenanceService.saveExcelData(importList); } - @PostConstruct // 项目启动后立即执行一次 - public void init() { - updateMaintenanceStatus(); - } - - /** - * 更新证书维护状态 - * TODO 以后需要交由PowerJob服务统一管理 - */ +// @PostConstruct // 项目启动后立即执行一次 +// public void init() { +// updateMaintenanceStatus(); +// } +// +// /** +// * 更新证书维护状态 +// * TODO 以后需要交由PowerJob服务统一管理 +// */ // @Scheduled(cron = "0 0 0 * * ?") // 每天凌晨0点执行 - public void updateMaintenanceStatus() { - certificateMaintenanceService.updateMaintenanceStatus(); - } +// public void updateMaintenanceStatus() { +// certificateMaintenanceService.updateMaintenanceStatus(); +// } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CultivateDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CultivateDetailController.java index 53260b07..edf51c03 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CultivateDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CultivateDetailController.java @@ -199,18 +199,18 @@ public class CultivateDetailController extends BladeController { return cultivateDetailService.trainingCompleted(cultivateDetails); } - @PostConstruct // 项目启动后立即执行一次 - public void init() { - exceed(); - } - - /** - * 更新培训记录超期状态 - * TODO 以后需要交由PowerJob服务统一管理 - */ - @Scheduled(cron = "0 0 0 * * ?") // 每天凌晨0点执行 - public void exceed() { - cultivateDetailService.exceed(); - } +// @PostConstruct // 项目启动后立即执行一次 +// public void init() { +// exceed(); +// } +// +// /** +// * 更新培训记录超期状态 +// * TODO 以后需要交由PowerJob服务统一管理 +// */ +// @Scheduled(cron = "0 0 0 * * ?") // 每天凌晨0点执行 +// public void exceed() { +// cultivateDetailService.exceed(); +// } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java index dec12458..7cd45b5b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java @@ -201,18 +201,18 @@ public class EquipmentMaintenanceController extends BladeController { return equipmentMaintenanceService.saveExcelData(importList); } - @PostConstruct // 项目启动后立即执行一次 - public void init() { - updateMaintenanceStatus(); - } - - /** - * 更新设备维护状态 - * TODO 以后需要交由PowerJob服务统一管理 - */ - @Scheduled(cron = "0 0 0 * * ?") // 每天凌晨0点执行 - public void updateMaintenanceStatus() { - equipmentMaintenanceService.updateMaintenanceStatus(); - } +// @PostConstruct // 项目启动后立即执行一次 +// public void init() { +// updateMaintenanceStatus(); +// } +// +// /** +// * 更新设备维护状态 +// * TODO 以后需要交由PowerJob服务统一管理 +// */ +// @Scheduled(cron = "0 0 0 * * ?") // 每天凌晨0点执行 +// public void updateMaintenanceStatus() { +// equipmentMaintenanceService.updateMaintenanceStatus(); +// } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/feign/JobTransferTaskClientImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/feign/JobTransferTaskClientImpl.java new file mode 100644 index 00000000..0cde903a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/feign/JobTransferTaskClientImpl.java @@ -0,0 +1,41 @@ +package org.springblade.desk.jobtransfer.feign; + +import io.swagger.v3.oas.annotations.Hidden; +import jakarta.annotation.Resource; +import org.springblade.desk.device.feign.IotEquipmentTaskClient; +import org.springblade.desk.device.service.IEquipmentService; +import org.springblade.desk.device.service.IFeiBaSetService; +import org.springblade.desk.device.service.IRecorderService; +import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService; +import org.springblade.desk.jobtransfer.service.ICultivateDetailService; +import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Hidden +public class JobTransferTaskClientImpl implements JobTransferTaskClient { + + @Resource + private ICertificateMaintenanceService certificateMaintenanceService; + + @Resource + private IEquipmentMaintenanceService equipmentMaintenanceService; + + @Resource + private ICultivateDetailService cultivateDetailService; + + @Override + public void certificateMaintenanceTask() { + certificateMaintenanceService.updateMaintenanceStatus(); + } + + @Override + public void equipmentMaintenanceTask() { + equipmentMaintenanceService.updateMaintenanceStatus(); + } + + @Override + public void cultivateDetailTask() { + cultivateDetailService.exceed(); + } +}