--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressReport.java 2016/01/24 21:48:55 2838 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressReport.java 2016/01/28 22:14:42 2876 @@ -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; @@ -15,9 +16,14 @@ import dk.daoas.adressevedligehold.beans.Address.AddressState; 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 { - class NumEntry { + static class NumEntry { int open = 0; int closed = 0; int modified = 0; @@ -38,7 +44,7 @@ this.created += other.created; } } - class WeekEntry { + static class WeekEntry { NumEntry man = new NumEntry(); NumEntry tir = new NumEntry(); NumEntry ons = new NumEntry(); @@ -68,7 +74,7 @@ } } - + AddressManager addrManager; List
addressList; int entryCount; EntryUgedage ugedage; @@ -78,6 +84,7 @@ //TODO: Afviste adresser public AddressReport(AddressManager addrManager, int entryCount, EntryUgedage ugedage, AddressSource source, TimingHelper timer, boolean writeBack ) { + this.addrManager = addrManager; addressList = addrManager.getAddressList(); this.entryCount = entryCount; this.ugedage = ugedage; @@ -93,39 +100,43 @@ String reportData = getReportData(); String subject = "Indlæsnings rapport for " + source.getDistributor(); + AddressReport.sendMail(subject, reportData); - Properties props = new Properties(); - props.put("mail.smtp.host", "10.30.1.28"); - //props.put("mail.smtp.host", "192.168.12.10"); - - try { - // create some properties and get the default Session - Session session = Session.getDefaultInstance(props, null); - session.setDebug(false); - - MimeMessage msg = new MimeMessage(session); - msg.setFrom( new InternetAddress("no-reply@daoas.dk") ); - - - msg.setRecipient(Message.RecipientType.TO, new InternetAddress("thn@daoas.dk") );//TODO: mulighed for at ændre modtager mail - msg.setSubject( subject ); - msg.setContent(reportData, "text/html; charset=utf-8"); - - Transport.send(msg); - - - } catch (MessagingException e) { - System.out.println("Unable to send report mail " + e.getMessage() ); - } - - } + 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", "192.168.12.10"); + + try { + // create some properties and get the default Session + Session session = Session.getDefaultInstance(props, null); + session.setDebug(false); + + MimeMessage msg = new MimeMessage(session); + msg.setFrom( new InternetAddress("no-reply@daoas.dk") ); + + + msg.setRecipient(Message.RecipientType.TO, new InternetAddress("thn@daoas.dk") );//TODO: mulighed for at ændre modtager mail + msg.setSubject( subject ); + msg.setContent(htmlBody, "text/html; charset=utf-8"); + + Transport.send(msg); + + + } catch (MessagingException e) { + System.out.println("Unable to send report mail " + e.getMessage() ); + } + } + + public String getReportData() { WeekEntry total = new WeekEntry(); HashMap"); @@ -197,7 +226,16 @@ sb.append(""); sb.append(" Åbnet: ").append(total.man.open).append(" ").append(total.tir.open).append(" ").append(total.ons.open).append(" ").append(total.tor.open).append(" ").append(total.fre.open).append(" ").append(total.lor.open).append(" ").append(total.son.open).append(" "); sb.append(" Ændret: ").append(total.man.modified).append(" ").append(total.tir.modified).append(" ").append(total.ons.modified).append(" ").append(total.tor.modified).append(" ").append(total.fre.modified).append(" ").append(total.lor.modified).append(" ").append(total.son.modified).append(" "); - + sb.append(""); + + sb.append(" Lukket: ").append(total.man.closed).append(" ").append(total.tir.closed).append(" ").append(total.ons.closed).append(" ").append(total.tor.closed).append(" ").append(total.fre.closed).append(" ").append(total.lor.closed).append(" ").append(total.son.closed).append("
"); + sb.append("Nye/Ukendte gader
"); + sb.append("
Gadeid | Vejnavn |
---|---|
").append(unknownStreet.getKey()).append(" | ").append(unknownStreet.getValue()).append(" |