From 464170464ab488f6ae6508c72859f70a9639c2b1 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期三, 19 三月 2025 10:19:30 +0800
Subject: [PATCH] 新增接口
---
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PredictItemVO.java | 41 ++++++++++++++++++++
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/MmItemOutputDTO.java | 40 ++++++++++++++++++++
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java | 18 +++++++++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 20 ++++++++++
4 files changed, 119 insertions(+), 0 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 4d22066..9102b54 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
@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -126,6 +127,7 @@
@GetMapping(PREFIX + "/schedule/model/setting/update")
@Operation(summary = "修改调度模型配置")
Boolean updateScheduleModelSetting(@RequestParam("modelCode") String modelCode, @RequestParam("key") String key, @RequestParam("value") String value);
+
@GetMapping(PREFIX + "/schedule/adjust/config-list")
@Operation(summary = "获取模拟调整配置")
List<StAdjustConfigDetDTO> getAdjustConfigListByModelId(@RequestParam("modelId") String modelId);
@@ -138,4 +140,20 @@
@Operation(summary = "修改图表参数配置")
Boolean updateChartParam(@RequestBody ChartDTO chartDTO);
+ @GetMapping(PREFIX + "/item/output/itemId")
+ @Operation(summary = "获取")
+ MmItemOutputDTO getItemOutputByItemid(@RequestParam("itemid") String itemid, @RequestParam("resultstr")String resultstr, @RequestParam("resultIndex")String resultIndex);
+
+
+ @GetMapping(PREFIX + "/item/result")
+ @Operation(summary = "获取")
+ List<Object[]> getItemResult(@RequestParam("outputid") String outputid, @RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("timeFormat") String timeFormat);
+
+ @GetMapping(PREFIX + "/predict-item/itemNo")
+ @Operation(summary = "获取")
+ PredictItemVO getPredictItemByItemNo(@RequestParam("itemNo") String itemNo);
+
+ @GetMapping(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);
}
\ 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/MmItemOutputDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/MmItemOutputDTO.java
new file mode 100644
index 0000000..ebb623a
--- /dev/null
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/MmItemOutputDTO.java
@@ -0,0 +1,40 @@
+package com.iailab.module.model.api.mcs.dto;
+
+import lombok.Data;
+
+/**
+ * @author PanZhibao
+ * @date 2021年07月23日 10:13
+ */
+@Data
+public class MmItemOutputDTO {
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 预测项ID
+ */
+ private String itemid;
+
+ /**
+ * 数据点ID
+ */
+ private String pointid;
+
+ /**
+ * 存放表ID
+ */
+ private String resulttableid;
+
+ /**
+ * 数据点名称
+ */
+ private String tagname;
+
+ /**
+ * 预测项名称
+ */
+ private String itemname;
+}
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PredictItemVO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PredictItemVO.java
new file mode 100644
index 0000000..05414bd
--- /dev/null
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PredictItemVO.java
@@ -0,0 +1,41 @@
+package com.iailab.module.model.api.mcs.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author PanZhibao
+ * @Description
+ * @createTime 2024年09月01日
+ */
+@Data
+public class PredictItemVO {
+ private String id;
+ private String itemNo;
+ private String itemName;
+ private String itemType;
+ private Integer predictLength;
+ private Integer granularity;
+ private Integer status;
+ private Integer isFuse;
+ private Integer predictPhase;
+ private Integer workChecked;
+ private Integer isDisplay;
+ private Integer unitTransFactor;
+
+ /**
+ * 保留的预测点位 （T+2 则n=2, T+30则n=30, T+n则表示从最后点位开始，n=预测长度；n由系统配置得出）
+ */
+ private String saveIndex;
+
+ /**
+ * 项目id
+ */
+ private String mpkProjectId;
+
+ /**
+ * 最后运行时间
+ */
+ private Date lastTime;
+}
\ 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 f6fd187..999d93c 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
@@ -848,6 +848,26 @@
return true;
}
+ @Override
+ public MmItemOutputDTO getItemOutputByItemid(String itemid, String resultstr, String resultIndex) {
+ return ConvertUtils.sourceToTarget(mmItemOutputService.getByItemid(itemid,resultstr,resultIndex),MmItemOutputDTO.class);
+ }
+
+ @Override
+ public List<Object[]> getItemResult(String outputid, Date startTime, Date endTime, String timeFormat) {
+ return mmItemResultService.getData(outputid,startTime,endTime,timeFormat);
+ }
+
+ @Override
+ public PredictItemVO getPredictItemByItemNo(String itemNo) {
+ return ConvertUtils.sourceToTarget(mmPredictItemService.getItemByItemNo(itemNo),PredictItemVO.class);
+ }
+
+ @Override
+ public List<Object[]> getItemResultLastPoint(String outputid, Date startTime, Date endTime, String timeFormat) {
+ return mmItemResultLastPointService.getData(outputid,startTime,endTime,timeFormat);
+ }
+
private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {
Date[] result = new Date[3];
Date predictTime = predictItem.getLastTime();
--
Gitblit v1.9.3