查询当前值修改为查询历史值

 ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceIndService.java

@@ -2,6 +2,7 @@

import com.iailab.module.ansteel.coking.entity.CokingTraceIndEntity;

import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -16,5 +17,5 @@

    void save(List<CokingTraceIndEntity> entityList);

    void saveTraceInd(String relId, String indType,String clock);
    void saveTraceInd(String relId, String indType, String clock, Date startDate, Date endDate);
}

 ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceIndServiceImpl.java

@@ -10,7 +10,9 @@
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 lombok.extern.slf4j.Slf4j;
import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
import com.iailab.module.data.api.point.dto.ApiPointsValueQueryDTO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,17 +20,14 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @author PanZhibao
 * @Description
 * @createTime 2025年04月17日
 */
@Slf4j
@Service
public class CokingTraceIndServiceImpl implements CokingTraceIndService {

@@ -59,7 +58,7 @@
    }

    @Override
    public void saveTraceInd(String relId, String indType, String clock) {
    public void saveTraceInd(String relId, String indType, String clock, Date startDate, Date endDate) {
        Map<String, Object> map = new HashMap<>();
        map.put("indType", indType);
        List<CokingTraceConfEntity> list = cokingTraceConfService.list(map);
@@ -77,17 +76,17 @@
            String value = "-2";
            switch (ProcessConfDataTypeEnum.getEumByCode(conf.getDataType())) {
                case DATAPOINT:
                    log.info("CokingTraceInd:DATAPOINT:" + conf.getPointNo());
                    List<String> points = new ArrayList<>();
                    points.add(conf.getPointNo());
                    Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
                    log.info("CokingTraceInd:pointsRealValue:{}", pointsRealValue);
                    value = new BigDecimal(pointsRealValue.get(conf.getPointNo()).toString()).setScale(2,BigDecimal.ROUND_HALF_UP) .toString();
                    ApiPointValueQueryDTO point = new ApiPointValueQueryDTO();
                    point.setPointNo(conf.getPointNo());
                    point.setStart(startDate);
                    point.setEnd(endDate);
                    List<ApiPointValueDTO> pointHistoryValue = dataPointApi.queryPointHistoryValue(point);
                    if (!CollectionUtils.isEmpty(pointHistoryValue)) {
                        value = new BigDecimal(String.valueOf(pointHistoryValue.get(pointHistoryValue.size() - 1).getV())).setScale(2,BigDecimal.ROUND_HALF_UP) .toString();
                    }
                    break;
                case IND:
                    log.info("CokingTraceInd:IND:" + conf.getPointNo());
                    List<ApiIndItemValueDTO> indValues = indItemApi.queryIndItemDefaultValue(conf.getPointNo());
                    log.info("CokingTraceInd:indValues:{}", indValues);
                    if (!CollectionUtils.isEmpty(indValues)) {
                        value = new BigDecimal(indValues.get(indValues.size() - 1).getDataValue().toString()).setScale(2,BigDecimal.ROUND_HALF_UP) .toString();
                    }

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java

@@ -8,8 +8,6 @@
import com.iailab.module.ansteel.common.enums.TraceProcessTypeEnum;
import com.iailab.module.model.api.mcs.McsApi;
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +15,6 @@

import java.util.Calendar;
import java.util.Date;
import java.util.Map;
import java.util.Objects;

/**
@@ -97,6 +94,10 @@
            Date startDate = calendar.getTime();
            String clock = DateUtils.format(startDate);

            calendar.add(Calendar.DAY_OF_YEAR, 1);
            calendar.add(Calendar.MINUTE, -3);
            Date collectStartDate = calendar.getTime();

            // 调用模型
//            MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
//            dto.setScheduleTime(calendar.getTime());
@@ -132,7 +133,7 @@
            cokingTraceDeviationService.saveTraceDeviation(relId, process, clock, result, CommonConstant.COKE_INDEX_CHARTCODE, row, SugObj);

            // 保存溯源指标
            cokingTraceIndService.saveTraceInd(relId, indType, clock);
            cokingTraceIndService.saveTraceInd(relId, indType, clock, collectStartDate, endDate);

            // 保存溯源折线图
            cokingTraceChartService.save(relId, clock, indType, startDate, endDate);

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java

@@ -93,6 +93,10 @@
            Date startDate = calendar.getTime();
            String clock = DateUtils.format(startDate);

            calendar.add(Calendar.DAY_OF_YEAR, 1);
            calendar.add(Calendar.MINUTE, -3);
            Date collectStartDate = calendar.getTime();

            // 调用模型
//            MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
//            dto.setScheduleTime(calendar.getTime());
@@ -127,7 +131,7 @@
            cokingTraceDeviationService.saveTraceDeviation(relId, process, clock, result, CommonConstant.COKE_INDEX_CHARTCODE, row, SugObj);

            // 保存溯源指标
            cokingTraceIndService.saveTraceInd(relId, indType, clock);
            cokingTraceIndService.saveTraceInd(relId, indType, clock, collectStartDate, endDate);

        } catch (Exception ex) {
            logger.error("RunCokingTraceModelGXJTask运行异常");

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java

@@ -93,6 +93,10 @@
            Date startDate = calendar.getTime();
            String clock = DateUtils.format(startDate);

            calendar.add(Calendar.DAY_OF_YEAR, 1);
            calendar.add(Calendar.MINUTE, -3);
            Date collectStartDate = calendar.getTime();

            // 调用模型
//            MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
//            dto.setScheduleTime(calendar.getTime());
@@ -128,7 +132,7 @@
            cokingTraceDeviationService.saveTraceDeviation(relId, process, clock, result, CommonConstant.COKE_INDEX_CHARTCODE, row, SugObj);

            // 保存溯源指标
            cokingTraceIndService.saveTraceInd(relId, indType, clock);
            cokingTraceIndService.saveTraceInd(relId, indType, clock,collectStartDate,endDate);

            // 保存溯源折线图
            cokingTraceChartService.save(relId, clock, indType, startDate, endDate);
@@ -139,4 +143,24 @@
        }
        logger.info("RunCokingTraceModelHCTask运行完成");
    }

    public static void main(String[] args) {
        Calendar calendar = Calendar.getInstance();
        calendar.set(Calendar.MILLISECOND, 0);
        calendar.set(Calendar.SECOND, 0);
        calendar.set(Calendar.MINUTE, 0);

        calendar.set(Calendar.HOUR_OF_DAY, 0);
        Date endDate = calendar.getTime();
        System.out.println(endDate);
        calendar.add(Calendar.DAY_OF_YEAR, -1);
        Date startDate = calendar.getTime();
        String clock = DateUtils.format(startDate);
        System.out.println(clock);

        calendar.add(Calendar.DAY_OF_YEAR, 1);
        calendar.add(Calendar.MINUTE, -3);
        Date collectStartDate = calendar.getTime();
        System.out.println(collectStartDate);
    }
}

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java

@@ -93,6 +93,10 @@
            Date startDate = calendar.getTime();
            String clock = DateUtils.format(startDate);

            calendar.add(Calendar.DAY_OF_YEAR, 1);
            calendar.add(Calendar.MINUTE, -3);
            Date collectStartDate = calendar.getTime();

            // 调用模型
//            MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
//            dto.setScheduleTime(calendar.getTime());
@@ -128,7 +132,7 @@
            cokingTraceDeviationService.saveTraceDeviation(relId, process, clock, result, CommonConstant.COKE_INDEX_CHARTCODE, row, SugObj);

            // 保存溯源指标
            cokingTraceIndService.saveTraceInd(relId, indType, clock);
            cokingTraceIndService.saveTraceInd(relId, indType, clock, collectStartDate, endDate);

            // 保存溯源折线图
            cokingTraceChartService.save(relId, clock, indType, startDate, endDate);