From 77b06515edaa46cbbb0e55fe5f37db09aa8991fd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 22 四月 2025 16:06:40 +0800
Subject: [PATCH] 调整后的功率因数与无功倒送量

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java |   41 ++++++++++-------------------------------
 1 files changed, 10 insertions(+), 31 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 c593163..4a7fe68 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
@@ -2,10 +2,9 @@
 
 import com.iailab.framework.common.pojo.CommonResult;
 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.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;
@@ -25,60 +24,40 @@
 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));
     }
 
-    @GetMapping("/power-net-factor/list")
-    @Operation(summary = "电力功率因数-电网拓扑")
-    public CommonResult<List<PowerNetFactorDTO>> getPowerNetFactorList(@RequestParam Map<String, Object> params) {
-        List<PowerNetFactorDTO> list = dataApi.getPowerNetFactorList();
-        return success(list);
+    @PostMapping("/schedule-suggest/ignore-suggest")
+    @Operation(summary = "忽略建议")
+    public CommonResult<Boolean> ignoreSuggest(@RequestBody StAlarmAndSuggestReqVO ReqVO) {
+        return success(dataService.ignoreSuggest(ReqVO));
     }
 
-    @GetMapping("/power-capacitor-status/list")
-    @Operation(summary = "电力功率因数-电容器投运状态")
-    public CommonResult<List<PowerCapacitorStatusDTO>> getPowerCapacitorStatusList(@RequestParam Map<String, Object> params) {
-        List<PowerCapacitorStatusDTO> list = dataApi.getPowerCapacitorStatusList();
-        return success(list);
-    }
 
-    @GetMapping("/power-control-main/list")
-    @Operation(summary = "电力功率因数-管控功率因数主表")
-    public CommonResult<List<PowerControlMainDTO>> getPowerControlMainList(@RequestParam Map<String, Object> params) {
-        List<PowerControlMainDTO> list = dataApi.getPowerControlMainList();
-        return success(list);
-    }
-
-    @GetMapping("/power-control-det/list")
-    @Operation(summary = "电力功率因数-管控功率因数子表")
-    public CommonResult<List<PowerControlDetDTO>> getPowerControlDetList(@RequestParam Map<String, Object> params) {
-        List<PowerControlDetDTO> list = dataApi.getPowerControlDetList(params);
-        return success(list);
-    }
 }
\ No newline at end of file

--
Gitblit v1.9.3