--- 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/fileupload/AddressReport.java 2016/02/16 09:40:51 2950 @@ -1,7 +1,8 @@ -package dk.daoas.adressevedligehold; +package dk.daoas.adressevedligehold.fileupload; import java.util.HashMap; import java.util.List; +import java.util.Map.Entry; import java.util.Properties; import javax.mail.Message; @@ -13,11 +14,11 @@ 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; /* - * TODO: detail rapport pr postnr - * TODO: ved mangel oversigten - skeln mellem om det er nye/CREATED eller om det er gamle kendte adresser + * */ public class AddressReport { @@ -73,6 +74,8 @@ } } + private static TaskLogger logger = TaskLogger.getInstance(); + AddressManager addrManager; List
addressList; int entryCount; @@ -80,9 +83,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 +94,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(); @@ -105,7 +109,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 { @@ -125,7 +129,7 @@ } catch (MessagingException e) { - System.out.println("Unable to send report mail " + e.getMessage() ); + logger.warning("Unable to send report mail ", e ); } } @@ -135,15 +139,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 +236,16 @@ sb.append("
Gadeid | Vejnavn |
---|---|
").append(unknownStreet.getKey()).append(" | ").append(unknownStreet.getValue()).append(" |