From 58deca20c8968167cef74efb0613cf7194f88536 Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期一, 21 四月 2025 09:02:40 +0800 Subject: [PATCH] 焦化概况 --- ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java | 37 ++++++++++++------------------------- 1 files changed, 12 insertions(+), 25 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java index 6b3a765..4c5db81 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java @@ -1,33 +1,22 @@ package com.iailab.module.ansteel.job.task; import com.iailab.framework.common.util.date.DateUtils; -import com.iailab.module.ansteel.api.entity.CokingProcessConfEntity; -import com.iailab.module.ansteel.api.entity.CokingProdDayEntity; -import com.iailab.module.ansteel.api.service.CokingProcessConfService; -import com.iailab.module.ansteel.api.service.CokingProdDayService; +import com.iailab.module.ansteel.coking.entity.CokingProcessConfEntity; +import com.iailab.module.ansteel.coking.entity.CokingProdDayEntity; +import com.iailab.module.ansteel.coking.service.CokingProcessConfService; +import com.iailab.module.ansteel.coking.service.CokingProdDayService; import com.iailab.module.ansteel.common.enums.ProcessConfDataTypeEnum; import com.iailab.module.data.api.ind.IndItemApi; import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO; import com.iailab.module.data.api.point.DataPointApi; -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.ObjectUtils; 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 javax.annotation.Resource; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.stream.Collectors; /** * 生成焦化日前生产信息 @@ -58,10 +47,6 @@ public void run(String params) { logger.info("RunCokingProdDayTask,参数为:{}", params); try { - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.MILLISECOND, 0); - calendar.set(Calendar.SECOND, 0); - CokingProcessConfEntity queryParams = new CokingProcessConfEntity(); queryParams.setIndType("prod_day"); List<CokingProcessConfEntity> list = cokingProcessConfService.list(queryParams); @@ -70,11 +55,11 @@ return; } - Calendar calendar1 = Calendar.getInstance(); - calendar1.set(Calendar.MILLISECOND, 0); - calendar1.set(Calendar.SECOND, 0); - calendar1.add(Calendar.DAY_OF_YEAR, -1); - String clock = DateUtils.format(calendar1.getTime(), DateUtils.FORMAT_YEAR_MONTH_DAY); + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.MILLISECOND, 0); + calendar.set(Calendar.SECOND, 0); + calendar.add(Calendar.DAY_OF_YEAR, -1); + String clock = DateUtils.format(calendar.getTime(), DateUtils.FORMAT_YEAR_MONTH_DAY); logger.info("清理旧数据"); cokingProdDayService.deleteByClock(clock); for (CokingProcessConfEntity conf : list) { @@ -96,12 +81,14 @@ break; case IND: List<ApiIndItemValueDTO> indValues = indItemApi.queryIndItemDefaultValue(conf.getPointNo()); + if (!CollectionUtils.isEmpty(indValues)) { + value = indValues.get(indValues.size() - 1).getDataValue().toString(); + } break; default: break; } - this.saveProdDay(conf, value, clock); } } catch (Exception ex) { -- Gitblit v1.9.3