From 45ce1ff761dc5438c4a49e53c28ec50126d6023d Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 24 三月 2025 14:15:32 +0800
Subject: [PATCH] 接收参数修改
---
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java | 8 ++++----
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreItemResultReqVO.java | 28 ++++++++++++++++++++++++++++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 13 +++++--------
3 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
index d498e79..fcb8ff0 100644
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
+++ b/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);
}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreItemResultReqVO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreItemResultReqVO.java
new file mode 100644
index 0000000..af47b2b
--- /dev/null
+++ b/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;
+}
\ No newline at end of file
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 8230371..40e0d25 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
@@ -419,10 +419,6 @@
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;
}
@@ -854,8 +850,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
@@ -864,8 +861,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) {
--
Gitblit v1.9.3