diff --git a/src/main/java/com/xydl/cac/entity/IedDlConfig.java b/src/main/java/com/xydl/cac/entity/IedDlConfig.java index cebc2de..a783753 100644 --- a/src/main/java/com/xydl/cac/entity/IedDlConfig.java +++ b/src/main/java/com/xydl/cac/entity/IedDlConfig.java @@ -56,5 +56,7 @@ public class IedDlConfig { @Transient private NSensor sensor; + @Transient + private IcdIed ied; } \ 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 869d7aa..cdd3139 100644 --- a/src/main/java/com/xydl/cac/service/impl/IedDlConfigServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/IedDlConfigServiceImpl.java @@ -1,10 +1,12 @@ package com.xydl.cac.service.impl; +import com.xydl.cac.entity.IcdIed; 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.IcdFileConfigService; import com.xydl.cac.service.IedDlConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -24,15 +26,24 @@ public class IedDlConfigServiceImpl implements IedDlConfigService { IedDlConfigRepository repository; @Resource NSensorRepository sensorRepository; + @Resource + IcdFileConfigService configService; @Override public List listAll() { List list = repository.findAll(); + List iedList = configService.listIed(); for (IedDlConfig item : list) { List sensorList = sensorRepository.findByDevId(item.getDevId()); if (!CollectionUtils.isEmpty(sensorList)) { item.setSensor(sensorList.get(0)); } + for (IcdIed ied : iedList) { + if (ied.getId().intValue() == item.getIedId().intValue()) { + item.setIed(ied); + break; + } + } } return list; }