From 12d96beabf4e1c96deb7c379a7421a89178734be Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 15 十一月 2024 16:59:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 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 99d264b..5d41936 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
@@ -1,6 +1,5 @@
 package com.iailab.module.model.api.mcs;
 
-import com.iailab.framework.common.pojo.CommonResult;
 import com.iailab.module.model.api.mcs.dto.*;
 import com.iailab.module.model.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
@@ -20,40 +19,44 @@
  * @createTime 2024年08月26日
  */
 @FeignClient(name = ApiConstants.NAME)
-@Tag(name = "RPC 服务 - 模型配置接口")
+@Tag(name = "RPC 服务 - 模型配置信息接口")
 public interface McsApi {
 
     String PREFIX = ApiConstants.PREFIX + "/mcs";
 
-    @GetMapping(PREFIX + "/predict-item-tree")
+    @GetMapping(PREFIX + "/predict-item/tree")
     @Operation(summary = "预测项树")
-    CommonResult<List<PredictItemTreeDTO>> getPredictItemTree();
+    List<PredictItemTreeDTO> getPredictItemTree();
 
-    @GetMapping(PREFIX + "/predict-item-info")
-    @Operation(summary = "预测项详情")
-    CommonResult<PredictItemInfoDTO> getPredictItemInfo(@RequestParam Map<String, Object> params);
+    @PostMapping(PREFIX + "/predict-data/charts")
+    @Operation(summary = "预测数据图表")
+    PreDataBarLineRespVO getPreDataCharts(@RequestBody PreDataBarLineReqVO reqVO);
+
+    @PostMapping(PREFIX + "/predict-data/item-chart")
+    @Operation(summary = "预测数据图表")
+    PreDataItemChartRespVO getPreDataItemChart(@RequestBody PreDataItemChartReqVO reqVO);
 
     @PostMapping(PREFIX + "/alarm-message/create")
     @Operation(summary = "添加预警信息")
-    CommonResult<Boolean> createAlarmMessage(@RequestBody AlarmMessageRespDTO dto);
+    Boolean createAlarmMessage(@RequestBody AlarmMessageRespDTO dto);
 
     @GetMapping(PREFIX + "/alarm-message/list")
     @Operation(summary = "获取预警信息列表")
-    CommonResult<AlarmMessageRespDTO> listAlarmMessage(@RequestParam Map<String, Object> params);
+    List<AlarmMessageRespDTO> listAlarmMessage(@RequestParam Map<String, Object> params);
 
     @PostMapping(PREFIX + "/schedule-suggest/create")
     @Operation(summary = "添加调度建议")
-    CommonResult<Boolean> createScheduleSuggest(@RequestBody ScheduleSuggestRespDTO dto);
+    Boolean createScheduleSuggest(@RequestBody ScheduleSuggestRespDTO dto);
 
-    @GetMapping(PREFIX + "/alarm-message/list")
+    @GetMapping(PREFIX + "/schedule-suggest/list")
     @Operation(summary = "获取调度建议列表")
-    CommonResult<ScheduleSuggestRespDTO> listScheduleSuggest(@RequestParam ScheduleSuggestReqDTO params);
+    List<ScheduleSuggestRespDTO> listScheduleSuggest(@RequestParam ScheduleSuggestReqDTO params);
 
     @PostMapping(PREFIX + "/predict-model-setting/modify")
     @Operation(summary = "修改预测模型设置参数")
-    CommonResult<Boolean> modifyPredictModelSetting(@RequestBody List<PredictModelSettingReqDTO> dtos);
+    Boolean modifyPredictModelSetting(@RequestBody List<PredictModelSettingReqDTO> dtos);
 
     @PostMapping(PREFIX + "/schedule-model-setting/modify")
     @Operation(summary = "修改调度模型设置参数")
-    CommonResult<Boolean> modifyScheduleModelSetting(@RequestBody List<ScheduleModelSettingReqDTO> dtos);
+    Boolean modifyScheduleModelSetting(@RequestBody List<ScheduleModelSettingReqDTO> dtos);
 }
\ No newline at end of file

--
Gitblit v1.9.3