From b50a43845b2b05198c93b573a2e1bdc0c80a6b8c Mon Sep 17 00:00:00 2001 From: Jay <csj123456> Date: 星期五, 03 一月 2025 11:29:47 +0800 Subject: [PATCH] 增加压缩空气月指标执行任务 --- shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleAirTask.java | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleAirTask.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleAirTask.java index d5e8446..03276af 100644 --- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleAirTask.java +++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleAirTask.java @@ -1,18 +1,19 @@ package com.iailab.module.shasteel.job.task; +import com.iailab.module.model.api.mcs.McsApi; +import com.iailab.module.model.api.mcs.dto.StScheduleSchemeDTO; import com.iailab.module.model.api.mdk.MdkApi; import com.iailab.module.model.api.mdk.dto.MdkScheduleReqDTO; import com.iailab.module.model.api.mdk.dto.MdkScheduleRespDTO; +import com.iailab.module.model.enums.ScheduleTriggerMethodEnum; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; /** * 压空,计算机组比功率,计算结果写入测点 @@ -27,6 +28,9 @@ private Logger logger = LoggerFactory.getLogger(getClass()); @Autowired + private McsApi mcsApi; + + @Autowired private MdkApi mdkApi; @Override @@ -34,23 +38,27 @@ logger.info("RunScheduleAirTask,参数为:{}", params); try { Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.MILLISECOND,0); - calendar.set(Calendar.SECOND,0); + calendar.set(Calendar.MILLISECOND, 0); + calendar.set(Calendar.SECOND, 0); Date scheduleTime = calendar.getTime(); if (StringUtils.isEmpty(params)) { logger.info("参数为空"); return; } - List<String> scheduleCodeList = Arrays.asList(params.split(",")); - for (String scheduleCode : scheduleCodeList) { + + // 根据条件查找方案 + List<StScheduleSchemeDTO> schemeList = mcsApi.listScheduleScheme(ScheduleTriggerMethodEnum.JOB.getCode(), params); + if (CollectionUtils.isEmpty(schemeList)) { + logger.info("方案为空"); + return; + } + for (StScheduleSchemeDTO scheme : schemeList) { MdkScheduleReqDTO dto = new MdkScheduleReqDTO(); - dto.setScheduleTime(calendar.getTime()); - dto.setScheduleCode(scheduleCode); + dto.setScheduleTime(scheduleTime); + dto.setScheduleCode(scheme.getCode()); MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(dto); - // 结果写入测点 - - + mdkApi.scheduleModelOut(mdkScheduleRespDTO); } logger.info(params + "调度方案执行完成"); } catch (Exception ex) { -- Gitblit v1.9.3