From d79903f517beb832aa77939e804d5fd6bd654b10 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期日, 13 四月 2025 13:22:39 +0800
Subject: [PATCH] CokingProcessMainEntity

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
index 2ec3476..678c606 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
@@ -1,24 +1,30 @@
 package com.iailab.module.ansteel.api.controller.admin;
 
+import com.iailab.framework.common.exception.ErrorCode;
+import com.iailab.framework.common.exception.enums.GlobalErrorCodeConstants;
 import com.iailab.framework.common.pojo.CommonResult;
 import com.iailab.framework.common.util.object.ConvertUtils;
 import com.iailab.module.ansteel.api.dto.PowerCapacitorStatusDTO;
 import com.iailab.module.ansteel.api.dto.PowerControlDetDTO;
 import com.iailab.module.ansteel.api.dto.PowerControlMainDTO;
 import com.iailab.module.ansteel.api.dto.PowerNetFactorDTO;
+import com.iailab.module.ansteel.api.entity.PowerControlDetEntity;
 import com.iailab.module.ansteel.api.entity.PowerControlMainEntity;
 import com.iailab.module.ansteel.api.entity.PowerNetFactorEntity;
 import com.iailab.module.ansteel.api.entity.PowerRunStateEntity;
+import com.iailab.module.ansteel.api.service.PowerControlDetService;
 import com.iailab.module.ansteel.api.service.PowerControlMainService;
 import com.iailab.module.ansteel.api.service.PowerNetFactorService;
 import com.iailab.module.ansteel.api.service.PowerRunStateService;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.View;
 
 import java.util.List;
 import java.util.Map;
@@ -46,31 +52,35 @@
     @Autowired
     private PowerControlMainService powerControlMainService;
 
+    @Autowired
+    private PowerControlDetService powerControlDetService;
+
     @GetMapping("/net-factor/list")
-    @Operation(summary = "电力功率因数-电网拓扑")
+    @Operation(summary = "功率因数-电网拓扑")
     public CommonResult<List<PowerNetFactorDTO>> getPowerNetFactorList(@RequestParam Map<String, Object> params) {
         List<PowerNetFactorEntity> list = powerNetFactorService.list(params);
         return success(ConvertUtils.sourceToTarget(list, PowerNetFactorDTO.class));
     }
 
     @GetMapping("/capacitor-status/list")
-    @Operation(summary = "电力功率因数-电容器投运状态")
+    @Operation(summary = "功率因数-电容器投运状态")
     public CommonResult<List<PowerCapacitorStatusDTO>> getPowerCapacitorStatusList(@RequestParam Map<String, Object> params) {
         List<PowerRunStateEntity> list = powerRunStateService.list(params);
         return success(ConvertUtils.sourceToTarget(list, PowerCapacitorStatusDTO.class));
     }
 
-    @GetMapping("/control-main/list")
-    @Operation(summary = "电力功率因数-管控功率因数主表")
-    public CommonResult<List<PowerControlMainDTO>> getPowerControlMainList(@RequestParam Map<String, Object> params) {
-        List<PowerControlMainEntity> list = powerControlMainService.list(params);
-        return success(ConvertUtils.sourceToTarget(list, PowerControlMainDTO.class));
-    }
-
     @GetMapping("/control-det/list")
-    @Operation(summary = "电力功率因数-管控功率因数子表")
+    @Operation(summary = "功率因数-管控功率因数")
     public CommonResult<List<PowerControlDetDTO>> getPowerControlDetList(@RequestParam Map<String, Object> params) {
-        List<PowerControlMainEntity> list = powerControlMainService.list(params);
+        String name = (String)params.get("name");
+        if (StringUtils.isBlank(name)) {
+            return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST);
+        }
+        PowerControlMainEntity main = powerControlMainService.getByName(name);
+        if (main == null) {
+            return CommonResult.error(GlobalErrorCodeConstants.NOT_FOUND);
+        }
+        List<PowerControlDetEntity> list = powerControlDetService.list(main.getId());
         return success(ConvertUtils.sourceToTarget(list, PowerControlDetDTO.class));
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3