From 6eeac9efdb16f92d19536bf23a2d1471705fe752 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 31 十二月 2024 18:34:38 +0800
Subject: [PATCH] 调度模型下发
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 385 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 368 insertions(+), 17 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 81a761c..bd7dc00 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,34 @@
package com.iailab.module.model.api;
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.api.point.dto.ApiPointValueWriteDTO;
+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.CommonConstant;
+import com.iailab.module.model.common.enums.PreLineTypeEnum;
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.MmPredictAlarmMessageSaveReqVO;
+import com.iailab.module.model.mcs.sche.entity.StScheduleModelOutEntity;
+import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity;
+import com.iailab.module.model.mcs.sche.service.StScheduleModelOutService;
+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.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 +36,7 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author PanZhibao
@@ -29,6 +47,9 @@
@RestController
@Validated
public class McsApiImpl implements McsApi {
+
+ @Autowired
+ private DataPointApi dataPointApi;
@Autowired
private DmModuleService dmModuleService;
@@ -46,7 +67,28 @@
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 StScheduleModelOutService stScheduleModelOutService;
private int HOUR_MINS = 60;
@@ -74,7 +116,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 +141,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 +173,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())) {
@@ -206,25 +249,25 @@
if (predictItem.getLastTime() == null) {
return result;
}
- result.setLastTime(predictItem.getLastTime());
+ result.setPredictTime(predictItem.getLastTime());
Date startTime = reqVO.getStartTime();
if (startTime == null) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(predictItem.getLastTime());
- calendar.add(Calendar.HOUR_OF_DAY, -1);
+ calendar.add(Calendar.MINUTE, -1 * predictItem.getPredictLength());
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.MINUTE, predictItem.getPredictLength());
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.MINUTE, predictItem.getPredictLength());
endTime = calendar.getTime();
}
@@ -236,17 +279,163 @@
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);
result.setCategories(categories);
result.setLegend(legend);
result.setViewMap(viewMap);
+ return result;
+ }
+
+ @Override
+ 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 ? BigDecimal.ZERO : new BigDecimal(chartParams.get(CommonConstant.RANGE_H));
+ BigDecimal rangeL = chartParams.get(CommonConstant.RANGE_L) == null ? BigDecimal.ZERO : new BigDecimal(chartParams.get(CommonConstant.RANGE_L));
+ BigDecimal limitH = chartParams.get(CommonConstant.LIMIT_H) == null ? BigDecimal.ZERO : new BigDecimal(chartParams.get(CommonConstant.LIMIT_H));
+ BigDecimal limitL = chartParams.get(CommonConstant.LIMIT_L) == null ? BigDecimal.ZERO : 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));
+ 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.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));
+ }
+
+ 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;
}
@@ -278,9 +467,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
@@ -289,13 +518,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
@@ -307,4 +554,108 @@
public Boolean modifyScheduleModelSetting(List<ScheduleModelSettingReqDTO> dtos) {
return true;
}
+
+ @Override
+ public List<StScheduleSchemeDTO> listScheduleScheme(Map<String, Object> params) {
+ return stScheduleSchemeService.list(params);
+ }
+
+ @Override
+ public Boolean scheduleModelOut(MdkScheduleRespDTO dto) {
+ String modelId = stScheduleSchemeService.getByCode(dto.getScheduleCode()).getModelId();
+ Map<String,Object> result = dto.getResult();
+ List<StScheduleModelOutDTO> list = stScheduleModelOutService.list(modelId);
+ try{
+ list.forEach(
+ item -> {
+ double value = 0;
+ //判断点位是否下发以及返回结果是否存在
+ if(item.getIsWrite()==1){
+ if(result.get(item.getResultKey())==null){
+ log.error(result.get(item.getResultKey()) + "resultKey匹配失败");
+ }
+ Object resultValue = result.get(item.getResultKey());
+ //判断解析方式
+ if(item.getResultType().equals("double")){
+ if(resultValue instanceof Double) {
+ value = (Double) resultValue;
+ }
+ }else if(item.getResultType().equals("double[]")){
+ ArrayList<Double> doubleList = (ArrayList<Double>) resultValue;
+ double[] array = new double[doubleList.size()];
+ for (int i = 0; i < doubleList.size(); i++) {
+ array[i] = doubleList.get(i);
+ }
+ if(array!= null && item.getResultPort() < array.length){
+ value = array[item.getResultPort()];
+ }else{
+ log.error(result.get(item.getResultKey()) + "下角标超限");
+ }
+
+ }else if(item.getResultType().equals("double[][]")){
+ if (item.getResultType().equals("double[][]")) {
+ if (resultValue instanceof ArrayList) {
+ ArrayList<ArrayList<Double>> doubleListList = (ArrayList<ArrayList<Double>>) resultValue;
+ double[][] array = new double[doubleListList.size()][];
+ for (int i = 0; i < doubleListList.size(); i++) {
+ ArrayList<Double> doubleList = doubleListList.get(i);
+ array[i] = new double[doubleList.size()];
+ for (int j = 0; j < doubleList.size(); j++) {
+ array[i][j] = doubleList.get(j);
+ }
+ }
+ if (array != null && item.getResultPort() < array.length && item.getResultIndex() < array[item.getResultPort()].length) {
+ value = array[item.getResultPort()][item.getResultIndex()];
+ } else {
+ log.error(result.get(item.getResultKey()) + "下标超限");
+ }
+ }
+ }
+ }
+ //下发到point点位
+ ApiPointValueWriteDTO ApiPointValueWriteDTO = new ApiPointValueWriteDTO();
+ ApiPointValueWriteDTO.setPointNo(item.getPointNo());
+ ApiPointValueWriteDTO.setValue(value);
+ if (!dataPointApi.writePointRealValue(ApiPointValueWriteDTO)) {
+ log.error(result.get(item.getResultKey()) + "下发数据异常");
+ }
+
+ }
+ }
+ );
+ }catch (Exception ex){
+ log.error("下发数据异常");
+ ex.printStackTrace();
+ }
+ return true;
+ }
+
+ 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