WIP

B3Partners · Sep 27, 2019 · 8eb2535 · 8eb2535
1 parent 63131e2
commit 8eb2535
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 4 deletions.
diff --git a/brmo-commandline/pom.xml b/brmo-commandline/pom.xml
@@ -124,7 +124,7 @@
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
+                            <classpathPrefix>./lib/</classpathPrefix>
                             <mainClass>nl.b3p.brmo.commandline.Main</mainClass>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                             <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>

diff --git a/brmo-commandline/src/main/java/nl/b3p/brmo/commandline/Main.java b/brmo-commandline/src/main/java/nl/b3p/brmo/commandline/Main.java
@@ -17,6 +17,8 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -99,7 +101,11 @@ private static Options buildOptions() {
             .longOpt("torsgbbgt").optionalArg(true).numberOfArgs(1).argName("[loadingUpdate]").build(),
             // export
             Option.builder("e").desc("Maak van berichten uit staging gezipte xml-files in de opgegeven directory. Dit zijn alleen BRK mutaties van GDS2 processen.")
-            .longOpt("exportgds").hasArg().numberOfArgs(1).type(File.class).argName("output-directory").build()
+            .longOpt("exportgds").hasArg().numberOfArgs(1).type(File.class).argName("output-directory").build(),
+            // 
+            Option.builder("al").desc("Controleer of de berichtin in de opgegeven afgiftelijst in de staging staan.")
+            .longOpt("afgiftelijst").hasArg().numberOfArgs(1).type(File.class).argName("afgiftelijst").build()
+
         });
 
         Options options = new Options();
@@ -236,7 +242,10 @@ public static void main(String... args) {
                 exitcode = delete(dsStaging, cl.getOptionValue("delete"));
             } else if (cl.hasOption("exportgds")) {
                 exitcode = getMutations(dsStaging, cl.getOptionValues("exportgds"));
-            } // ----------------
+            } else if(cl.hasOption("afgiftelijst")){
+                exitcode = checkAfgiftelijst(dsStaging, cl.getOptionValue("afgiftelijst"));
+            }
+            // ----------------
             // rsgb commando's
             else if (cl.hasOption("torsgb")) {
                 exitcode = toRsgb(dsStaging, dsRsgb, cl.getOptionValue("berichtstatus", "ignore"));
@@ -389,6 +398,22 @@ private static int list(DataSource ds, String format) throws BrmoException {
         brmo.closeBrmoFramework();
         return 0;
     }
+
+    private static int checkAfgiftelijst(DataSource ds, String input) throws BrmoException {
+        try {
+            LOG.info("Afgiftelijst controleren.");
+            BrmoFramework brmo = new BrmoFramework(ds, null);
+            String response = brmo.checkAfgiftelijst(input);
+            System.out.print("Afgifte gecontroleerd:");
+            System.out.println(response);
+
+            brmo.closeBrmoFramework();
+            return 0;
+        } catch (IOException ex) {
+            System.err.println("Error reading afgiftelijst: " + ex.getLocalizedMessage());
+            return 1;
+        }
+    }
 
     private static int berichtStatus(DataSource ds, String format) throws BrmoException {
         LOG.info("Ophalen bericht status informatie.");

diff --git a/brmo-loader/nb-configuration.xml b/brmo-loader/nb-configuration.xml
@@ -13,6 +13,6 @@ You can copy and paste the single properties, into the pom.xml file and the IDE
 That way multiple projects can share the same settings (useful for formatting rules for example).
 Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.license>agpl30</netbeans.hint.license>
+        <netbeans.hint.license>agpl</netbeans.hint.license>
     </properties>
 </project-shared-configuration>
diff --git a/brmo-loader/pom.xml b/brmo-loader/pom.xml
@@ -13,6 +13,14 @@
     <name>BRMO loader</name>
     <description>BRMO data loader module.</description>
     <dependencies>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+        </dependency>
         <dependency>
             <groupId>nl.b3p</groupId>
             <artifactId>topnlparser</artifactId>

diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/BrmoFramework.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/BrmoFramework.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -631,4 +632,8 @@ public long getCountJob() throws BrmoException {
             throw new BrmoException(ex);
         }
     }
+
+    public String checkAfgiftelijst(String bestand) throws IOException{
+        return stagingProxy.checkAfgifteLijst(bestand);
+    }
 }
diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/StagingProxy.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/StagingProxy.java
@@ -15,8 +15,11 @@
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.sql.DataSource;
 import javax.xml.transform.TransformerException;
+import nl.b3p.brmo.loader.checks.AfgifteChecker;
 import nl.b3p.brmo.loader.entity.Bericht;
 import nl.b3p.brmo.loader.entity.BerichtenSorter;
 import nl.b3p.brmo.loader.entity.LaadProces;
@@ -1036,4 +1039,11 @@ public void setBatchCapacity(Integer batchCapacity) {
     public void setLimitStandBerichtenToTransform(Integer limitStandBerichtenToTransform) {
         this.limitStandBerichtenToTransform = limitStandBerichtenToTransform;
     }
+
+    public String checkAfgifteLijst(String bestand) throws IOException {
+        AfgifteChecker checker = new AfgifteChecker();
+        checker.init(bestand);
+        checker.check();
+        return checker.getResults();
+    }
 }
diff --git a/pom.xml b/pom.xml
@@ -495,6 +495,17 @@
                 <artifactId>jdom2</artifactId>
                 <version>2.0.6</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi</artifactId>
+                <version>4.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>4.1.0</version>
+            </dependency>
+
             <!-- test dependencies -->
             <dependency>
                 <groupId>com.h2database</groupId>