From 8072e2912fa06c90cd4fd101ab80adf2e7e77c83 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 11 四月 2025 12:01:00 +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 |   42 ++++++++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 14 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 6258055..c593163 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
@@ -48,23 +48,37 @@
         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));
     }
+
+    @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);
+    }
+
+    @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