diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index ffabff7b..228f2f67 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -12,9 +12,9 @@ public interface LauncherConstant { /** * nacos 命名空间 */ - String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; + //String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; // 生产环境 -// String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; + String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; // 测试环境 // String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/ehs/AcidMistTowerProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/ehs/AcidMistTowerProcessor.java new file mode 100644 index 00000000..9c05e73c --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/ehs/AcidMistTowerProcessor.java @@ -0,0 +1,41 @@ +package org.springblade.job.processor.ehs; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.ehs.feign.IAcidMistTowerClient; +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; + +/** + * 酸雾塔报警记录查询定时任务处理器 + * 定期查询酸雾塔报警记录数据 + * + * @author BladeX + */ +@Component +@Data +@Slf4j +public class AcidMistTowerProcessor implements BasicProcessor { + + @Resource + private IAcidMistTowerClient acidMistTowerClient; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + log.info("========== 开始执行酸雾塔报警记录查询定时任务 =========="); + log.info("任务参数: {}", context.getJobParams()); + try { + acidMistTowerClient.rpAcidMistTower("rpAcidMistTower"); + log.info("酸雾塔报警记录查询成功"); + } catch (Exception e) { + log.error("酸雾塔报警记录查询异常", e); + return new ProcessResult(false, "酸雾塔报警记录查询失败: " + e.getMessage()); + } + + log.info("========== 酸雾塔报警记录查询定时任务执行完毕 =========="); + return new ProcessResult(true); + } +} diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/ehs/BsTowerSosRecProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/ehs/BsTowerSosRecProcessor.java new file mode 100644 index 00000000..8db5e5bb --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/ehs/BsTowerSosRecProcessor.java @@ -0,0 +1,39 @@ +package org.springblade.job.processor.ehs; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.ehs.feign.IAcidMistTowerClient; +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; + +/** + * 开始酸雾塔PH报警 + * @author BladeX + */ +@Component +@Data +@Slf4j +public class BsTowerSosRecProcessor implements BasicProcessor { + + @Resource + private IAcidMistTowerClient acidMistTowerClient; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + log.info("========== 开始酸雾塔PH报警...... =========="); + log.info("任务参数: {}", context.getJobParams()); + try { + acidMistTowerClient.rpAcidMistTower("towerSosRec"); + log.info("开始酸雾塔PH报警成功"); + } catch (Exception e) { + log.error("开始酸雾塔PH报警异常", e); + return new ProcessResult(false, "开始酸雾塔PH报警失败: " + e.getMessage()); + } + + log.info("========== 开始酸雾塔PH报警定时任务执行完毕 =========="); + return new ProcessResult(true); + } +} diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/ehs/EnePatrolTaskProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/ehs/EnePatrolTaskProcessor.java new file mode 100644 index 00000000..d262e37c --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/ehs/EnePatrolTaskProcessor.java @@ -0,0 +1,46 @@ +package org.springblade.job.processor.ehs; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.ehs.feign.IBsEnePatrolTaskClient; +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; + +/** + * 环保巡检任务定时任务处理器 + * 定期生成环保巡检任务 + * + * @author BladeX + */ +@Component +@Data +@Slf4j +public class EnePatrolTaskProcessor implements BasicProcessor { + + @Resource + private IBsEnePatrolTaskClient bsEnePatrolTaskClient; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + log.info("========== 开始执行环保巡检任务定时任务 =========="); + log.info("任务参数: {}", context.getJobParams()); + + try { + // 判断当前小时，8点执行首次巡检，其他时间执行常规巡检 + int hour = java.time.LocalTime.now().getHour(); + boolean isFirst = (hour == 8); + + bsEnePatrolTaskClient.createEnePatrolTask(isFirst); + log.info("环保巡检任务生成成功，类型: {}", isFirst ? "首次巡检" : "常规巡检"); + } catch (Exception e) { + log.error("环保巡检任务生成异常", e); + return new ProcessResult(false, "环保巡检任务生成失败: " + e.getMessage()); + } + + log.info("========== 环保巡检任务定时任务执行完毕 =========="); + return new ProcessResult(true); + } +} diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/ehs/SafPatrolTaskProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/ehs/SafPatrolTaskProcessor.java new file mode 100644 index 00000000..d91c2ce3 --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/ehs/SafPatrolTaskProcessor.java @@ -0,0 +1,42 @@ +package org.springblade.job.processor.ehs; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.ehs.feign.IBsSafePatrolTaskClient; +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; + +/** + * 安全巡检任务定时任务处理器 + * 定期创建安全巡检任务 + * + * @author BladeX + */ +@Component +@Data +@Slf4j +public class SafPatrolTaskProcessor implements BasicProcessor { + + @Resource + private IBsSafePatrolTaskClient bsSafePatrolTaskClient; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + log.info("========== 开始执行安全巡检任务定时任务 =========="); + log.info("任务参数: {}", context.getJobParams()); + + try { + bsSafePatrolTaskClient.createSafPatrolTask(); + log.info("安全巡检任务创建成功"); + } catch (Exception e) { + log.error("安全巡检任务创建异常", e); + return new ProcessResult(false, "安全巡检任务创建失败: " + e.getMessage()); + } + + log.info("========== 安全巡检任务定时任务执行完毕 =========="); + return new ProcessResult(true); + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/ehs/feign/IAcidMistTowerClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/ehs/feign/IAcidMistTowerClient.java new file mode 100644 index 00000000..e378bea3 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/ehs/feign/IAcidMistTowerClient.java @@ -0,0 +1,20 @@ +package org.springblade.desk.ehs.feign; + +import org.springblade.core.launch.constant.AppConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * 酸雾塔报警记录查询Feign客户端接口 + */ +@FeignClient( + value = AppConstant.APPLICATION_DESK_NAME +) +public interface IAcidMistTowerClient { + + String API_PREFIX = "/feign/client/acid-mist-tower"; + String RP_ACID_MIST_TOWER = API_PREFIX + "/rp-acid-mist-tower"; + + @GetMapping(RP_ACID_MIST_TOWER) + void rpAcidMistTower(String str); +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/ehs/feign/IBsEnePatrolTaskClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/ehs/feign/IBsEnePatrolTaskClient.java new file mode 100644 index 00000000..6204782a --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/ehs/feign/IBsEnePatrolTaskClient.java @@ -0,0 +1,21 @@ +package org.springblade.desk.ehs.feign; + +import org.springblade.core.launch.constant.AppConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 环保巡检任务Feign客户端接口 + */ +@FeignClient( + value = AppConstant.APPLICATION_DESK_NAME +) +public interface IBsEnePatrolTaskClient { + + String API_PREFIX = "/feign/client/bs-ene-patrol-task"; + String CREATE_Ene_PATROL_TASK = API_PREFIX + "/create-ene-patrol-task"; + + @GetMapping(CREATE_Ene_PATROL_TASK) + void createEnePatrolTask(@RequestParam("isFirst") boolean isFirst); +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/ehs/feign/IBsSafePatrolTaskClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/ehs/feign/IBsSafePatrolTaskClient.java new file mode 100644 index 00000000..fae7bcf8 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/ehs/feign/IBsSafePatrolTaskClient.java @@ -0,0 +1,20 @@ +package org.springblade.desk.ehs.feign; + +import org.springblade.core.launch.constant.AppConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * 安全巡检任务Feign客户端接口 + */ +@FeignClient( + value = AppConstant.APPLICATION_DESK_NAME +) +public interface IBsSafePatrolTaskClient { + + String API_PREFIX = "/feign/client/bs-safe-patrol-task"; + String CREATE_SAF_PATROL_TASK = API_PREFIX + "/create-saf-patrol-task"; + + @GetMapping(CREATE_SAF_PATROL_TASK) + void createSafPatrolTask(); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/AcidMistTowerClientImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/AcidMistTowerClientImpl.java new file mode 100644 index 00000000..d5d125b1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/AcidMistTowerClientImpl.java @@ -0,0 +1,27 @@ +package org.springblade.desk.basic.feign; + +import io.swagger.v3.oas.annotations.Hidden; +import jakarta.annotation.Resource; +import org.springblade.desk.ehs.feign.IAcidMistTowerClient; +import org.springblade.desk.energy.util.HttpRequestService; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.RestController; + +/** + * 酸雾塔报警记录查询Feign客户端实现 + */ +@RestController +@Hidden +public class AcidMistTowerClientImpl implements IAcidMistTowerClient { + + @Resource + private HttpRequestService httpRequestService; + + @Value("${business.device.id}") + private String deviceId; + + @Override + public void rpAcidMistTower(String str) { + httpRequestService.getWasteWaterAndGas(deviceId, true, str); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/BsEnePatrolTaskClientImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/BsEnePatrolTaskClientImpl.java new file mode 100644 index 00000000..f5cdc8a5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/BsEnePatrolTaskClientImpl.java @@ -0,0 +1,23 @@ +package org.springblade.desk.basic.feign; + +import io.swagger.v3.oas.annotations.Hidden; +import jakarta.annotation.Resource; +import org.springblade.desk.ehs.feign.IBsEnePatrolTaskClient; +import org.springblade.desk.energy.service.IBsEpciuPatrolInspectionService; +import org.springframework.web.bind.annotation.RestController; + +/** + * 环保巡检任务Feign客户端实现 + */ +@RestController +@Hidden +public class BsEnePatrolTaskClientImpl implements IBsEnePatrolTaskClient { + + @Resource + private IBsEpciuPatrolInspectionService bsEpciuPatrolInspectionService; + + @Override + public void createEnePatrolTask(boolean isFirst) { + bsEpciuPatrolInspectionService.epInspectionTasks(isFirst); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/BsSafePatrolTaskClientImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/BsSafePatrolTaskClientImpl.java new file mode 100644 index 00000000..c3434f5b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/BsSafePatrolTaskClientImpl.java @@ -0,0 +1,23 @@ +package org.springblade.desk.basic.feign; + +import io.swagger.v3.oas.annotations.Hidden; +import jakarta.annotation.Resource; +import org.springblade.desk.ehs.feign.IBsSafePatrolTaskClient; +import org.springblade.desk.energy.service.IBsSafePatrolInspectionService; +import org.springframework.web.bind.annotation.RestController; + +/** + * 安全巡检任务Feign客户端实现 + */ +@RestController +@Hidden +public class BsSafePatrolTaskClientImpl implements IBsSafePatrolTaskClient { + + @Resource + private IBsSafePatrolInspectionService bsSafePatrolInspectionService; + + @Override + public void createSafPatrolTask() { + bsSafePatrolInspectionService.createSafPatrolTask(); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafePatrolInspectionServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafePatrolInspectionServiceImpl.java index bfa916b5..05f9627f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafePatrolInspectionServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafePatrolInspectionServiceImpl.java @@ -90,9 +90,9 @@ public class BsSafePatrolInspectionServiceImpl extends BaseServiceImpl ipLiST = bsSafeInspectionPointService.list(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/task/OrderSafeJob.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/task/OrderSafeJob.java index 67880b65..8c620ce4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/task/OrderSafeJob.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/task/OrderSafeJob.java @@ -30,10 +30,10 @@ public class OrderSafeJob { public void createSafPatrolTask() { log.info("开始创建安全巡检任务定时器运行..."); - if ("false".equals(jobSafeEnable)) { - log.info("同步创建安全巡检任务定时器运行...已关闭..."); - return; - } + //if ("false".equals(jobSafeEnable)) { + // log.info("同步创建安全巡检任务定时器运行...已关闭..."); + // return; + //} //安全巡检任务定时器运行... bsSafePatrolInspectionService.createSafPatrolTask();