From 361d394f020afb73691dd18ae85579a53f5c2783 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Wed, 21 Feb 2024 09:33:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E4=B8=8A=E4=B8=BB=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cac/controller/NSensorController.java     |  2 +-
 .../com/xydl/cac/service/NSensorService.java  |  4 ++--
 .../cac/service/impl/NSensorServiceImpl.java  | 23 +++++++++++++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xydl/cac/controller/NSensorController.java b/src/main/java/com/xydl/cac/controller/NSensorController.java
index 4a08524..3363b13 100644
--- a/src/main/java/com/xydl/cac/controller/NSensorController.java
+++ b/src/main/java/com/xydl/cac/controller/NSensorController.java
@@ -54,7 +54,7 @@ public class NSensorController extends BasicController {
 
     @GetMapping("listAll")
     @ApiOperation("查询列表")
-    public Response<List<NSensor>> listAll(@NotNull(message = "主设备编号不能缺少") @Param("zsbid") Integer zsbid) {
+    public Response<List<NSensor>> listAll(@NotNull(message = "主设备编号不能缺少") @Param("zsbid") Integer zsbid) throws Exception {
         List<NSensor> result = service.listAll(zsbid);
         return Response.success(result);
     }
diff --git a/src/main/java/com/xydl/cac/service/NSensorService.java b/src/main/java/com/xydl/cac/service/NSensorService.java
index b803f48..19db812 100644
--- a/src/main/java/com/xydl/cac/service/NSensorService.java
+++ b/src/main/java/com/xydl/cac/service/NSensorService.java
@@ -11,9 +11,9 @@ import java.util.List;
 import java.util.Map;
 
 public interface NSensorService {
-    List<NSensor> listAll(Integer zsbid);
+    List<NSensor> listAll(Integer zsbid) throws Exception;
 
-    Page<NSensor> list(int pageNum, int pageSize);
+    Page<NSensor> list(int pageNum, int pageSize) throws Exception;
 
     NSensor add(NSensor item) throws Exception;
 
diff --git a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
index fff8e4c..2f0a60b 100644
--- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
@@ -10,6 +10,7 @@ import com.xydl.cac.repository.NPointRepository;
 import com.xydl.cac.repository.NSensorRepository;
 import com.xydl.cac.service.DataService;
 import com.xydl.cac.service.NSensorService;
+import com.xydl.cac.service.ZsbService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;
@@ -33,22 +34,40 @@ public class NSensorServiceImpl implements NSensorService {
     NPointRepository pointRepository;
     @Resource
     DataService dataService;
+    @Resource
+    ZsbService zsbService;
 
     @Override
-    public List<NSensor> listAll(Integer zsbid) {
+    public List<NSensor> listAll(Integer zsbid) throws Exception {
         List<NSensor> list;
         if (zsbid == null) {
             list = repository.findAll();
         } else {
             list = repository.findByZsbId(zsbid);
         }
+        this.fillZsbName(list);
         return list;
     }
 
+    private void fillZsbName(List<NSensor> list) throws Exception {
+        List<Zsb> zsbList = zsbService.listAll(null);
+        if (!CollectionUtils.isEmpty(list) && !CollectionUtils.isEmpty(zsbList)) {
+            for (NSensor sensor : list) {
+                for (Zsb zsb : zsbList) {
+                    if (zsb.getId().equals(sensor.getZsbId())) {
+                        sensor.setZsbName(zsb.getMc());
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
     @Override
-    public Page<NSensor> list(int pageNum, int pageSize) {
+    public Page<NSensor> list(int pageNum, int pageSize) throws Exception {
         PageRequest request = PageRequest.of(pageNum, pageSize);
         Page<NSensor> result = repository.findAll(request);
+        this.fillZsbName(result.getContent());
         return result;
     }