diff --git a/src/main/java/com/xydl/cac/controller/IcdConfigController.java b/src/main/java/com/xydl/cac/controller/IcdConfigController.java index 30da347..a9827e5 100644 --- a/src/main/java/com/xydl/cac/controller/IcdConfigController.java +++ b/src/main/java/com/xydl/cac/controller/IcdConfigController.java @@ -2,6 +2,7 @@ package com.xydl.cac.controller; import com.xydl.cac.entity.IcdConfigType; import com.xydl.cac.entity.IcdFile; +import com.xydl.cac.entity.IcdIed; import com.xydl.cac.exception.BusinessException; import com.xydl.cac.model.ColumnModel; import com.xydl.cac.model.IcdAttUpdateModel; @@ -55,6 +56,13 @@ public class IcdConfigController extends BasicController { return Response.success(result); } + @GetMapping("listIed") + @ApiOperation("查询icd文件的IED列表") + public Response> listIed() throws Exception { + List result = configService.listIed(); + return Response.success(result); + } + @GetMapping("list") @ApiOperation("查询全部类型列表") public Response> list(String iedName) throws Exception { @@ -63,7 +71,7 @@ public class IcdConfigController extends BasicController { } @GetMapping("iedList") - @ApiOperation("查询IED列表") + @ApiOperation("查询IED名字") public Response> iedList() { List result = configService.iedList(); return Response.success(result); diff --git a/src/main/java/com/xydl/cac/service/IcdFileConfigService.java b/src/main/java/com/xydl/cac/service/IcdFileConfigService.java index 288dee5..d37f6e1 100644 --- a/src/main/java/com/xydl/cac/service/IcdFileConfigService.java +++ b/src/main/java/com/xydl/cac/service/IcdFileConfigService.java @@ -2,6 +2,7 @@ package com.xydl.cac.service; import com.xydl.cac.entity.IcdConfigType; import com.xydl.cac.entity.IcdFile; +import com.xydl.cac.entity.IcdIed; import com.xydl.cac.model.IcdAttUpdateModel; import java.util.List; @@ -12,6 +13,8 @@ public interface IcdFileConfigService { List listFile(); + List listIed(); + List iedList(); List list(String iedName) throws Exception; diff --git a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java index 49d0ac2..db54839 100644 --- a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java @@ -90,6 +90,24 @@ public class IcdFileConfigServiceImpl implements IcdFileConfigService { return files; } + @Override + public List listIed() { + List result = new ArrayList<>(); + List icdFileList = fileRepository.findAll(); + if (CollectionUtils.isEmpty(icdFileList)) { + return result; + } + for (IcdFile icdFile : icdFileList) { + List iedList = iedRepository.findByIcdFileId(icdFile.getId()); + for (IcdIed ied : iedList) { + if (StringUtils.isNotBlank(ied.getIp())) { + result.add(ied); + } + } + } + return result; + } + private IcdIed findIcdIed(List list, String name) { for (IcdIed ied : list) { if (ied.getName().equalsIgnoreCase(name)) {