From 56a46d572b3325667061d78192624019d8537363 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 06 五月 2025 13:33:59 +0800
Subject: [PATCH] getHistoryValue
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 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 2dc90b2..8d763d2 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,16 +1,24 @@
package com.iailab.module.ansteel.api.controller.admin;
import com.iailab.framework.common.pojo.CommonResult;
+import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.module.ansteel.api.dto.*;
-import com.iailab.module.ansteel.api.service.DataApi;
+import com.iailab.module.ansteel.api.service.DataService;
+import com.iailab.module.ansteel.coking.dto.CokingTraceChartDTO;
+import com.iailab.module.ansteel.coking.dto.CokingTraceDataDTO;
+import com.iailab.module.ansteel.common.enums.ProcessConfDataTypeEnum;
+import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
+import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
+import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
+import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
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;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.*;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -25,32 +33,46 @@
public class DataController {
@Autowired
- private DataApi dataApi;
+ private DataService dataService;
@GetMapping("/power-run-state/list")
@Operation(summary = "发电厂机组运行情况")
public CommonResult<List<PowerRunStateDTO>> getPowerRunState(@RequestParam Map<String, Object> params) {
- List<PowerRunStateDTO> list = dataApi.getPowerRunState();
+ List<PowerRunStateDTO> list = dataService.getPowerRunState();
return success(list);
}
@PostMapping("/predict-data/charts")
@Operation(summary = "预测数据图表")
public CommonResult<PreDataChartRespVO> getPreDataChart(@RequestBody PreDataSingleChartReqVO reqVO) {
- PreDataChartRespVO respVO = dataApi.getPreDataChart(reqVO);
+ PreDataChartRespVO respVO = dataService.getPreDataChart(reqVO);
return CommonResult.success(respVO);
}
@PostMapping("/plan-data/charts")
@Operation(summary = "计划数据图表")
public CommonResult<Map<String, Object>> getPlanDataChart(@RequestBody PlanDataChartReqVO reqVO) {
- Map<String, Object> tMap = dataApi.getPlanDataChart(reqVO);
+ Map<String, Object> tMap = dataService.getPlanDataChart(reqVO);
return CommonResult.success(tMap);
}
@PostMapping("/schedule-suggest/use-suggest")
@Operation(summary = "采纳建议")
public CommonResult<Boolean> useSuggest(@RequestBody StAlarmAndSuggestReqVO ReqVO) {
- return success(dataApi.useSuggest(ReqVO));
+ return success(dataService.useSuggest(ReqVO));
}
+
+ @PostMapping("/schedule-suggest/ignore-suggest")
+ @Operation(summary = "忽略建议")
+ public CommonResult<Boolean> ignoreSuggest(@RequestBody StAlarmAndSuggestReqVO ReqVO) {
+ return success(dataService.ignoreSuggest(ReqVO));
+ }
+
+ @GetMapping("/data/history-value")
+ @Operation(summary = "指标/测点历史数据")
+ public CommonResult<List<Object[]>> getHistoryValue(@RequestParam Map<String, Object> params) {
+ return success(dataService.getHistoryValue(params));
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3