--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressReport.java 2016/01/25 06:18:21 2839
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressReport.java 2016/01/28 16:12:28 2868
@@ -15,9 +15,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 +43,7 @@
this.created += other.created;
}
}
- class WeekEntry {
+ static class WeekEntry {
NumEntry man = new NumEntry();
NumEntry tir = new NumEntry();
NumEntry ons = new NumEntry();
@@ -94,34 +99,37 @@
String reportData = getReportData();
String subject = "Indlæsnings rapport for " + source.getDistributor();
-
- 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() );
- }
-
+ AddressReport.sendMail(subject, reportData);
}
+ 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();
@@ -135,6 +143,7 @@
// first gather the intel
for (Address a : addressList) {
if (a.kommunekode == 0 || a.vejkode == 0) {
+
antalUdenKommunekode++;
}
@@ -180,7 +189,16 @@
sb.append("Tidsforbrug: ").append( timer.getElapsed() ).append("ms.
");
sb.append("Skriv til DB: ").append( writeBack ).append("
");
sb.append("Antal entries: " ).append( entryCount ).append("
");
- sb.append("Antal afviste: " ).append( addrManager.getAfvistAntal() ).append("
");
+ sb.append("Antal afviste: " ).append( addrManager.getRejectedCount() ).append("
");
+ sb.append("Filen indeholder data til: ");
+ if (ugedage.mandag) sb.append("Mandag, ");
+ if (ugedage.tirsdag) sb.append("Tirsdag, ");
+ if (ugedage.onsdag) sb.append("Onsdag, ");
+ if (ugedage.torsdag) sb.append("Torsdag, ");
+ if (ugedage.fredag) sb.append("Fredag, ");
+ if (ugedage.lordag) sb.append("Lørdag, ");
+ if (ugedage.sondag) sb.append("Søndag, ");
+ sb.append("
");
sb.append("
");