| | |
| | | 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); |
| | | } |
对比新文件 |
| | |
| | | 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; |
| | | } |
| | |
| | | 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; |
| | | } |
| | |
| | | } |
| | | |
| | | @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 |
| | |
| | | } |
| | | |
| | | @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) { |