--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressReport.java 2016/01/28 16:12:28 2868 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressReport.java 2016/02/05 08:01:18 2924 @@ -2,6 +2,7 @@ import java.util.HashMap; import java.util.List; +import java.util.Map.Entry; import java.util.Properties; import javax.mail.Message; @@ -13,6 +14,7 @@ import dk.daoas.adressevedligehold.beans.Address; import dk.daoas.adressevedligehold.beans.Address.AddressState; +import dk.daoas.adressevedligehold.tasks.TaskLogger; import dk.daoas.adressevedligehold.util.TimingHelper; /* @@ -73,6 +75,8 @@ } } + private static TaskLogger logger = TaskLogger.getInstance(); + AddressManager addrManager; List
addressList; int entryCount; @@ -80,9 +84,10 @@ AddressSource source; TimingHelper timer; boolean writeBack; + int duplicateCount; //TODO: Afviste adresser - public AddressReport(AddressManager addrManager, int entryCount, EntryUgedage ugedage, AddressSource source, TimingHelper timer, boolean writeBack ) { + public AddressReport(AddressManager addrManager, int entryCount, EntryUgedage ugedage, AddressSource source, TimingHelper timer, boolean writeBack, int duplicateCount ) { this.addrManager = addrManager; addressList = addrManager.getAddressList(); this.entryCount = entryCount; @@ -90,11 +95,11 @@ this.source = source; this.timer = timer; this.writeBack = writeBack; - + this.duplicateCount = duplicateCount; } public void sendRapport() { - System.out.println("Sending mail"); + logger.info("Sending mail"); String reportData = getReportData(); String subject = "Indlæsnings rapport for " + source.getDistributor(); @@ -125,7 +130,7 @@ } catch (MessagingException e) { - System.out.println("Unable to send report mail " + e.getMessage() ); + logger.warning("Unable to send report mail ", e ); } } @@ -135,15 +140,26 @@ WeekEntry total = new WeekEntry(); HashMap"); sb.append("Mangler kommune/vejkode: ").append(antalUdenKommunekode).append("\n"); + sb.append("Mangler gadeid: ").append(antalUdenGadeid).append("\n"); sb.append("Mangler DBK bane: ").append(antalUdenDBKBane).append("\n"); sb.append("Mangler latitude/longitude: ").append(antalUdenLatitude).append("\n"); sb.append(""); @@ -217,7 +237,16 @@ sb.append("
Gadeid | Vejnavn |
---|---|
").append(unknownStreet.getKey()).append(" | ").append(unknownStreet.getValue()).append(" |