overflow_backup_2018_0455/overflow_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
crusader 2017-08-14 19:08:10 +09:00
commit bacc2da529
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,4 +23,6 @@ public interface InfraDAO extends JpaRepository<Infra, Long> {
@Query("SELECT DISTINCT i.target FROM Infra i WHERE i.probe IN (:probeList)")
List<Target> findAllTargetByProbeList(@Param("probeList") List<Probe> probeList);
// List<Infra> findAllByProbe(List<Probe> probeList);
}

11
src/main/java/com/loafle/overflow/module/infra/service/InfraService.java
View File

@ -4,6 +4,7 @@ import com.loafle.overflow.module.domain.model.Domain;
import com.loafle.overflow.module.infra.dao.InfraDAO;
import com.loafle.overflow.module.infra.model.Infra;
import com.loafle.overflow.module.probe.model.Probe;
import com.loafle.overflow.module.probe.service.ProbeService;
import com.loafle.overflow.module.target.model.Target;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -20,6 +21,9 @@ public class InfraService {
@Autowired
InfraDAO infraDAO;
@Autowired
private ProbeService probeService;
public Infra regist(Infra infra) {
return this.infraDAO.save(infra);
}
@ -32,6 +36,13 @@ public class InfraService {
return this.infraDAO.findAllByProbe(probe);
}
public List<Infra> readAllByDomain(Domain domain) {
List<Probe> probeList = this.probeService.readAllByDomain(domain);
return this.infraDAO.findAllByProbe(probeList);
}
public List<Infra> readAllByProbeList(List<Probe> probeList) {
return this.infraDAO.findAllByProbe(probeList);
}

3
src/test/java/com/loafle/overflow/module/infra/service/InfraServiceTest.java
View File

@ -90,9 +90,8 @@ public class InfraServiceTest {
Domain domain = new Domain();
domain.setId(1);
List<Probe> pl = this.probeService.readAllByDomain(domain);
List<Infra> fl = this.infraService.readAllByProbeList(pl);
List<Infra> fl = this.infraService.readAllByDomain(domain);
System.out.println(fl.size());