--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/dawa/DawaTask.java 2016/04/18 18:56:35 3002 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/dawa/DawaTask.java 2016/04/19 19:55:19 3008 @@ -1,8 +1,20 @@ package dk.daoas.adressevedligehold.dawa; -import com.google.gson.Gson; - +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; + +import dk.daoas.adressevedligehold.MailSender; +import dk.daoas.adressevedligehold.beans.Address; +import dk.daoas.adressevedligehold.beans.Address.AddressState; +import dk.daoas.adressevedligehold.db.DatabaseCoverageUpdate; import dk.daoas.adressevedligehold.tasks.Task; +import dk.daoas.adressevedligehold.tasks.TaskLogger; +import dk.daoas.adressevedligehold.util.DeduplicateHelper; +import dk.daoas.adressevedligehold.util.TimingHelper; /* * Alle regioner: http://dawa.aws.dk/regioner/ @@ -12,10 +24,18 @@ public class DawaTask extends Task { + final String kommentarTemplate = "Oprettet via DAWA"; + + private TaskLogger logger = TaskLogger.getInstance(); + private short regionCode; private String regionName; - private Gson gson = new Gson(); + + + DatabaseCoverageUpdate db = new DatabaseCoverageUpdate(); + + DeduplicateHelper dedup = new DeduplicateHelper<>(); public DawaTask(short regionCode, String regionName){ this.regionCode = regionCode; @@ -25,9 +45,164 @@ @Override protected void taskRun() throws Exception { - // TODO Auto-generated method stub + TimingHelper timer = new TimingHelper(); + + DawaWebservice dawa = new DawaWebservice(); + TreeMap search = new TreeMap<>(); + + // stage 1 - hent alle data + List
adresser = db.getAllAdresses(); + + + // stage 2 opbyg søge struktur + logger.info("Building search structure"); + + + for (Address addr : adresser) { + String dav = getDAVid(addr); + DawaGade gade = search.get(dav); + if (gade == null) { + gade = new DawaGade(); + search.put(dav, gade); + } + gade.gadeids.add( addr.gadeid ); + gade.adresser.add(addr); + } + logger.info("Build search structure done"); + + Map kommuner = dawa.kommunerIRegion(regionCode); + + String subject = "DAWA indlæsning - " + regionName; + + StringBuilder headerSB = new StringBuilder(); + headerSB.append("

Indlæsnings rapport for " + regionName + "


"); + + int totalAntalNye = 0; + int totalAntalFejl = 0; + int totalAntalUkendt = 0; + int totalAntalDobbelt = 0; + + + StringBuilder sb = new StringBuilder(); + + for (Map.Entry entry : kommuner.entrySet()) { + int kommunekode = entry.getValue(); + String kommunenavn = entry.getKey(); + + logger.info("Behandler: " + kommunekode + " " + kommunenavn); + + + List
dawaListe = dawa.adresserIKommune(kommunekode); + // stage 3 søg + Set ukendteDAV = new TreeSet<>(); + Set dobbeltGadeidDAV = new TreeSet<>(); + List
nyeAdresser = new ArrayList<>(); + + for (Address dawaAddr : dawaListe) { + String dav = getDAVid(dawaAddr); + DawaGade gade = search.get(dav); + if (gade == null) { + ukendteDAV.add(dav + " " + dawaAddr.vejnavn); + continue; + } + + if (gade.gadeids.size() != 1) { + dobbeltGadeidDAV.add(dav + " " + dawaAddr.vejnavn); + } + + boolean fundet = false; + for (Address target : gade.adresser) { + if ( target.husnr == dawaAddr.husnr && target.husnrbogstav.equals(dawaAddr.husnrbogstav) ) { + fundet = true; + break; + } + } + + if (fundet == false) { + dawaAddr.gadeid = gade.gadeids.iterator().next(); + dawaAddr.state = AddressState.CREATED; + dawaAddr.kommentar = kommentarTemplate; + nyeAdresser.add(dawaAddr); + } + } + logger.info("Address Search done - starting save to DB"); + + db.saveNewAddresses(nyeAdresser); + + logger.info("Save to db done - sending report mail"); + + List
saveOK = new ArrayList<>(); + List
saveFail = new ArrayList<>(); + for (Address a : nyeAdresser) { + if (a.state == AddressState.CREATE_FAIL) { + saveFail.add(a); + } else { + saveOK.add(a); + } + } + + totalAntalNye += saveOK.size(); + totalAntalFejl += saveFail.size(); + totalAntalUkendt += ukendteDAV.size(); + totalAntalDobbelt += dobbeltGadeidDAV.size(); + + + sb.append("

Kommune: " + kommunenavn + "

\n"); + sb.append("Antal Inserts: " + saveOK.size() + "
\n"); + sb.append("Antal insert fails: " + saveFail.size() + "
\n"); + sb.append("Antal ukendte dav: " + ukendteDAV.size() + "
\n"); + sb.append("Antal dobbelt gadeid dav: " + dobbeltGadeidDAV.size() + "
\n"); + + sb.append("

Adresser ok:

\n"); + addressTable(sb, saveOK); + + sb.append("

SQL INSERT fejl:

\n"); + addressTable(sb, saveFail); + + sb.append("

Ukendte DAV:

\n"); + for (String dav : ukendteDAV) { + sb.append(dav + "
\n"); + } + + sb.append("

Dobbelt gadeid DAV:

\n"); + for (String dav : dobbeltGadeidDAV) { + sb.append(dav + "
\n"); + } + + } + + headerSB.append("Antal Inserts: " + totalAntalNye + "
\n"); + headerSB.append("Antal insert fails: " + totalAntalFejl + "
\n"); + headerSB.append("Antal ukendte dav: " + totalAntalUkendt + "
\n"); + headerSB.append("Antal dobbelt gadeid dav: " + totalAntalDobbelt + "
\n"); + headerSB.append("Elapsed: " + timer.getElapsed() + " ms.
\n"); + + MailSender.sendMail(subject, headerSB.toString() + sb.toString() ); } + + private void addressTable(StringBuilder sb, List
addr) { + sb.append("\n"); + sb.append(""); + for (Address a: addr) { + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + } + sb.append("
GadeIDPostnrKom.kodeVejkodeVejnavnHusnrLitra
 ").append(a.gadeid).append("  ").append(a.postnr).append("  ").append(a.kommunekode).append("  ").append(a.vejkode).append("  ").append(a.vejnavn).append("  ").append(a.husnr).append("  ").append(a.husnrbogstav).append("

\n"); + + } + + String getDAVid(Address addr) { + String dav = String.format("%04d%03d%04d", addr.postnr, addr.kommunekode, addr.vejkode); + + return dedup.getInstance(dav); + } @Override public String getDescription() {