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 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 pointList = new ArrayList<>(); for (NPoint point : points) { if (StringUtils.isNotBlank(point.getField())) { + List unitList = unitRepository.findByField(point.getField()); + if (!CollectionUtils.isEmpty(unitList)) { + point.setUnit(unitList.get(0).getUnit()); + } pointList.add(point); } }