SIOPE+

consiglionazionaledellericerche · Jan 4, 2019 · f8f4b27 · f8f4b27
1 parent 7e44cf8
commit f8f4b27
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/sigla-ejb/src/main/java/it/cnr/contab/doccont00/bp/CRUDDistintaCassiereBP.java b/sigla-ejb/src/main/java/it/cnr/contab/doccont00/bp/CRUDDistintaCassiereBP.java
@@ -64,11 +64,16 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.jsp.PageContext;
+import javax.xml.XMLConstants;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
 import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 import java.io.*;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -2290,6 +2295,8 @@ public void inviaSiopeplus(ActionContext context, FirmaOTPBulk firmaOTPBulk)
                     ),
                     storageObject);
         }
+        //ordinativiSiopePlusService.validateAgainstXSD();
+
 
         final Risultato risultato = ordinativiSiopePlusService.postFlusso(
                 documentiContabiliService.getResource(storageObject)

diff --git a/sigla-ejb/src/main/java/it/cnr/contab/doccont00/comp/DistintaCassiereComponent.java b/sigla-ejb/src/main/java/it/cnr/contab/doccont00/comp/DistintaCassiereComponent.java
@@ -2816,8 +2816,10 @@ public SQLBuilder selectDistinta_cassiere_detCollByClause(
             long nrDettagli = ((Distinta_cassiere_detHome) getHome(userContext,
                     Distinta_cassiere_detBulk.class)).getNrDettagli(
                     userContext, distinta);
-            if (nrDettagli == 0)
-                return null;
+            if (nrDettagli == 0) {
+                sql.addClause(FindClause.AND, "esercizio", SQLBuilder.EQUALS, -1);
+                return sql;
+            }
 
             if (tesoreriaUnica(userContext, distinta)) {
                 SQLBuilder sqlIN = getHome(userContext, Distinta_cassiere_detBulk.class).createSQLBuilder();

diff --git a/...-siopelpus-ordinativi/src/main/java/it/cnr/contab/service/OrdinativiSiopePlusService.java b/...-siopelpus-ordinativi/src/main/java/it/cnr/contab/service/OrdinativiSiopePlusService.java
@@ -22,11 +22,17 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
+import org.xml.sax.SAXException;
 
 import javax.net.ssl.SSLContext;
+import javax.xml.XMLConstants;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -231,6 +237,13 @@ private InputStream extractFileFromArchive(ZipInputStream stream) {
         }
     }
 
+    public void validateAgainstXSD(InputStream xml, InputStream xsd) throws SAXException, IOException {
+        SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+        Schema schema = factory.newSchema(new StreamSource(xsd));
+        Validator validator = schema.newValidator();
+        validator.validate(new StreamSource(xml));
+    }
+
     @Bean
     public CloseableHttpClient getHttpClient() throws KeyStoreException, CertificateException, NoSuchAlgorithmException,
             IOException, UnrecoverableKeyException, KeyManagementException {