From fed257d4ee8c5f09affe0fb4611933d1f7ec724e Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期二, 14 一月 2025 23:19:39 +0800 Subject: [PATCH] 获取最后预测值 --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 407 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 389 insertions(+), 18 deletions(-) diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java index 623c97d..ebe9567 100644 --- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java +++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java @@ -1,17 +1,39 @@ package com.iailab.module.model.api; +import com.iailab.framework.common.pojo.PageResult; import com.iailab.framework.common.util.date.DateUtils; +import com.iailab.framework.common.util.object.ConvertUtils; +import com.iailab.module.data.api.plan.PlanItemApi; +import com.iailab.module.data.api.plan.dto.ApiPlanDataDTO; import com.iailab.module.data.api.point.DataPointApi; import com.iailab.module.data.api.point.dto.ApiPointDTO; import com.iailab.module.data.api.point.dto.ApiPointValueDTO; import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO; +import com.iailab.module.data.common.ApiDataQueryDTO; import com.iailab.module.model.api.mcs.McsApi; import com.iailab.module.model.api.mcs.dto.*; +import com.iailab.module.model.common.enums.DataTypeEnum; +import com.iailab.module.model.enums.CommonConstant; +import com.iailab.module.model.common.enums.PreLineTypeEnum; +import com.iailab.module.model.influxdb.pojo.InfluxModelResultByOutPutIdsPOJO; +import com.iailab.module.model.influxdb.service.InfluxDBService; +import com.iailab.module.model.influxdb.vo.InfluxModelResultVO; import com.iailab.module.model.mcs.pre.entity.DmModuleEntity; import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity; +import com.iailab.module.model.mcs.pre.entity.MmPredictAlarmMessageEntity; import com.iailab.module.model.mcs.pre.service.*; +import com.iailab.module.model.mcs.pre.vo.MmItemOutputRespVO; +import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmMessageSaveReqVO; +import com.iailab.module.model.mcs.pre.vo.MmPredictItemRespVO; +import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity; +import com.iailab.module.model.mcs.sche.service.StScheduleSchemeService; +import com.iailab.module.model.mcs.sche.service.StScheduleSuggestService; +import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestSaveReqVO; import com.iailab.module.model.mdk.vo.ItemVO; +import com.iailab.module.model.mpk.service.ChartParamService; +import com.iailab.module.model.mpk.service.ChartService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; @@ -19,6 +41,9 @@ import java.math.BigDecimal; import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * @author PanZhibao @@ -29,6 +54,9 @@ @RestController @Validated public class McsApiImpl implements McsApi { + + @Autowired + private DataPointApi dataPointApi; @Autowired private DmModuleService dmModuleService; @@ -46,7 +74,31 @@ private MmItemResultLastPointService mmItemResultLastPointService; @Autowired - private DataPointApi dataPointApi; + private MmItemResultJsonService mmItemResultJsonService; + + @Autowired + private ChartService chartService; + + @Autowired + private MmPredictAlarmMessageService mmPredictAlarmMessageService; + + @Autowired + private StScheduleSuggestService stScheduleSuggestService; + + @Autowired + private PlanItemApi planItemApi; + + @Autowired + private MmPredictAlarmConfigService mmPredictAlarmConfigService; + + @Autowired + private StScheduleSchemeService stScheduleSchemeService; + + @Autowired + private ChartParamService chartParamService; + + @Autowired + private InfluxDBService influxDBService; private int HOUR_MINS = 60; @@ -74,7 +126,7 @@ outList.forEach(out -> { PredictItemTreeDTO chd2 = new PredictItemTreeDTO(); chd2.setId(out.getId()); - chd2.setLabel(out.getResultstr()); + chd2.setLabel(out.getResultName()); chd1.add(chd2); }); } @@ -99,7 +151,7 @@ Date predictTime = reqVO.getPredictTime(); if (predictTime == null) { MmItemOutputEntity output = mmItemOutputService.getOutPutById(reqVO.getOutIds().get(0)); - ItemVO predictItem = mmPredictItemService.getItemById(output.getItemid()); + ItemVO predictItem = mmPredictItemService.getItemByIdFromCache(output.getItemid()); if (predictItem.getLastTime() != null) { predictTime = predictItem.getLastTime(); } else { @@ -131,13 +183,14 @@ if (output == null) { continue; } - legends.add(output.getResultstr()); + legends.add(output.getResultName()); viewDto.setItemId(output.getItemid()); viewDto.setOutId(outId); viewDto.setResultstr(output.getResultstr()); + viewDto.setResultName(output.getResultName()); viewDto.setRealData(getHisData(output.getPointid(), startTime, endTime)); - viewDto.setPreDataN(mmItemResultService.getData(output.getId(), startTime, endTime)); - viewDto.setPreDataL(mmItemResultLastPointService.getData(output.getId(), startTime, endTime)); + viewDto.setPreDataN(mmItemResultService.getData(output.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)); + viewDto.setPreDataL(mmItemResultLastPointService.getData(output.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)); List<Double> values = new ArrayList<>(); if (!CollectionUtils.isEmpty(viewDto.getRealData())) { @@ -211,20 +264,20 @@ if (startTime == null) { Calendar calendar = Calendar.getInstance(); calendar.setTime(predictItem.getLastTime()); - calendar.add(Calendar.HOUR_OF_DAY, -1); + calendar.add(Calendar.SECOND, -1 * predictItem.getPredictLength() * predictItem.getGranularity()); startTime = calendar.getTime(); } Date endTime = reqVO.getEndTime(); if (endTime == null) { Calendar calendar = Calendar.getInstance(); calendar.setTime(predictItem.getLastTime()); - calendar.add(Calendar.HOUR_OF_DAY, 1); + calendar.add(Calendar.SECOND, predictItem.getPredictLength() * predictItem.getGranularity()); endTime = calendar.getTime(); } if (endTime.getTime() <= startTime.getTime()) { Calendar calendar = Calendar.getInstance(); calendar.setTime(startTime); - calendar.add(Calendar.HOUR_OF_DAY, 1); + calendar.add(Calendar.SECOND, predictItem.getPredictLength() * predictItem.getGranularity()); endTime = calendar.getTime(); } @@ -236,11 +289,13 @@ return result; } for (MmItemOutputEntity out : outs) { - legend.add(out.getResultstr()); + legend.add(out.getResultName()); PreDataSampleViewRespDTO viewDto = new PreDataSampleViewRespDTO(); - viewDto.setRealData(getHisData(out.getPointid(), startTime, endTime)); - viewDto.setPreDataN(mmItemResultService.getData(out.getId(), startTime, endTime)); - viewMap.put(out.getResultstr(), viewDto); + if (StringUtils.isNotBlank(out.getPointid())) { + viewDto.setRealData(getHisData(out.getPointid(), startTime, endTime)); + } + viewDto.setPreDataN(mmItemResultService.getData(out.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)); + viewMap.put(out.getResultName(), viewDto); } result.setStartTime(startTime); result.setEndTime(endTime); @@ -251,10 +306,165 @@ } @Override - public PreDataItemChartRespVO getPreDataSingleChart(PreDataSingleChartReqVO reqVO) { - PreDataItemChartRespVO result = new PreDataItemChartRespVO(); + public PreDataSingleChartRespVO getPreDataSingleChart(PreDataSingleChartReqVO reqVO) { + PreDataSingleChartRespVO result = new PreDataSingleChartRespVO(); + Map<String, String> chartParams = chartService.getByChartCode(reqVO.getChartCode()); + if (CollectionUtils.isEmpty(chartParams)) { + return result; + } + String itemCode = chartParams.get(CommonConstant.ITEM_CODE); + if (itemCode == null) { + return result; + } + String resultStr = chartParams.get(CommonConstant.RESULT_STR); + if (resultStr == null) { + return result; + } + String resultIndex = chartParams.get(CommonConstant.RESULT_INDEX); + ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemCode); + if (predictItem == null || predictItem.getLastTime() == null) { + return result; + } + String timeFormat = StringUtils.isBlank(reqVO.getTimeFormat()) ? DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND : reqVO.getTimeFormat(); + PreLineTypeEnum lineType = chartParams.get(CommonConstant.LINE_TYPE) == null ? PreLineTypeEnum.TN : PreLineTypeEnum.getEumByCode(chartParams.get(CommonConstant.LINE_TYPE)); + BigDecimal rangeH = chartParams.get(CommonConstant.RANGE_H) == null ? null : new BigDecimal(chartParams.get(CommonConstant.RANGE_H)); + BigDecimal rangeL = chartParams.get(CommonConstant.RANGE_L) == null ? null : new BigDecimal(chartParams.get(CommonConstant.RANGE_L)); + BigDecimal limitH = chartParams.get(CommonConstant.LIMIT_H) == null ? null : new BigDecimal(chartParams.get(CommonConstant.LIMIT_H)); + BigDecimal limitL = chartParams.get(CommonConstant.LIMIT_L) == null ? null : new BigDecimal(chartParams.get(CommonConstant.LIMIT_L)); + int lengthLeft = chartParams.get(CommonConstant.LENGTH_LEFT) == null ? predictItem.getPredictLength() : new BigDecimal(chartParams.get(CommonConstant.LENGTH_LEFT)).intValue(); + int lengthRight = chartParams.get(CommonConstant.LENGTH_RIGHT) == null ? predictItem.getPredictLength() : new BigDecimal(chartParams.get(CommonConstant.LENGTH_RIGHT)).intValue(); + + Date[] timeArray = calResultTime(predictItem, reqVO.getStartTime(), reqVO.getEndTime(), lengthLeft, lengthRight); + Date predictTime = timeArray[0]; + Date startTime = timeArray[1]; + Date endTime = timeArray[2]; + + List<String> categories = DateUtils.getTimeScale(startTime, endTime, predictItem.getGranularity(), timeFormat); + List<String> legend = new ArrayList<>(); + MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), resultStr, resultIndex); + PreDataViewRespDTO dataView = new PreDataViewRespDTO(); + dataView.setItemId(predictItem.getId()); + dataView.setItemName(predictItem.getItemName()); + dataView.setResultstr(resultStr); + dataView.setRangeH(rangeH); + dataView.setRangeL(rangeL); + dataView.setLimitH(limitH); + dataView.setLimitL(limitL); + if (StringUtils.isNotBlank(outPut.getPointid())) { + dataView.setRealData(getHisData(outPut.getPointid(), startTime, endTime, timeFormat)); + } else { + dataView.setRealData(new ArrayList<>()); + } + dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat)); + dataView.setLineType(lineType.getCode()); + switch (lineType) { + case TN: + dataView.setPreDataN(mmItemResultService.getData(outPut.getId(), startTime, endTime, timeFormat)); + break; + case TL: + dataView.setPreDataN(mmItemResultService.getData(outPut.getId(), predictTime, endTime, timeFormat)); + dataView.setPreDataL(mmItemResultLastPointService.getData(outPut.getId(), startTime, endTime, timeFormat)); + break; + default: + break; + } + if (!CollectionUtils.isEmpty(dataView.getRealData())) { + Object[] rdo = dataView.getRealData().get(dataView.getRealData().size() - 1); + dataView.setCurrValue(new BigDecimal(rdo[1].toString())); + } + + if (!CollectionUtils.isEmpty(dataView.getCurData())) { + List<Double> curList = dataView.getCurData().stream().map(t -> { + return new Double(t[1].toString()); + }).collect(Collectors.toList()); + dataView.setPreMax(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).max().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP)); + dataView.setPreMin(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).min().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP)); + dataView.setPreLast(new BigDecimal(curList.get(curList.size() - 1))); + dataView.setPreCumulant(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).sum()) + .divide(new BigDecimal(HOUR_MINS), 2, BigDecimal.ROUND_HALF_UP)); + } + + String alarmObj = chartParams.get(CommonConstant.ALARM_OBJ); + if (StringUtils.isNotBlank(alarmObj)) { + List<AlarmMessageRespDTO> alarmList = ConvertUtils.sourceToTarget(mmPredictAlarmMessageService.getList(alarmObj, predictTime), AlarmMessageRespDTO.class); + dataView.setAlarmList(alarmList); + if (CollectionUtils.isEmpty(alarmList)) { + dataView.setAlarmMessage("暂无预警信息"); + } else { + dataView.setAlarmMessage(alarmList.get(0).getContent()); + } + } + + result.setPredictTime(predictTime); + result.setStartTime(startTime); + result.setEndTime(endTime); + result.setCategories(categories); + result.setLegend(legend); + result.setDataView(dataView); + return result; + } + + @Override + public Map<String, List<Object[]>> getPreDataCur(PreDataJsonReqVO reqVO) { + Map<String, List<Object[]>> result = new HashMap<>(); + if (reqVO == null || reqVO.getPredictTime() == null || CollectionUtils.isEmpty(reqVO.getOutputIdList())) { + return result; + } + reqVO.getOutputIdList().forEach(outPutId -> { + result.put(outPutId, mmItemResultJsonService.getData(outPutId, reqVO.getPredictTime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)); + }); + return result; + } + + @Override + public PlanDataSingleChartRespVO getPlanDataSingleChart(PreDataSingleChartReqVO reqVO) { + PlanDataSingleChartRespVO result = new PlanDataSingleChartRespVO(); + Map<String, String> chartParams = chartService.getByChartCode(reqVO.getChartCode()); + if (CollectionUtils.isEmpty(chartParams)) { + return result; + } + String itemCode = chartParams.get(CommonConstant.ITEM_CODE); + if (itemCode == null) { + return result; + } + String planItemStr = chartParams.get(CommonConstant.PLAN_ITEM_LIST); + if (planItemStr == null) { + return result; + } + List<String> planItemCodeList = Arrays.asList(planItemStr.split(",")); + + ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemCode); + if (predictItem == null || predictItem.getLastTime() == null) { + return result; + } + String timeFormat = StringUtils.isBlank(reqVO.getTimeFormat()) ? DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND : reqVO.getTimeFormat(); + int lengthLeft = chartParams.get(CommonConstant.LENGTH_LEFT) == null ? predictItem.getPredictLength() : new BigDecimal(chartParams.get(CommonConstant.LENGTH_LEFT)).intValue(); + int lengthRight = chartParams.get(CommonConstant.LENGTH_RIGHT) == null ? predictItem.getPredictLength() : new BigDecimal(chartParams.get(CommonConstant.LENGTH_RIGHT)).intValue(); + Date[] timeArray = calResultTime(predictItem, reqVO.getStartTime(), reqVO.getEndTime(), lengthLeft, lengthRight); + Date predictTime = timeArray[0]; + Date startTime = timeArray[1]; + Date endTime = timeArray[2]; + List<String> categories = DateUtils.getTimeScale(startTime, endTime, predictItem.getGranularity(), timeFormat); + List<String> legend = new ArrayList<>(); + LinkedHashMap<String, List<PlanDataRecordDTO>> record = new LinkedHashMap<>(); + ApiDataQueryDTO queryDTO = new ApiDataQueryDTO(); + queryDTO.setItemNos(planItemCodeList); + queryDTO.setStart(startTime); + queryDTO.setEnd(endTime); + LinkedHashMap<String, List<ApiPlanDataDTO>> planData = planItemApi.queryPlanItemRecordValue(queryDTO); + if (CollectionUtils.isEmpty(planData)) { + planData.forEach((key, value) -> { + record.put(key, ConvertUtils.sourceToTarget(value, PlanDataRecordDTO.class)); + }); + } + result.setPredictTime(predictTime); + result.setStartTime(startTime); + result.setEndTime(endTime); + result.setCategories(categories); + result.setLegend(legend); + result.setRecord(record); return result; } @@ -286,9 +496,49 @@ return result; } + /** + * 获取真实值 + * + * @param pointId + * @param startTime + * @param endTime + * @param timeFormat + * @return + */ + private List<Object[]> getHisData(String pointId, Date startTime, Date endTime, String timeFormat) { + List<Object[]> result = new ArrayList<>(); + ApiPointDTO pointDTO = dataPointApi.getInfoById(pointId); + ApiPointValueQueryDTO queryPointDto = new ApiPointValueQueryDTO(); + queryPointDto.setPointNo(pointDTO.getPointNo()); + queryPointDto.setStart(startTime); + queryPointDto.setEnd(endTime); + List<ApiPointValueDTO> valueDTOS = dataPointApi.queryPointHistoryValue(queryPointDto); + if (CollectionUtils.isEmpty(valueDTOS)) { + return result; + } + valueDTOS.forEach(item -> { + Object[] values = new Object[2]; + values[0] = DateUtils.format(item.getT(), timeFormat); + values[1] = new BigDecimal(item.getV()).setScale(2, BigDecimal.ROUND_HALF_UP); + result.add(values); + }); + return result; + } + + /** + * 新增预警信息 + * + * @param dto + * @return + */ @Override public Boolean createAlarmMessage(AlarmMessageRespDTO dto) { - return true; + try { + mmPredictAlarmMessageService.create(ConvertUtils.sourceToTarget(dto, MmPredictAlarmMessageSaveReqVO.class)); + return true; + } catch (Exception e) { + return false; + } } @Override @@ -297,13 +547,31 @@ } @Override + public List<AlarmConfigRespDTO> listAlarmConfig(Map<String, Object> params) { + return mmPredictAlarmConfigService.list(params); + } + + @Override + public AlarmMessageRespDTO getLastAlarmMessage(String alarmObj) { + MmPredictAlarmMessageEntity entity = mmPredictAlarmMessageService.getLast(alarmObj); + return ConvertUtils.sourceToTarget(entity, AlarmMessageRespDTO.class); + } + + @Override public Boolean createScheduleSuggest(ScheduleSuggestRespDTO dto) { + stScheduleSuggestService.create(ConvertUtils.sourceToTarget(dto, StScheduleSuggestSaveReqVO.class)); return true; } @Override - public List<ScheduleSuggestRespDTO> listScheduleSuggest(ScheduleSuggestReqDTO params) { - return null; + public List<ScheduleSuggestRespDTO> listScheduleSuggest(Map<String, Object> params) { + return Collections.emptyList(); + } + + @Override + public List<ScheduleSuggestRespDTO> getLastLimitScheduleSuggest(String scheduleObj, Integer limit) { + List<StScheduleSuggestEntity> list = stScheduleSuggestService.getList(scheduleObj, limit); + return ConvertUtils.sourceToTarget(list, ScheduleSuggestRespDTO.class); } @Override @@ -315,4 +583,107 @@ public Boolean modifyScheduleModelSetting(List<ScheduleModelSettingReqDTO> dtos) { return true; } + + @Override + public List<StScheduleSchemeDTO> listScheduleScheme(String triggerMethod, String triggerCondition) { + Map<String, Object> params = new HashMap<>(); + params.put("triggerMethod", triggerMethod); + params.put("triggerCondition", triggerCondition); + return stScheduleSchemeService.list(params); + } + + @Override + public List<ChartParamDTO> getChartParamList(String chartCode) { + if (StringUtils.isBlank(chartCode)) { + return null; + } + return chartParamService.list(chartCode); + } + + @Override + public PageResult<StAlarmAndSuggestRespVO> getAlarmAndSuggestPage(StAlarmAndSuggestPageReqVO reqVO) { + return stScheduleSchemeService.getAlarmAndSuggestPage(reqVO); + } + + @Override + public Map<String, Map<String, Double>> getPreDoubleData(PreDoubleDataReqVO reqVO) { + List<MmPredictItemRespVO> doubleItemOutPuts = mmPredictItemService.getDoubleOutPutsByItemNos(reqVO.getItemNos()); + + //<itemNo,<resultStr,double>> + Map<String, Map<String, Double>> result = new HashMap<>(reqVO.getItemNos().size()); + + for (MmPredictItemRespVO mmPredictItemRespVO : doubleItemOutPuts) { + List<String> outPutIds = mmPredictItemRespVO.getOutPuts().stream().map(MmItemOutputRespVO::getId).collect(Collectors.toList()); + InfluxModelResultByOutPutIdsPOJO pojo = new InfluxModelResultByOutPutIdsPOJO(); + pojo.setOutPutIds(outPutIds); + pojo.setType(DataTypeEnum.FLOAT.getCode()); + Map<String, List<InfluxModelResultVO>> outPutIdDoubles = influxDBService.queryModelResultsByOutPutIds(pojo, mmPredictItemRespVO.getLastTime(), mmPredictItemRespVO.getLastTime()); + Map<String, Double> outPutIdDouble = new HashMap<>(outPutIds.size()); + for (MmItemOutputRespVO outPut : mmPredictItemRespVO.getOutPuts()) { + String outPutId = outPut.getId(); + if (outPutIdDoubles.containsKey(outPutId)) { + List<InfluxModelResultVO> influxModelResultVOS = outPutIdDoubles.get(outPutId); + if (!CollectionUtils.isEmpty(influxModelResultVOS)) { + outPutIdDouble.put(outPut.getResultstr(),Double.valueOf(influxModelResultVOS.get(0).getValue().toString())); + } + } + } + result.put(mmPredictItemRespVO.getItemno(),outPutIdDouble); + } + return result; + } + + public Map<String, BigDecimal> getPredictLastValue(PredictLastValueReqVO reqVO) { + Map<String, BigDecimal> result = new HashMap<>(reqVO.getItemNos().size()); + if (CollectionUtils.isEmpty(reqVO.getItemNos())) { + return result; + } + List<String[]> itemNos = reqVO.getItemNos(); + for (String[] itemNo : itemNos) { + String key = itemNo[0] + "_" + itemNo[1] + "_" + itemNo[2]; + ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemNo[0]); + if (predictItem == null || predictItem.getLastTime() == null) { + result.put(key, BigDecimal.ZERO); + } + MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), itemNo[1], itemNo[2]); + + Date predictTime = predictItem.getLastTime(); + List<Object[]> curData = mmItemResultJsonService.getData(outPut.getId(), predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND); + if(CollectionUtils.isEmpty(curData)) { + result.put(key, BigDecimal.ZERO); + } else { + result.put(key, new BigDecimal(curData.get(curData.size() - 1)[1].toString())); + } + } + return result; + } + + private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) { + Date[] result = new Date[3]; + Date predictTime = predictItem.getLastTime(); + Date startTime = startTimeReq; + if (startTime == null) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(predictItem.getLastTime()); + calendar.add(Calendar.MINUTE, -1 * lengthLeft); + startTime = calendar.getTime(); + } + Date endTime = endTimeReq; + if (endTime == null) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(predictItem.getLastTime()); + calendar.add(Calendar.MINUTE, lengthRight); + endTime = calendar.getTime(); + } + if (endTime.getTime() <= startTime.getTime()) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(startTime); + calendar.add(Calendar.MINUTE, lengthRight); + endTime = calendar.getTime(); + } + result[0] = predictTime; + result[1] = startTime; + result[2] = endTime; + return result; + } } \ No newline at end of file -- Gitblit v1.9.3