From c4a677f7b674d478ac836f3543d787e45b712416 Mon Sep 17 00:00:00 2001 From: insanity Date: Tue, 12 Jun 2018 17:10:46 +0900 Subject: [PATCH] centralinfraservice --- pom.xml | 2 +- .../central/module/infra/dao/InfraDAO.java | 2 ++ .../infra/service/CentralInfraService.java | 17 ++++++++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 22552dd..844b274 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ com.loafle.overflow commons-java - 1.0.51-SNAPSHOT + 1.0.53-SNAPSHOT diff --git a/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraDAO.java b/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraDAO.java index 1b350f1..f0a0a5e 100644 --- a/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraDAO.java +++ b/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraDAO.java @@ -15,6 +15,8 @@ import java.util.List; public interface InfraDAO extends JpaRepository { List findAllByProbeId(Long probeId); + List findAllByProbeDomainId(Long probeDomainId); + Page findAllByProbeId(Long probeId, Pageable pageable); Page findAllByProbeIdIn(List probeIds, Pageable pageable); diff --git a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraService.java b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraService.java index 92f238f..7b8032e 100644 --- a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraService.java +++ b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraService.java @@ -269,9 +269,9 @@ public class CentralInfraService implements InfraService { return infras; } - public InfraHost registByNoAuthProbe(Long probeID, InfraHost infraHost) - throws OverflowException { - // NoAuthProbeDescriptionNetwork networkInfo = noAuthProbeDescription.getNetwork(); + public InfraHost registByNoAuthProbe(Long probeID, InfraHost infraHost) throws OverflowException { + // NoAuthProbeDescriptionNetwork networkInfo = + // noAuthProbeDescription.getNetwork(); // InfraHostIP infraHostIP = new InfraHostIP(); // // FIXME getting IPType from networkInfo // infraHostIP.setMetaIPType(new MetaIPType((short) 1)); @@ -306,8 +306,19 @@ public class CentralInfraService implements InfraService { return this.infraDAO.findAllByProbeDomainId(domainID, PageUtil.getPageRequest(pageParams)); } + @Override + public List readAllInfraByProbeID(Long probeID) throws OverflowException { + return this.infraDAO.findAllByProbeId(probeID); + } + + @Override + public List readAllInfraByDomainID(Long domainID) throws OverflowException { + return this.infraDAO.findAllByProbeDomainId(domainID); + } + public List readAllInfraZoneByProbeDomainID(Long probeDomainID) throws OverflowException { return null; } + }