From c3c7a6918f0e2dfe597c339117e4185b641be95f Mon Sep 17 00:00:00 2001 From: Jay <csj123456> Date: 星期一, 24 二月 2025 15:10:19 +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 | 115 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 97 insertions(+), 18 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 abb31a0..dded6ad 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,10 +1,8 @@ package com.iailab.module.model.api.mcs; -import com.iailab.framework.common.pojo.CommonResult; -import com.iailab.module.model.api.mcs.dto.AlarmMessageDTO; -import com.iailab.module.model.api.mcs.dto.PredictItemInfoDTO; -import com.iailab.module.model.api.mcs.dto.PredictItemTreeDTO; -import com.iailab.module.model.api.mcs.dto.ScheduleSuggestDTO; +import com.iailab.framework.common.pojo.PageResult; +import com.iailab.module.model.api.mcs.dto.*; +import com.iailab.module.model.api.mdk.dto.StScheduleRecordVO; import com.iailab.module.model.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -14,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -23,33 +22,113 @@ * @createTime 2024年08月26日 */ @FeignClient(name = ApiConstants.NAME) -@Tag(name = "RPC 服务 - MCS") +@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 + "/predict-data/single-chart") + @Operation(summary = "预测数据图表") + PreDataSingleChartRespVO getPreDataSingleChart(@RequestBody PreDataSingleChartReqVO reqVO); + + @PostMapping(PREFIX + "/predict-data/cur") + @Operation(summary = "获取当前预测数据") + Map<String, List<Object[]>> getPreDataCur(@RequestBody PreDataJsonReqVO reqVO); + + @PostMapping(PREFIX + "/plan-data/single-chart") + @Operation(summary = "计划数据图表") + PlanDataSingleChartRespVO getPlanDataSingleChart(@RequestBody PreDataSingleChartReqVO reqVO); @PostMapping(PREFIX + "/alarm-message/create") @Operation(summary = "添加预警信息") - CommonResult<Boolean> createAlarmMessage(@RequestBody AlarmMessageDTO dto); + Boolean createAlarmMessage(@RequestBody AlarmMessageRespDTO dto); @GetMapping(PREFIX + "/alarm-message/list") - @Operation(summary = "获取预警信息") - CommonResult<AlarmMessageDTO> listAlarmMessage(@RequestParam Map<String, Object> params); + @Operation(summary = "获取预警信息列表") + List<AlarmMessageRespDTO> listAlarmMessage(@RequestParam Map<String, Object> params); + + @GetMapping(PREFIX + "/alarm-config/list") + @Operation(summary = "获取预警配置列表") + List<AlarmConfigRespDTO> listAlarmConfig(@RequestParam Map<String, Object> params); + + @GetMapping(PREFIX + "/alarm-message/last-one") + @Operation(summary = "获取最新预警信息") + AlarmMessageRespDTO getLastAlarmMessage(@RequestParam("alarmObj") String alarmObj); @PostMapping(PREFIX + "/schedule-suggest/create") @Operation(summary = "添加调度建议") - CommonResult<Boolean> createScheduleSuggest(@RequestBody ScheduleSuggestDTO dto); + Boolean createScheduleSuggest(@RequestBody ScheduleSuggestRespDTO dto); - @GetMapping(PREFIX + "/alarm-message/list") - @Operation(summary = "获取调度建议") - CommonResult<ScheduleSuggestDTO> listScheduleSuggest(@RequestParam Map<String, Object> params); + @PostMapping(PREFIX + "/schedule-suggest/list") + @Operation(summary = "获取调度建议列表") + List<ScheduleSuggestRespDTO> listScheduleSuggest(@RequestBody ScheduleSuggestReqDTO vo); + + @PostMapping(PREFIX + "/predict-model-setting/modify") + @Operation(summary = "修改预测模型设置参数") + Boolean modifyPredictModelSetting(@RequestBody List<PredictModelSettingReqDTO> dtos); + + @GetMapping(PREFIX + "/schedule-suggest/last-limit") + @Operation(summary = "获取调度建议列表") + List<ScheduleSuggestRespDTO> getLastLimitScheduleSuggest(@RequestParam("scheduleObj") String scheduleObj, @RequestParam("limit") Integer limit); + + @PostMapping(PREFIX + "/schedule-model-setting/modify") + @Operation(summary = "修改调度模型设置参数") + Boolean modifyScheduleModelSetting(@RequestBody List<ScheduleModelSettingReqDTO> dtos); + + @GetMapping(PREFIX + "/schedule-scheme/list") + @Operation(summary = "获取调度方案列表") + List<StScheduleSchemeDTO> listScheduleScheme(@RequestParam("triggerMethod") String triggerMethod, @RequestParam("triggerCondition") String triggerCondition); + + @GetMapping(PREFIX + "/chart/param/list") + @Operation(summary = "图表配置列表") + List<ChartParamDTO> getChartParamList(@RequestParam("chartCode") String chartCode); + + @PostMapping(PREFIX + "/alarm-suggest/page") + @Operation(summary = "获取预警信息和调度建议分页列表") + PageResult<StAlarmAndSuggestRespVO> getAlarmAndSuggestPage(@RequestBody StAlarmAndSuggestPageReqVO reqVO); + + @PostMapping(PREFIX + "/predict-data/doubleValue") + @Operation(summary = "获取多个预测项Double类型数据") + Map<String, Map<String, Double>> getPreDoubleData(PreDoubleDataReqVO reqVO); + + @PostMapping(PREFIX + "/predict-data/last-value") + @Operation(summary = "获取最后预测值") + Map<String, BigDecimal> getPredictLastValue(@RequestBody PredictLastValueReqVO reqVO); + + @GetMapping("/schedule-data/last") + @Operation(summary = "调度模型最新结果查询") + List<StScheduleRecordVO> getLastScheduleData(@RequestParam("scheduleCode") String scheduleCode,@RequestParam("limit") Integer limit); + + @PostMapping("/predict-data/itemNo") + @Operation(summary = "查询时间范围内预测结果") + Map<String,List<Object[]>> getPredictDataItemNo(@RequestBody PreDataItemNoReqVO reqVO); + + @GetMapping(PREFIX + "/electricityPrice/list") + @Operation(summary = "电价时段配置列表") + List<ElectricityPriceSegmentedDTO> getElectricityPriceList(@RequestParam("year") String year, @RequestParam("time") String time); + + @PostMapping(PREFIX + "/electricityPrice/create") + @Operation(summary = "添加电价时段配置列表") + Boolean createElectricityPrice(@RequestBody List<ElectricityPriceSegmentedDTO> list); + + @PostMapping(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); } \ No newline at end of file -- Gitblit v1.9.3