动态上下限日期修改

 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java

@@ -200,7 +200,7 @@
            List<Object[]> newList = new ArrayList<>();
            trendsDataHList.forEach(item -> {
                Object[] dataItem = new Object[2];
                dataItem[0] = item.getT();
                dataItem[0] = DateUtils.format(item.getT(), "yyyy-MM-dd HH:mm:00");
                dataItem[1] = item.getV();
                newList.add(dataItem);
            });
@@ -216,7 +216,7 @@
            List<Object[]> newList = new ArrayList<>();
            trendsDataLList.forEach(item -> {
                Object[] dataItem = new Object[2];
                dataItem[0] = item.getT();
                dataItem[0] = DateUtils.format(item.getT(), "yyyy-MM-dd HH:mm:00");
                dataItem[1] = item.getV();
                newList.add(dataItem);
            });

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

@@ -4,7 +4,6 @@
import com.iailab.module.ansteel.coking.dao.CokingTraceConfDao;
import com.iailab.module.ansteel.coking.entity.CokingTraceConfEntity;
import com.iailab.module.ansteel.coking.service.CokingTraceConfService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,14 +28,13 @@
    public List<CokingTraceConfEntity> list(Map<String, Object> params) {
        String indType = (String) params.get("indType");
        String ext1 = (String) params.get("ext1");
        String ext2 = (String) params.get("ext2");
        if (StringUtils.isBlank(indType)) {
            return new ArrayList<>();
        }

        QueryWrapper<CokingTraceConfEntity> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("ind_type", indType);
        queryWrapper.eq(StringUtils.isNotBlank(ext1),"ext1", ext1).or().eq(StringUtils.isNotBlank(ext2),"ext2", ext2);
        queryWrapper.eq("ind_type", indType)
                .eq(StringUtils.isNotBlank(ext1),"ext1", ext1);
        return cokingTraceConfDao.selectList(queryWrapper);
    }
}

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

@@ -165,7 +165,6 @@
        Map<String, Object> map = new HashMap<>();
        map.put("indType", indType);
        map.put("ext1", "chart");
        map.put("ext2", "chart2");
        List<CokingTraceConfEntity> list = cokingTraceConfService.list(map);
        if (CollectionUtils.isEmpty(list)) {
            return;
@@ -174,8 +173,7 @@

        List<CokingTraceChartEntity> entityList = new ArrayList<>();

        List<CokingTraceConfEntity> listMin = list.stream().filter(e -> e.getExt1().equals("chart")).collect(Collectors.toList());
        logger.info("listMin===", JSON.toJSON(listMin).toString());
        List<CokingTraceConfEntity> listMin = list.stream().filter(e -> e.getIndCode().equals("BMSY025")).collect(Collectors.toList());

        listMin.forEach(value -> {
            CokingTraceChartEntity cokingTraceChartEntity = new CokingTraceChartEntity();
@@ -190,8 +188,7 @@
            entityList.add(cokingTraceChartEntity);
        });

        List<CokingTraceConfEntity> listMonth = list.stream().filter(e -> e.getExt2().equals("chart2")).collect(Collectors.toList());
        logger.info("listMonth===", JSON.toJSON(listMonth).toString());
        List<CokingTraceConfEntity> listMonth = list.stream().filter(e -> e.getIndCode().equals("BMSY026")).collect(Collectors.toList());

        listMonth.forEach(value -> {
            CokingTraceChartEntity cokingTraceChartEntity = new CokingTraceChartEntity();