overflow_cloud/central
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
crusader 2018-06-11 15:34:29 +09:00
parent 9b697a9fc7
commit ad2030c7af
3 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -50,7 +50,7 @@
<dependency> <dependency>
<groupId>com.loafle.overflow</groupId> <groupId>com.loafle.overflow</groupId>
<artifactId>commons-java</artifactId> <artifactId>commons-java</artifactId>
<version>1.0.22-SNAPSHOT</version> <version>1.0.24-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

13
src/main/java/com/loafle/overflow/central/module/infra/dao/InfraDAO.java
View File

@ -1,8 +1,6 @@
package com.loafle.overflow.central.module.infra.dao; package com.loafle.overflow.central.module.infra.dao;
import com.loafle.overflow.model.infra.Infra; import com.loafle.overflow.model.infra.Infra;
import com.loafle.overflow.model.probe.Probe;
import com.loafle.overflow.model.target.Target;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
@ -15,14 +13,11 @@ import java.util.List;
*/ */
@Repository @Repository
public interface InfraDAO extends JpaRepository<Infra, Long> { public interface InfraDAO extends JpaRepository<Infra, Long> {
List<Infra> findAllByProbeId(Long probeID); List<Infra> findAllByProbeId(Long probeId);
Page<Infra> findAllByProbeId(Long probeID, Pageable pageable); Page<Infra> findAllByProbeId(Long probeId, Pageable pageable);
Page<Infra> findAllByProbeIn(List<Probe> probes, Pageable pageable); Page<Infra> findAllByProbeIdIn(List<Long> probeIds, Pageable pageable);
List<Target> findAllTargetByProbeIn(List<Probe> probes);
// Infra findByTargetId(Long targetID);
Page<Infra> findAllByProbeDomainId(Long probeDomainId, Pageable pageable);
} }

14
src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraService.java
View File

@ -4,7 +4,6 @@ import com.loafle.overflow.central.commons.utils.PageUtil;
import com.loafle.overflow.central.module.infra.dao.InfraDAO; import com.loafle.overflow.central.module.infra.dao.InfraDAO;
import com.loafle.overflow.core.model.PageParams; import com.loafle.overflow.core.model.PageParams;
import com.loafle.overflow.model.probe.Probe; import com.loafle.overflow.model.probe.Probe;
import com.loafle.overflow.central.module.sensor.dao.SensorDAO;
import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.model.discovery.Host; import com.loafle.overflow.model.discovery.Host;
import com.loafle.overflow.model.discovery.Zone; import com.loafle.overflow.model.discovery.Zone;
@ -33,9 +32,6 @@ public class CentralInfraService implements InfraService {
@Autowired @Autowired
InfraDAO infraDAO; InfraDAO infraDAO;
@Autowired
SensorDAO sensorDAO;
@Autowired @Autowired
private ProbeService probeService; private ProbeService probeService;
@ -62,14 +58,6 @@ public class CentralInfraService implements InfraService {
return infraList; return infraList;
} }
public InfraZone regist(Long probeID, List<Host> hosts, List<com.loafle.overflow.model.discovery.Service> services) throws OverflowException {
// List<Target> targets = new ArrayList<Target>();
// targets.addAll(registDiscoveredHostTargets(probeId, hosts));
// targets.addAll(this.registDiscoveredServiceTargets(probeId, services));
return null;
}
public InfraZone regist(Long probeID, Zone zone) throws OverflowException { public InfraZone regist(Long probeID, Zone zone) throws OverflowException {
return null; return null;
} }
@ -87,7 +75,7 @@ public class CentralInfraService implements InfraService {
NoAuthProbeDescriptionNetwork networkInfo = noAuthProbeDescription.getNetwork(); NoAuthProbeDescriptionNetwork networkInfo = noAuthProbeDescription.getNetwork();
InfraHostIP infraHostIP = new InfraHostIP(); InfraHostIP infraHostIP = new InfraHostIP();
// FIXME getting IPType from networkInfo // FIXME getting IPType from networkInfo
infraHostIP.setMetaIPType(new MetaIPType((short)1)); infraHostIP.setMetaIPType(new MetaIPType((short) 1));
infraHostIP.setAddress(networkInfo.getAddress()); infraHostIP.setAddress(networkInfo.getAddress());
infraHostIP.setMac(networkInfo.getMacAddress()); infraHostIP.setMac(networkInfo.getMacAddress());
List<InfraHostIP> infraHostIPs = new ArrayList<>(); List<InfraHostIP> infraHostIPs = new ArrayList<>();