--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AdressSearch.java 2015/02/13 14:17:43 2277 +++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AdressSearch.java 2015/02/13 14:40:22 2280 @@ -21,6 +21,9 @@ Map idAddressMap; + Map hundredePct; + + public SearchResult search(String postnrStr, String adresse) { int postnr=0; @@ -103,9 +106,11 @@ gade.put(husnrSearch, a); } - System.out.println("Build -- stage 2"); - List extDao = DatabaseLayer.getExtendedAdresslistDao(); + //////////////////////////////////////////////////////////////////////////////////////// + System.out.println("Build -- stage 2 udvidet dækning"); + + List extDao = DatabaseLayer.getExtendedAdresslist(); for (ExtendedBean eb : extDao) { Address orgAddress = idAddressMap.get(eb.orgId); @@ -143,10 +148,31 @@ } + ////////////////////////////////////////////////////////////////////////////////////// + System.out.println("Build -- stage 3 - 100pct"); - System.out.println("Build -- stage 3"); - - System.out.println("Build -- stage 4"); + hundredePct = DatabaseLayer.get100PctList(); + for (Address addr : alleAdresser) { + if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { + continue; + } + + if (addr.distributor != null && addr.distributor.equals("LUKKET")) { + continue; + } + + + HundredePctBean bean = hundredePct.get(addr.postnr); + if (bean == null) { + continue; + } + + addr.daekningsType = DaekningsType.DAEKNING_100PCT; + addr.rute = bean.rute; + addr.koreliste = bean.koreliste; + addr.dbkBane = bean.dbkBane; + addr.distributor = bean.distributor; + } }