From b36230deee863830743af0d69a0da15e2a539432 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Fri, 25 Oct 2024 11:05:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8B=E8=BD=BD=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=A1=A5=E4=B8=8AIed=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/entity/IedDlConfig.java    |  2 ++
 .../xydl/cac/service/impl/IedDlConfigServiceImpl.java | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/main/java/com/xydl/cac/entity/IedDlConfig.java b/src/main/java/com/xydl/cac/entity/IedDlConfig.java
index cebc2de..a783753 100644
--- a/src/main/java/com/xydl/cac/entity/IedDlConfig.java
+++ b/src/main/java/com/xydl/cac/entity/IedDlConfig.java
@@ -56,5 +56,7 @@ public class IedDlConfig {
 
     @Transient
     private NSensor sensor;
+    @Transient
+    private IcdIed ied;
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/xydl/cac/service/impl/IedDlConfigServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/IedDlConfigServiceImpl.java
index 869d7aa..cdd3139 100644
--- a/src/main/java/com/xydl/cac/service/impl/IedDlConfigServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/IedDlConfigServiceImpl.java
@@ -1,10 +1,12 @@
 package com.xydl.cac.service.impl;
 
+import com.xydl.cac.entity.IcdIed;
 import com.xydl.cac.entity.IedDlConfig;
 import com.xydl.cac.entity.NSensor;
 import com.xydl.cac.exception.BusinessException;
 import com.xydl.cac.repository.IedDlConfigRepository;
 import com.xydl.cac.repository.NSensorRepository;
+import com.xydl.cac.service.IcdFileConfigService;
 import com.xydl.cac.service.IedDlConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -24,15 +26,24 @@ public class IedDlConfigServiceImpl implements IedDlConfigService {
     IedDlConfigRepository repository;
     @Resource
     NSensorRepository sensorRepository;
+    @Resource
+    IcdFileConfigService configService;
 
     @Override
     public List<IedDlConfig> listAll() {
         List<IedDlConfig> list = repository.findAll();
+        List<IcdIed> iedList = configService.listIed();
         for (IedDlConfig item : list) {
             List<NSensor> sensorList = sensorRepository.findByDevId(item.getDevId());
             if (!CollectionUtils.isEmpty(sensorList)) {
                 item.setSensor(sensorList.get(0));
             }
+            for (IcdIed ied : iedList) {
+                if (ied.getId().intValue() == item.getIedId().intValue()) {
+                    item.setIed(ied);
+                    break;
+                }
+            }
         }
         return list;
     }