iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
@@ -141,15 +141,15 @@ MmItemOutputDTO getItemOutputByItemid(@RequestParam("itemid") String itemid, @RequestParam("resultstr")String resultstr, @RequestParam("resultIndex")String resultIndex); @GetMapping(PREFIX + "/item/result") @PostMapping(PREFIX + "/item/result") @Operation(summary = "获取") List<Object[]> getItemResult(@RequestParam("outputid") String outputid, @RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("timeFormat") String timeFormat); List<Object[]> getItemResult(@RequestBody PreItemResultReqVO reqVO); @GetMapping(PREFIX + "/predict-item/itemNo") @Operation(summary = "获取") PredictItemVO getPredictItemByItemNo(@RequestParam("itemNo") String itemNo); @GetMapping(PREFIX + "/item/result/last-point") @PostMapping(PREFIX + "/item/result/last-point") @Operation(summary = "获取") List<Object[]> getItemResultLastPoint(@RequestParam("outputid") String outputid, @RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("timeFormat") String timeFormat); List<Object[]> getItemResultLastPoint(@RequestBody PreItemResultReqVO reqVO); } iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java
@@ -131,4 +131,7 @@ @Schema(description = "累计预测值") private List<Object[]> cumulantPreData; @Schema(description = "累计预测值最后一个值") private BigDecimal cumulantPreLast; } iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreItemResultReqVO.java
对比新文件 @@ -0,0 +1,28 @@ package com.iailab.module.model.api.mcs.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * @author PanZhibao * @Description * @createTime 2024年11月14日 */ @Data public class PreItemResultReqVO implements Serializable { private static final long serialVersionUID = 1L; private String outputid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; private String timeFormat; } iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -28,7 +28,6 @@ import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmConfigSaveReqVO; 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.StAdjustConfigDetEntity; import com.iailab.module.model.mcs.sche.entity.StScheduleModelEntity; import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity; import com.iailab.module.model.mcs.sche.service.*; @@ -422,6 +421,19 @@ default: break; } //处理预测累计 if (outPut.getIscumulant() != null && outPut.getIscumulant() == 1) { /*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.setCumulantPreLast(new BigDecimal(cumulantPreList.get(cumulantPreList.size() - 1)[1].toString()).setScale(2, BigDecimal.ROUND_HALF_UP)); } } if (!CollectionUtils.isEmpty(dataView.getRealData())) { Object[] rdo = dataView.getRealData().get(dataView.getRealData().size() - 1); dataView.setCurrValue(new BigDecimal(rdo[1].toString())); @@ -850,8 +862,9 @@ } @Override public List<Object[]> getItemResult(String outputid, Date startTime, Date endTime, String timeFormat) { return mmItemResultService.getData(outputid,startTime,endTime,timeFormat); public List<Object[]> getItemResult(PreItemResultReqVO reqVO) { return mmItemResultService.getData(reqVO.getOutputid(),reqVO.getStartTime(),reqVO.getEndTime(),reqVO.getTimeFormat()); } @Override @@ -860,8 +873,8 @@ } @Override public List<Object[]> getItemResultLastPoint(String outputid, Date startTime, Date endTime, String timeFormat) { return mmItemResultLastPointService.getData(outputid,startTime,endTime,timeFormat); public List<Object[]> getItemResultLastPoint(PreItemResultReqVO reqVO) { return mmItemResultLastPointService.getData(reqVO.getOutputid(),reqVO.getStartTime(),reqVO.getEndTime(),reqVO.getTimeFormat()); } private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) { iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java
@@ -250,4 +250,22 @@ mcsApi.updateChartParam(chartDTO); return success( true); } @PostMapping("/item/result") public CommonResult<List<Object[]>> getItemResult(@RequestBody PreItemResultReqVO reqVO){ List<Object[]> list = mcsApi.getItemResult(reqVO); return CommonResult.success(list); } @GetMapping("/predict-item/itemNo") public CommonResult<PredictItemVO> getPredictItemByItemNo(@RequestParam("itemNo") String itemNo){ PredictItemVO proVo = mcsApi.getPredictItemByItemNo(itemNo); return CommonResult.success(proVo); } @PostMapping("/item/result/last-point") public CommonResult<List<Object[]>> getItemResultLastPoint(@RequestBody PreItemResultReqVO reqVO){ List<Object[]> list = mcsApi.getItemResultLastPoint(reqVO); return CommonResult.success(list); } } iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/common/enums/PreLineTypeEnum.java
@@ -13,7 +13,8 @@ public enum PreLineTypeEnum { TN("0", "T+N"), TL("1", "T+L"), CD("2", "curData"); CD("2", "curData"), CL("3", "curData + T+L"); private String code; private String desc;
