--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java 2016/01/27 20:45:49 2854
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/fileupload/AddressManager.java 2016/02/16 11:28:27 2952
@@ -1,4 +1,4 @@
-package dk.daoas.adressevedligehold;
+package dk.daoas.adressevedligehold.fileupload;
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.db.DatabaseCoverageUpdate;
+import dk.daoas.adressevedligehold.fileupload.AddressSourceEntry.EntryType;
+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 unknownStreets = new TreeMap();
Map dbkBaneMap = new TreeMap();
public AddressManager() throws SQLException {
- DatabaseLayerImplementation db = new DatabaseLayerImplementation();
+ DatabaseCoverageUpdate db = new DatabaseCoverageUpdate();
searchStructure = new TreeMap> >();
@@ -82,11 +85,12 @@
list.trimToSize();
}
- System.out.println("AddressManager ready, elapsed " + timer.getElapsed() + "ms");
+ logger.info("AddressManager ready, elapsed " + timer.getElapsed() + "ms");
}
-
+
+ @SuppressWarnings("PMD.CollapsibleIfStatements")
public void closeUnvisitedAddresses(String distributor, EntryUgedage ugedage) {
for (Address addr : addressList) {
if (addr.distributor == null)
@@ -179,8 +183,8 @@
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;
@@ -188,7 +192,7 @@
}
public void writeBackChanges() {
- System.out.println("Writing back changes");
+ logger.info("Writing back changes");
TimingHelper timer = new TimingHelper();
List updates = new ArrayList(1024*1024);
@@ -203,13 +207,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 +229,10 @@
private void visitSingle(AddressSourceEntry entry) {
TreeMap> gade = searchStructure.get( entry.gadeid );
if (gade == null) {
+ 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 +242,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 +303,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 +326,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 +350,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 +372,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 +396,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 +419,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 +443,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,13 +466,15 @@
}
}
} 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
}
}
- addr.visited = true;
+ //addr.visited = true;
if (addr.state == AddressState.NOT_CHANGED) {
if (addr.distributor == null) {
addr.state = AddressState.OPENED;
@@ -466,82 +496,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 (Short.parseShort(Integer.toString(entry.gadeid).substring(0, 4)) != entry.postnr) {
- return; //gadeid / postnr mismatch
+ if (entry.kommunekode < 100) {
+ return;
}
+ 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);
}
@@ -590,11 +622,13 @@
break;
case "NS":
bane = 204;
- break;
+ 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) {
@@ -609,10 +643,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();
}
}