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

@@ -419,9 +419,26 @@
                dataView.setPreDataN(mmItemResultService.getData(outPut.getId(), predictTime, endTime, timeFormat));
                dataView.setPreDataL(mmItemResultLastPointService.getData(outPut.getId(), startTime, endTime, timeFormat));
                break;
            case CL:
                dataView.setPreDataN(mmItemResultService.getData(outPut.getId(), predictTime, endTime, timeFormat));
                dataView.setPreDataL(mmItemResultLastPointService.getData(outPut.getId(), startTime, endTime, timeFormat));
                break;
            default:
                break;
        }

        //处理预测累计
        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);
            dataView.setCumulantPreData(cumulantPreList);
            if (!CollectionUtils.isEmpty(cumulantPreList)) {
                dataView.setCumulantPreValue(cumulantPreList.get(cumulantPreList.size() - 1)[1]);
            }
        }

        if (!CollectionUtils.isEmpty(dataView.getRealData())) {
            Object[] rdo = dataView.getRealData().get(dataView.getRealData().size() - 1);
            dataView.setCurrValue(new BigDecimal(rdo[1].toString()));
@@ -439,7 +456,8 @@

        String alarmObj = chartParams.get(CommonConstant.ALARM_OBJ);
        if (StringUtils.isNotBlank(alarmObj)) {
            List<AlarmMessageRespDTO> alarmList = ConvertUtils.sourceToTarget(mmPredictAlarmMessageService.getList(alarmObj, predictTime), AlarmMessageRespDTO.class);
            String alarmTitle = chartParams.get(CommonConstant.ALARM_TITLE);
            List<AlarmMessageRespDTO> alarmList = ConvertUtils.sourceToTarget(mmPredictAlarmMessageService.getList(alarmObj, predictTime, alarmTitle), AlarmMessageRespDTO.class);
            dataView.setAlarmList(alarmList);
            if (CollectionUtils.isEmpty(alarmList)) {
                dataView.setAlarmMessage("暂无预警信息");