--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java 2016/01/28 11:07:07 2862 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/coveragefileupload/AddressManager.java 2016/09/19 13:41:02 3112 @@ -1,4 +1,4 @@ -package dk.daoas.adressevedligehold; +package dk.daoas.adressevedligehold.coveragefileupload; import java.sql.SQLException; import java.util.ArrayList; @@ -11,34 +11,37 @@ import org.apache.commons.lang3.StringUtils; -import dk.daoas.adressevedligehold.AddressSourceEntry.EntryType; import dk.daoas.adressevedligehold.beans.Address; import dk.daoas.adressevedligehold.beans.Address.AddressState; -import dk.daoas.adressevedligehold.db.DatabaseLayerImplementation; +import dk.daoas.adressevedligehold.coveragefileupload.AddressSourceEntry.EntryType; +import dk.daoas.adressevedligehold.db.DatabaseCoverageUpdate; +import dk.daoas.adressevedligehold.tasks.TaskLogger; import dk.daoas.adressevedligehold.util.DeduplicateHelper; import dk.daoas.adressevedligehold.util.MiscUtils; import dk.daoas.adressevedligehold.util.TimingHelper; /* - * TODO: håndtering af entry dupletter ! (+ rapportering af dem) - - - + * */ public class AddressManager { + private TaskLogger logger = TaskLogger.getInstance(); + + private int duplicateCount; List
addressList; Map> > searchStructure; - ArrayList afvisteEntries = new ArrayList(); + ArrayList rejectedEntries = new ArrayList(); - Map dbkBaneMap = new TreeMap(); + Map unknownStreets = new TreeMap(); + + Map dbkBaneMap = new TreeMap(); public AddressManager() throws SQLException { - DatabaseLayerImplementation db = new DatabaseLayerImplementation(); + DatabaseCoverageUpdate db = new DatabaseCoverageUpdate(); searchStructure = new TreeMap> >(); @@ -56,8 +59,8 @@ Short husnr = shortHelper.getInstance( a.husnr ); TreeMap> gade = searchStructure.get( gadeid ); - if (a.dbkBane > 0 && a.postnr<=4999) { - Short bane = dbkBaneMap.get(a.postnr); + if (a.dbkBane != null && a.dbkBane.length() > 0 && a.postnr<=4999) { + String bane = dbkBaneMap.get(a.postnr); if (bane == null) { dbkBaneMap.put(a.postnr, a.dbkBane); } @@ -82,12 +85,16 @@ list.trimToSize(); } - System.out.println("AddressManager ready, elapsed " + timer.getElapsed() + "ms"); + logger.info("AddressManager ready, elapsed " + timer.getElapsed() + "ms"); } - - public void closeUnvisitedAddresses(String distributor, EntryUgedage ugedage) { + + @SuppressWarnings("PMD.CollapsibleIfStatements") + public int closeUnvisitedAddresses(String distributor, EntryUgedage ugedage) { + + int totalClosed = 0; + for (Address addr : addressList) { if (addr.distributor == null) continue; @@ -162,9 +169,17 @@ if (addr.state == AddressState.NOT_CHANGED && closedCount>0) { addr.state = AddressState.CLOSED; } + + if (closedCount>0) { + totalClosed++; + } } + + return totalClosed; } + + public void dumpChanged() { int count = 0; for (Address addr : addressList) { @@ -179,16 +194,16 @@ continue; } - System.out.println(addr.state + ": " + addr.toStringExtended() ); - System.out.println(addr.getRuteString() ); + logger.info(addr.state + ": " + addr.toStringExtended() ); + logger.info(addr.getRuteString() ); if (count++ > 50) return; } } - public void writeBackChanges() { - System.out.println("Writing back changes"); + public void writeBackChanges() throws Exception{ + logger.info("Writing back changes"); TimingHelper timer = new TimingHelper(); List
updates = new ArrayList
(1024*1024); @@ -203,13 +218,14 @@ } } - DatabaseLayerImplementation db = new DatabaseLayerImplementation(); + DatabaseCoverageUpdate db = new DatabaseCoverageUpdate(); db.updateAddresses(updates); + db.saveNewAddresses(inserts); - System.out.println("Writeback done: elapsed " + timer.getElapsed() + "ms."); + logger.info("Writeback done: elapsed " + timer.getElapsed() + "ms."); } @@ -224,6 +240,11 @@ private void visitSingle(AddressSourceEntry entry) { TreeMap> gade = searchStructure.get( entry.gadeid ); if (gade == null) { + /* No need to register unknown streets, since we create all entries that we can + if (! unknownStreets.containsKey(entry.gadeid)) { + unknownStreets.put(entry.gadeid, entry.vejnavn); + }*/ + createFromEntry(entry); // if we get here there was no match - so we need to create it return; } @@ -233,22 +254,29 @@ createFromEntry(entry); // if we get here there was no match - so we need to create it return; } - + boolean found = false; for (Address addr : litraList) { if (addr.husnrbogstav.equals(entry.litra) ) { updateAddress(addr, entry); - return; //Done for now - no need to look at the rest of the list + found = true; // 1 visit should be enough but as long as there's duplicates on gadeid+husnr+litra we will visit them all + //when the issue with duplicates is resolved this should be reverted to a return or break } } - - createFromEntry(entry); // if we get here there was no match - so we need to create it + if (found == false) { + createFromEntry(entry); // if we get here there was no match - so we need to create it + } } + @SuppressWarnings("PMD.CollapsibleIfStatements") private void visitRange(AddressSourceEntry entry) { TreeMap> gade = searchStructure.get( entry.gadeid ); if (gade == null) { - System.out.println("[Range] Ukendt gadeID " + entry); + if (! unknownStreets.containsKey(entry.gadeid)) { + unknownStreets.put(entry.gadeid, entry.vejnavn); + } + + logger.info("[Range] Ukendt gadeID " + entry); return; } @@ -287,8 +315,8 @@ private void updateAddress(Address addr, AddressSourceEntry entry) { if ( addr.distributor != null && addr.distributor.equals(entry.distributor) == false) { - afvisteEntries.add(entry); - System.out.println("Afviser " + entry); + rejectedEntries.add(entry); + logger.info("Afviser " + entry); return; } @@ -310,7 +338,9 @@ } } } else { - System.out.println( "Double visit monday " + addr); + duplicateCount++; + logger.info( "Double visit monday " + addr); + return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters } } @@ -332,7 +362,9 @@ } } } else { - System.out.println( "Double visit tuesday " + addr); + duplicateCount++; + logger.info( "Double visit tuesday " + addr); + return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters } } @@ -352,7 +384,9 @@ } } } else { - System.out.println( "Double visit wednesday " + addr); + duplicateCount++; + logger.info( "Double visit wednesday " + addr); + return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters } } @@ -374,7 +408,9 @@ } } } else { - System.out.println( "Double visit thursday " + addr); + duplicateCount++; + logger.info( "Double visit thursday " + addr); + return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters } } @@ -395,7 +431,9 @@ } } } else { - System.out.println( "Double visit friday " + addr); + duplicateCount++; + logger.info( "Double visit friday " + addr); + return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters } } @@ -417,7 +455,9 @@ } } } else { - System.out.println( "Double visit saturday " + addr); + duplicateCount++; + logger.info( "Double visit saturday " + addr); + return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters } } @@ -438,7 +478,9 @@ } } } else { - System.out.println( "Double visit sunday " + addr); + duplicateCount++; + logger.info( "Double visit sunday " + addr); + return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters } } @@ -466,85 +508,84 @@ private void createFromEntry(AddressSourceEntry entry) { - if (entry.husnr == 999) { + if (entry.husnr >= 1000) { //husnumre i DK må kun være på 3 cifre return; } + + if (entry.husnr == 999 || entry.husnr == 998) { //frasorter de to højest gyldige husnr - det er typisk special adresser + return; + } + + if (entry.litra.length() > 1) { //litra må kun være på 1 tegn + return; + } + if (entry.litra.length() == 1) { + char litra = entry.litra.charAt(0); + if ( Character.isLetter(litra) == false ) { + return; + } + + } + if (entry.kommunekode == 0 || entry.vejkode == 0) { return; } if (entry.kommunekode < 100) { return; } - if (Short.parseShort(Integer.toString(entry.gadeid).substring(0, 4)) != entry.postnr) { - return; //gadeid / postnr mismatch - } + if (entry.vejkode > 9999) { + return; + } + if (entry.gadeid == 0) { + return; + } + + String gadeidStr = Integer.toString(entry.gadeid); + if (gadeidStr.length() != 9) { + return; + } + if (Short.parseShort(gadeidStr.substring(0, 4)) != entry.postnr) { + return; //gadeid / postnr mismatch + } - System.out.println("Opretter adresse ud fra " + entry); - Address a = new Address(); - a.state = AddressState.CREATED; - a.distributor = entry.distributor; - a.gadeid = entry.gadeid; - a.kommunekode = entry.kommunekode; - a.vejkode = entry.vejkode; - a.vejnavn = entry.vejnavn; - a.husnr = entry.husnr; - a.husnrbogstav = entry.litra; - a.postnr = entry.postnr; - //a.visited = true; + logger.info("Opretter adresse ud fra " + entry); - if (entry.ugedage.mandag) { - a.ruteMandag = entry.rute; - a.korelisteMandag = entry.koreliste; - } - if (entry.ugedage.tirsdag) { - a.ruteTirsdag = entry.rute; - a.korelisteTirsdag = entry.koreliste; - } - if (entry.ugedage.onsdag) { - a.ruteOnsdag = entry.rute; - a.korelisteOnsdag = entry.koreliste; - } - if (entry.ugedage.torsdag) { - a.ruteTorsdag = entry.rute; - a.korelisteTorsdag = entry.koreliste; - } - if (entry.ugedage.fredag) { - a.ruteFredag = entry.rute; - a.korelisteFredag = entry.koreliste; - } - if (entry.ugedage.lordag) { - a.ruteLordag = entry.rute; - a.korelisteLordag = entry.koreliste; - } - if (entry.ugedage.sondag) { - a.ruteSondag = entry.rute; - a.korelisteLordag = entry.koreliste; - } + Address addr = new Address(); + addr.state = AddressState.CREATED; - updateDbkBane(a); + addr.distributor = entry.distributor; + addr.gadeid = entry.gadeid; + addr.kommunekode = entry.kommunekode; + addr.vejkode = entry.vejkode; + addr.vejnavn = entry.vejnavn; + addr.husnr = entry.husnr; + addr.husnrbogstav = entry.litra; + addr.postnr = entry.postnr; - // Nu er det nye adresse object oprettet - nu skal det gemmes i søge strukturen og totallisten + updateAddress(addr, entry); - TreeMap> gade = searchStructure.get( a.gadeid ); + + // Nu er det nye adresse object oprettet - nu skal det gemmes i søge strukturen og totallisten + TreeMap> gade = searchStructure.get( addr.gadeid ); if (gade == null) { gade = new TreeMap>(); - searchStructure.put(a.gadeid, gade); + searchStructure.put(addr.gadeid, gade); } - ArrayList
litraList = gade.get(a.husnr); + ArrayList
litraList = gade.get(addr.husnr); if (litraList == null) { litraList = new ArrayList
(); - gade.put(a.husnr, litraList); + gade.put(addr.husnr, litraList); } - litraList.add(a); - addressList.add(a); + litraList.add(addr); + addressList.add(addr); } @@ -568,9 +609,9 @@ private void updateDbkBane(Address a) { List daoBane205 = Arrays.asList( new Short[] {7,10,11,12,12,14,15,16,18,19,20} ); - - - Short bane = null; + + + String bane = null; switch (a.distributor) { case "BK": @@ -578,26 +619,32 @@ break; case "DAO": String koreliste = MiscUtils.firstNonNull(a.korelisteMandag,a.korelisteLordag, a.korelisteSondag); //DAO har kun 3 dækningstyper - short first2 = Short.parseShort( koreliste.substring(0,2) ); - if ( daoBane205.contains(first2) ) { - bane = 205; - } else if (first2 >= 24 && first2<=30) { - bane = 201; - } else { - bane = 202; + try { + short first2 = Short.parseShort( koreliste.substring(0,2) ); + if ( daoBane205.contains(first2) ) { //Brabrand == 205 == W2 + bane = "W2"; + } else if (first2 >= 24 && first2<=30) { // DAO-Øvrig = 201 = W4 + bane = "W4"; + } else { // DAO-Syd= 202 + bane = "W3"; + } + } catch (NumberFormatException e) { + throw new RuntimeException("Error parsing koreliste '" + koreliste + "' for " + a); } break; - case "FD": - bane = 200; + case "FD": // FD == Bane 200 = W5 + bane = "W5"; break; - case "NS": - bane = 204; - break; + case "NS": // NS == Bane 204 == W1 + bane = "204"; + break; + default: + throw new RuntimeException("Ukendt distributor: " + a.distributor); //Silence findBugs } if (bane == null) { - throw new RuntimeException("Ukendt bane for postnr" + a.postnr); + throw new RuntimeException("Ukendt bane for postnr: " + a.postnr); } if (a.dbkBane != bane) { @@ -612,10 +659,16 @@ return Collections.unmodifiableList(addressList); } + public Map getUnknownStreets() { + return Collections.unmodifiableMap( unknownStreets ); + } + public int getDuplicateCount() { + return duplicateCount; + } - public int getAfvistAntal() { - return afvisteEntries.size(); + public int getRejectedCount() { + return rejectedEntries.size(); } }