处理预测累计

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java

@@ -428,13 +428,13 @@

        //处理预测累计
        if (outPut.getIscumulant() != null && outPut.getIscumulant() == 1) {
            if (StringUtils.isNotBlank(outPut.getCumulpoint())) {
                dataView.setCumulantRealData(getHisData(outPut.getCumulpoint(), predictTime, endTime));
            }
            List<Object[]> cumulantPreList = mmItemResultService.getData(outPut.getId() + CommonDict.CUMULANT_SUFFIX, predictTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
            /*if (StringUtils.isNotBlank(outPut.getCumulpoint())) {
                dataView.setCumulantRealData(getHisData(outPut.getCumulpoint(), startTime, endTime));
            }*/
            List<Object[]> cumulantPreList = mmItemResultService.getData(outPut.getId() + CommonDict.CUMULANT_SUFFIX, startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
            dataView.setCumulantPreData(cumulantPreList);
            if (!CollectionUtils.isEmpty(cumulantPreList)) {
                dataView.setCumulantPreValue(cumulantPreList.get(cumulantPreList.size() - 1)[1]);
                dataView.setCumulantPreLast(new BigDecimal(cumulantPreList.get(cumulantPreList.size() - 1)[1].toString()).setScale(2, BigDecimal.ROUND_HALF_UP));
            }
        }

@@ -486,19 +486,6 @@
            }
        } catch (Exception ex) {
            ex.printStackTrace();
        }
        List<MmItemOutputEntity> outs = mmItemOutputService.getByItemid(predictItem.getId());
        for (MmItemOutputEntity out : outs) {
            //处理预测累计
            if (out.getIscumulant() == 1) {
                dataView.setCumulantPreData(mmItemResultService.getData(out.getId() + CommonDict.CUMULANT_SUFFIX, startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
            }
        }
        if (!CollectionUtils.isEmpty(dataView.getCumulantPreData())) {
            List<Double> cumulantPreList = dataView.getCumulantPreData().stream().map(t -> {
                return new Double(t[1].toString());
            }).collect(Collectors.toList());
            dataView.setCumulantPreLast(new BigDecimal(cumulantPreList.get(cumulantPreList.size() - 1)).setScale(2, BigDecimal.ROUND_HALF_UP));
        }

        result.setPredictTime(predictTime);