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 listAll() { List list = repository.findAll(); + for (IedDlConfig item : list) { + List sensorList = sensorRepository.findByDevId(item.getDevId()); + if (!CollectionUtils.isEmpty(sensorList)) { + item.setSensor(sensorList.get(0)); + } + } return list; }