--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java 2015/06/14 15:24:44 2590 +++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java 2015/07/13 10:16:41 2597 @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.Set; import java.util.TreeSet; @@ -29,7 +30,13 @@ List alleAdresser; Adresse alleIkkeDaekkede[]; + Map> daekkedeAdresserHO = new HashMap>(); + + + + + DeduplicateHelper husnrbogstavCache = new DeduplicateHelper(); DeduplicateHelper ruteCache = new DeduplicateHelper(); @@ -137,9 +144,11 @@ + public Map> getDaekkedeAdresserHO() { + return daekkedeAdresserHO; + } - - public List hentAlleDaekkedeAdresser() throws SQLException { + public int hentAlleDaekkedeAdresser() throws SQLException { if ( alleAdresser == null ) { String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + "FROM fulddaekning.adressetabel a " + @@ -160,8 +169,21 @@ alleAdresser = new ArrayList(); alleAdresser.addAll(list); + + for(Adresse addr : list) { + short ho = addr.ho; + List hoListe = daekkedeAdresserHO.get(ho); + if ( hoListe == null) { + hoListe = new ArrayList(); + daekkedeAdresserHO.put(ho, hoListe); + } + + hoListe.add(addr); + + } } - return alleAdresser; + + return alleAdresser.size(); }