From 304f30bd4e011f0f24a794e96abbd1daf0564163 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Fri, 25 Oct 2024 10:41:16 +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=8A=E4=BC=A0=E6=84=9F=E5=99=A8=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     |  3 +++
 .../xydl/cac/service/impl/IedDlConfigServiceImpl.java  | 10 ++++++++++
 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 6748c1b..cebc2de 100644
--- a/src/main/java/com/xydl/cac/entity/IedDlConfig.java
+++ b/src/main/java/com/xydl/cac/entity/IedDlConfig.java
@@ -54,4 +54,7 @@ public class IedDlConfig {
     @Column(name = "active")
     private Integer active;
 
+    @Transient
+    private NSensor sensor;
+
 }
\ 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 06db994..869d7aa 100644
--- a/src/main/java/com/xydl/cac/service/impl/IedDlConfigServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/IedDlConfigServiceImpl.java
@@ -1,8 +1,10 @@
 package com.xydl.cac.service.impl;
 
 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.IedDlConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -20,10 +22,18 @@ public class IedDlConfigServiceImpl implements IedDlConfigService {
 
     @Resource
     IedDlConfigRepository repository;
+    @Resource
+    NSensorRepository sensorRepository;
 
     @Override
     public List<IedDlConfig> listAll() {
         List<IedDlConfig> list = repository.findAll();
+        for (IedDlConfig item : list) {
+            List<NSensor> sensorList = sensorRepository.findByDevId(item.getDevId());
+            if (!CollectionUtils.isEmpty(sensorList)) {
+                item.setSensor(sensorList.get(0));
+            }
+        }
         return list;
     }