From abd54e55b54c6a46f469087497317e1c19f3e8b8 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 26 Feb 2024 11:48:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E9=87=8C=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/entity/NPoint.java              | 2 ++
 .../java/com/xydl/cac/service/impl/NSensorServiceImpl.java | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/com/xydl/cac/entity/NPoint.java b/src/main/java/com/xydl/cac/entity/NPoint.java
index bf15779..bc8c334 100644
--- a/src/main/java/com/xydl/cac/entity/NPoint.java
+++ b/src/main/java/com/xydl/cac/entity/NPoint.java
@@ -51,6 +51,8 @@ public class NPoint {
 
     @Transient
     private int row;
+    @Transient
+    private String unit;
 
     @Transient
     private List<Object> data;
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 dc06229..20fc4eb 100644
--- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
@@ -8,6 +8,7 @@ import com.xydl.cac.model.SensorDetail;
 import com.xydl.cac.model.SensorUpdateModel;
 import com.xydl.cac.repository.NPointRepository;
 import com.xydl.cac.repository.NSensorRepository;
+import com.xydl.cac.repository.UnitRepository;
 import com.xydl.cac.service.DataService;
 import com.xydl.cac.service.NSensorService;
 import com.xydl.cac.service.ZsbService;
@@ -33,6 +34,8 @@ public class NSensorServiceImpl implements NSensorService {
     @Resource
     NPointRepository pointRepository;
     @Resource
+    UnitRepository unitRepository;
+    @Resource
     DataService dataService;
     @Resource
     ZsbService zsbService;
@@ -126,6 +129,10 @@ public class NSensorServiceImpl implements NSensorService {
         List<NPoint> pointList = new ArrayList<>();
         for (NPoint point : points) {
             if (StringUtils.isNotBlank(point.getField())) {
+                List<Unit> unitList = unitRepository.findByField(point.getField());
+                if (!CollectionUtils.isEmpty(unitList)) {
+                    point.setUnit(unitList.get(0).getUnit());
+                }
                 pointList.add(point);
             }
         }