From 0e9ed190503601a2896fc2f4fc5de2994c9eb776 Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期五, 11 四月 2025 09:47:12 +0800 Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/ansteel --- ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java index 169a5b3..6258055 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java @@ -1,11 +1,11 @@ package com.iailab.module.ansteel.api.controller.admin; import com.iailab.framework.common.pojo.CommonResult; -import com.iailab.module.ansteel.api.dto.PlanDataChartReqVO; -import com.iailab.module.ansteel.api.dto.PowerRunStateDTO; -import com.iailab.module.ansteel.api.dto.PreDataChartRespVO; +import com.iailab.module.ansteel.api.dto.*; import com.iailab.module.ansteel.api.service.DataApi; import com.iailab.module.model.api.mcs.dto.PreDataSingleChartReqVO; +import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestReqVO; +import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestRespVO; import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -48,4 +48,23 @@ return CommonResult.success(tMap); } + @GetMapping("/main-process-index/list") + @Operation(summary = "主工序指标") + public CommonResult<List<MainProcessIndexDTO>> getMainIndexList(@RequestParam Map<String, Object> params) { + List<MainProcessIndexDTO> list = dataApi.getIndexList(params); + return success(list); + } + + @GetMapping("/child-process-index/list") + @Operation(summary = "子工序指标") + public CommonResult<List<ChildProcessIndexDTO>> getChildIndexList(@RequestParam Map<String, Object> params) { + List<ChildProcessIndexDTO> list = new ArrayList<>(); + return success(list); + } + + @PostMapping("/schedule-suggest/use-suggest") + @Operation(summary = "采纳建议") + public CommonResult<Boolean> useSuggest(@RequestBody StAlarmAndSuggestReqVO ReqVO) { + return success(dataApi.useSuggest(ReqVO)); + } } \ No newline at end of file -- Gitblit v1.9.3