--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressReport.java 2016/01/28 17:04:34 2873 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/fileupload/AddressReport.java 2016/02/16 09:38:13 2949 @@ -1,4 +1,4 @@ -package dk.daoas.adressevedligehold; +package dk.daoas.adressevedligehold.fileupload; import java.util.HashMap; import java.util.List; @@ -14,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; /* @@ -74,6 +75,8 @@ } } + private static TaskLogger logger = TaskLogger.getInstance(); + AddressManager addrManager; List
addressList; int entryCount; @@ -81,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; @@ -91,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(); @@ -106,7 +110,7 @@ public static void sendMail(String subject, String htmlBody) { Properties props = new Properties(); - props.put("mail.smtp.host", "10.30.1.28"); + props.put("mail.smtp.host", "mail.dao.int"); //props.put("mail.smtp.host", "192.168.12.10"); try { @@ -126,7 +130,7 @@ } catch (MessagingException e) { - System.out.println("Unable to send report mail " + e.getMessage() ); + logger.warning("Unable to send report mail ", e ); } } @@ -136,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("");