--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/dawa/DawaTask.java 2016/04/19 19:55:19 3008 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/dawa/DawaTask.java 2016/07/22 09:53:45 3070 @@ -1,11 +1,13 @@ package dk.daoas.adressevedligehold.dawa; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Set; +import java.util.Map.Entry; import java.util.TreeMap; -import java.util.TreeSet; + +import com.google.common.base.Splitter; import dk.daoas.adressevedligehold.MailSender; import dk.daoas.adressevedligehold.beans.Address; @@ -13,6 +15,7 @@ import dk.daoas.adressevedligehold.db.DatabaseCoverageUpdate; import dk.daoas.adressevedligehold.tasks.Task; import dk.daoas.adressevedligehold.tasks.TaskLogger; +import dk.daoas.adressevedligehold.util.CountMap; import dk.daoas.adressevedligehold.util.DeduplicateHelper; import dk.daoas.adressevedligehold.util.TimingHelper; @@ -24,18 +27,21 @@ public class DawaTask extends Task { - final String kommentarTemplate = "Oprettet via DAWA"; + final static String KOMMENTAR_TEMPLATE = "Oprettet via DAWA"; private TaskLogger logger = TaskLogger.getInstance(); private short regionCode; private String regionName; + int antalBehandlede = 0; + int antalKommuner = 0; + + DeduplicateHelper dedup = new DeduplicateHelper<>(); - DatabaseCoverageUpdate db = new DatabaseCoverageUpdate(); - DeduplicateHelper dedup = new DeduplicateHelper<>(); + public DawaTask(short regionCode, String regionName){ this.regionCode = regionCode; @@ -46,7 +52,9 @@ @Override protected void taskRun() throws Exception { TimingHelper timer = new TimingHelper(); - + + DatabaseCoverageUpdate db = new DatabaseCoverageUpdate(); + DawaWebservice dawa = new DawaWebservice(); TreeMap search = new TreeMap<>(); @@ -77,10 +85,14 @@ StringBuilder headerSB = new StringBuilder(); headerSB.append("

Indlæsnings rapport for " + regionName + "


"); - int totalAntalNye = 0; - int totalAntalFejl = 0; - int totalAntalUkendt = 0; - int totalAntalDobbelt = 0; + List
totalNye = new ArrayList<>(); + List
totalFejl = new ArrayList<>(); + CountMap totalUkendtDAV = new CountMap(); + CountMap totalDobbeltDav = new CountMap(); + + + + antalKommuner = kommuner.size(); StringBuilder sb = new StringBuilder(); @@ -94,20 +106,23 @@ List
dawaListe = dawa.adresserIKommune(kommunekode); // stage 3 søg - Set ukendteDAV = new TreeSet<>(); - Set dobbeltGadeidDAV = new TreeSet<>(); + CountMap ukendteDAV = new CountMap(); + CountMap dobbeltGadeidDAV = new CountMap(); 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); + String key = dav + " " + dawaAddr.vejnavn; + ukendteDAV.increment(key); continue; } if (gade.gadeids.size() != 1) { - dobbeltGadeidDAV.add(dav + " " + dawaAddr.vejnavn); + String key = dav + " " + dawaAddr.vejnavn; + dobbeltGadeidDAV.increment(key); + continue; } boolean fundet = false; @@ -121,7 +136,7 @@ if (fundet == false) { dawaAddr.gadeid = gade.gadeids.iterator().next(); dawaAddr.state = AddressState.CREATED; - dawaAddr.kommentar = kommentarTemplate; + dawaAddr.kommentar = KOMMENTAR_TEMPLATE; nyeAdresser.add(dawaAddr); } } @@ -129,7 +144,7 @@ db.saveNewAddresses(nyeAdresser); - logger.info("Save to db done - sending report mail"); + logger.info("Save to db done - adding to report mail"); List
saveOK = new ArrayList<>(); List
saveFail = new ArrayList<>(); @@ -141,63 +156,86 @@ } } - totalAntalNye += saveOK.size(); - totalAntalFejl += saveFail.size(); - totalAntalUkendt += ukendteDAV.size(); - totalAntalDobbelt += dobbeltGadeidDAV.size(); + totalNye.addAll(saveOK); + totalFejl.addAll(saveFail); + + totalUkendtDAV.putAll(ukendteDAV); + totalDobbeltDav.putAll(dobbeltGadeidDAV); + + + antalBehandlede++; sb.append("

Kommune: " + kommunenavn + "

\n"); + + sb.append("Kommunekode: " + kommunekode + "
\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"); + logger.info("Sendingreport mail"); + + headerSB.append("Antal Inserts: " + totalNye.size() + "
\n"); + headerSB.append("Antal insert fails: " + totalFejl.size() + "
\n"); + headerSB.append("Antal ukendte dav: " + totalUkendtDAV.size() + "
\n"); + headerSB.append("Antal dobbelt gadeid dav: " + totalDobbeltDav.size() + "
\n"); headerSB.append("Elapsed: " + timer.getElapsed() + " ms.
\n"); - MailSender.sendMail(subject, headerSB.toString() + sb.toString() ); + Map attachments = new TreeMap<>(); + attachments.put("saveok.csv", buildAddressFile(totalNye) ); + attachments.put("savefailed.csv", buildAddressFile(totalFejl) ); + + attachments.put("ukendte_dav.csv", buildDavFile(totalUkendtDAV) ); + attachments.put("dobbelt_dav_gadeid.csv", buildDavFile(totalDobbeltDav) ); + + + MailSender.sendMailWithAttachments(subject, headerSB.toString() + sb.toString(), attachments); + + //Cleaning + dedup.clear(); } - private void addressTable(StringBuilder sb, List
addr) { - sb.append("\n"); - sb.append(""); + private String buildDavFile(CountMap dav) { + StringBuilder sb = new StringBuilder(); + + sb.append("DAVid;Vejnavn;Antal\r\n"); + for ( Entry entry : dav.entrySet()) { + + List split = Splitter.on(' ').limit(2).splitToList(entry.getKey()); + sb.append( split.get(0) ).append(";");//DAVid + sb.append( split.get(1) ).append(";");//vejnavn + + sb.append( entry.getValue() ).append("\r\n");//vejnavn + + } + + return sb.toString(); + } + + private String buildAddressFile(List
addr) { + + Collections.sort(addr); //brug dens egen compareTo funktion + + StringBuilder sb = new StringBuilder(); + + sb.append("GadeID;Postnr;Kom.kode;Vejkode;Vejnavn;Husnr;Litra\r\n"); for (Address a: addr) { - sb.append("
"); - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); + sb.append(a.gadeid).append(";"); + sb.append(a.postnr).append(";"); + sb.append(a.kommunekode).append(";"); + sb.append(a.vejkode).append(";"); + sb.append(a.vejnavn).append(";"); + sb.append(a.husnr).append(";"); + sb.append(a.husnrbogstav).append("\r\n"); } - 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"); + return sb.toString(); } + String getDAVid(Address addr) { String dav = String.format("%04d%03d%04d", addr.postnr, addr.kommunekode, addr.vejkode); @@ -216,7 +254,12 @@ @Override public double getPercentCompleted() { - return 0; + if (antalKommuner == 0) { + return 0; + } + + return (antalBehandlede / ((double)antalKommuner) ) * 100.0; + }