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

@@ -322,7 +322,11 @@
            if (!CollectionUtils.isEmpty(value)) {
                value.forEach(item -> {
                    String[] ri = new String[3];
                    ri[0] = DateUtils.format(DateUtils.parse(item.getStartTime(), DateUtils.DATE_TIME_PATTERN_STRING), "yyyy-MM-dd HH:mm:00");
                    if(DateUtils.parse(item.getStartTime(), DateUtils.DATE_TIME_PATTERN_STRING).getTime() < startTime.getTime()){
                        ri[0] = DateUtils.format(startTime, "yyyy-MM-dd HH:mm:00");
                    }else {
                        ri[0] = DateUtils.format(DateUtils.parse(item.getStartTime(), DateUtils.DATE_TIME_PATTERN_STRING), "yyyy-MM-dd HH:mm:00");
                    }
                    ri[1] = DateUtils.format(DateUtils.parse(item.getEndTime(), DateUtils.DATE_TIME_PATTERN_STRING), "yyyy-MM-dd HH:mm:00");
                    ri[2] = "2";
                    if (DateUtils.parse(item.getStartTime(), "yyyyMMddHHmmss").getTime() < predictTime.getTime()) {
@@ -471,7 +475,7 @@
            preDataViewSimpleDTO.setPredictTime(preDataBarLineRespVO.getPredictTime());
            preDataViewSimpleDTO.setCurData(item.getCurData());
            preDataViewSimpleDTO.setRealData(item.getRealData());
            preDataViewSimpleDTO.setPreDataL(item.getPreDataL().stream()
            preDataViewSimpleDTO.setPreDataN(item.getPreDataN().stream()
                    .filter(data -> (DateUtils.parse(data[0].toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)).before(preDataBarLineRespVO.getPredictTime()))
                    .collect(Collectors.toList()));
            preDataViewSimpleDTOList.add(preDataViewSimpleDTO);