From 32f0262673a06e1452152fd772104eb392a29da7 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 14 Oct 2024 09:14:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2icd?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84IED=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cac/controller/IcdConfigController.java    | 10 +++++++++-
 .../xydl/cac/service/IcdFileConfigService.java |  3 +++
 .../service/impl/IcdFileConfigServiceImpl.java | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xydl/cac/controller/IcdConfigController.java b/src/main/java/com/xydl/cac/controller/IcdConfigController.java
index 30da347..a9827e5 100644
--- a/src/main/java/com/xydl/cac/controller/IcdConfigController.java
+++ b/src/main/java/com/xydl/cac/controller/IcdConfigController.java
@@ -2,6 +2,7 @@ package com.xydl.cac.controller;
 
 import com.xydl.cac.entity.IcdConfigType;
 import com.xydl.cac.entity.IcdFile;
+import com.xydl.cac.entity.IcdIed;
 import com.xydl.cac.exception.BusinessException;
 import com.xydl.cac.model.ColumnModel;
 import com.xydl.cac.model.IcdAttUpdateModel;
@@ -55,6 +56,13 @@ public class IcdConfigController extends BasicController {
         return Response.success(result);
     }
 
+    @GetMapping("listIed")
+    @ApiOperation("查询icd文件的IED列表")
+    public Response<List<IcdIed>> listIed() throws Exception {
+        List<IcdIed> result = configService.listIed();
+        return Response.success(result);
+    }
+
     @GetMapping("list")
     @ApiOperation("查询全部类型列表")
     public Response<List<IcdConfigType>> list(String iedName) throws Exception {
@@ -63,7 +71,7 @@ public class IcdConfigController extends BasicController {
     }
 
     @GetMapping("iedList")
-    @ApiOperation("查询IED列表")
+    @ApiOperation("查询IED名字")
     public Response<List<String>> iedList() {
         List<String> result = configService.iedList();
         return Response.success(result);
diff --git a/src/main/java/com/xydl/cac/service/IcdFileConfigService.java b/src/main/java/com/xydl/cac/service/IcdFileConfigService.java
index 288dee5..d37f6e1 100644
--- a/src/main/java/com/xydl/cac/service/IcdFileConfigService.java
+++ b/src/main/java/com/xydl/cac/service/IcdFileConfigService.java
@@ -2,6 +2,7 @@ package com.xydl.cac.service;
 
 import com.xydl.cac.entity.IcdConfigType;
 import com.xydl.cac.entity.IcdFile;
+import com.xydl.cac.entity.IcdIed;
 import com.xydl.cac.model.IcdAttUpdateModel;
 
 import java.util.List;
@@ -12,6 +13,8 @@ public interface IcdFileConfigService {
 
     List<IcdFile> listFile();
 
+    List<IcdIed> listIed();
+
     List<String> iedList();
 
     List<IcdConfigType> list(String iedName) throws Exception;
diff --git a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java
index 49d0ac2..db54839 100644
--- a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java
@@ -90,6 +90,24 @@ public class IcdFileConfigServiceImpl implements IcdFileConfigService {
         return files;
     }
 
+    @Override
+    public List<IcdIed> listIed() {
+        List<IcdIed> result = new ArrayList<>();
+        List<IcdFile> icdFileList = fileRepository.findAll();
+        if (CollectionUtils.isEmpty(icdFileList)) {
+            return result;
+        }
+        for (IcdFile icdFile : icdFileList) {
+            List<IcdIed> iedList = iedRepository.findByIcdFileId(icdFile.getId());
+            for (IcdIed ied : iedList) {
+                if (StringUtils.isNotBlank(ied.getIp())) {
+                    result.add(ied);
+                }
+            }
+        }
+        return result;
+    }
+
     private IcdIed findIcdIed(List<IcdIed> list, String name) {
         for (IcdIed ied : list) {
             if (ied.getName().equalsIgnoreCase(name)) {