From e516afbaba9c07f22945647d92f9ca122c0bf9b4 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Fri, 25 Oct 2024 13:36:20 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=B8=8B=E8=BD=BD=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xydl/cac/entity/IedDlRecord.java     |  3 +++
 .../cac/service/impl/IedDlRecordServiceImpl.java  | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/main/java/com/xydl/cac/entity/IedDlRecord.java b/src/main/java/com/xydl/cac/entity/IedDlRecord.java
index d3e7f73..d2f3fe3 100644
--- a/src/main/java/com/xydl/cac/entity/IedDlRecord.java
+++ b/src/main/java/com/xydl/cac/entity/IedDlRecord.java
@@ -42,4 +42,7 @@ public class IedDlRecord {
     @Column(name = "create_time")
     private Date createTime;
 
+    @Transient
+    IedDlConfig config;
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/xydl/cac/service/impl/IedDlRecordServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/IedDlRecordServiceImpl.java
index bfc4ba4..6d32112 100644
--- a/src/main/java/com/xydl/cac/service/impl/IedDlRecordServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/IedDlRecordServiceImpl.java
@@ -1,7 +1,9 @@
 package com.xydl.cac.service.impl;
 
+import com.xydl.cac.entity.IedDlConfig;
 import com.xydl.cac.entity.IedDlRecord;
 import com.xydl.cac.repository.IedDlRecordRepository;
+import com.xydl.cac.service.IedDlConfigService;
 import com.xydl.cac.service.IedDlRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -22,6 +24,8 @@ public class IedDlRecordServiceImpl implements IedDlRecordService {
 
     @Resource
     IedDlRecordRepository repository;
+    @Resource
+    IedDlConfigService configService;
 
     @Override
     public Page<IedDlRecord> list(Integer configId, int pageNum, int pageSize) throws Exception {
@@ -35,6 +39,17 @@ public class IedDlRecordServiceImpl implements IedDlRecordService {
             return predicate;
         };
         Page<IedDlRecord> result = repository.findAll(specification, request);
+        if (CollectionUtils.isEmpty(result.getContent())) {
+            List<IedDlConfig> configList = configService.listAll();
+            for (IedDlRecord item : result.getContent()) {
+                for (IedDlConfig config : configList) {
+                    if (item.getConfigId().intValue() == config.getId().intValue()) {
+                        item.setConfig(config);
+                        break;
+                    }
+                }
+            }
+        }
         return result;
     }