From cb1770fff046c0bbbb6e20562c4604afa89cd30c Mon Sep 17 00:00:00 2001
From: Leonardo Vannucci <leonardo.vannucci@grupposistematica.it>
Date: Thu, 25 Oct 2018 17:50:12 +0200
Subject: [PATCH] gestione modalita trasmissione
---
dg1cloud-core/src/main/java/it/digione/dg1cloud/config/dg1cloud.properties | 7 ++++---
dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java | 11 ++++++++++-
dg1cloud-core/src/main/java/it/digione/dg1cloud/ws/client/isd/IsdProperties.java | 7 +++++++
dg1cloud-core/src/main/java/it/digione/dg1cloud/service/CloudService.java | 6 ------
4 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/dg1cloud-core/src/main/java/it/digione/dg1cloud/config/dg1cloud.properties b/dg1cloud-core/src/main/java/it/digione/dg1cloud/config/dg1cloud.properties
index 521012d..06f5248 100644
--- a/dg1cloud-core/src/main/java/it/digione/dg1cloud/config/dg1cloud.properties
+++ b/dg1cloud-core/src/main/java/it/digione/dg1cloud/config/dg1cloud.properties
@@ -58,13 +58,14 @@
isharedoc.ws.urp.storyboad=URP
isharedoc.ws.urp.metaviewname=URP
isharedoc.ws.urp.direction=IN
-isharedoc.ws.urp.transition=protocolla
-#solo per le gbox (todo: implementare altre tipologie)
+isharedoc.ws.urp.transition=ProtocollaAssegna
+isharedoc.ws.urp.modTrasmissione=portale
+#solo per le GBOX o per le OU (todo: implementare altre tipologie)
isharedoc.ws.urp.contacts[0].type=O
isharedoc.ws.urp.contacts[0].referenceType=GBOX
isharedoc.ws.urp.contacts[0].code=URP
isharedoc.ws.urp.contacts[1].type=T
-isharedoc.ws.urp.contacts[1].referenceType=GBOX
+isharedoc.ws.urp.contacts[1].referenceType=OU
isharedoc.ws.urp.contacts[1].code=URP
isharedoc.ws.notification-from=Dg1Cloud notifiche sviluppo <no-reply@digione.eu>
diff --git a/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java b/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java
index 301666f..50d0c2e 100644
--- a/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java
+++ b/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java
@@ -166,18 +166,27 @@
JAXBElement<String> jaxbBody = factory.createInstanceMessageCreateRequestBody(startURPForm.getCorpo());
request.setBody(jaxbBody);
+ Variables variables = factory.createInstanceMessageCreateRequestVariables();
+
Variable variable = new Variable();
variable.setKey("transition");
variable.setType("string");
variable.setValueString(factory.createInstanceMessageCreateRequestVariablesVariableValueString(isdProperties.getUrp().getTransition()));
- Variables variables = factory.createInstanceMessageCreateRequestVariables();
+ variables.getVariable().add(variable);
+
+ variable = new Variable();
+ variable.setKey("modTrasmissione");
+ variable.setType("string");
+ variable.setValueString(factory.createInstanceMessageCreateRequestVariablesVariableValueString(isdProperties.getUrp().getModTrasmissione()));
+
variables.getVariable().add(variable);
JAXBElement<Variables> jaxbVariables = factory.createInstanceMessageCreateRequestVariables(variables);
request.setVariables(jaxbVariables);
request.setStartWorkflow(factory.createInstanceMessageCreateRequestStartWorkflow(true));
+ request.setInstanceOperation(factory.createInstanceMessageCreateRequestInstanceOperation(isdProperties.getUrp().getTransition()));
Attachments attachments = new Attachments();
diff --git a/dg1cloud-core/src/main/java/it/digione/dg1cloud/service/CloudService.java b/dg1cloud-core/src/main/java/it/digione/dg1cloud/service/CloudService.java
index 1ff8032..39a2d6a 100644
--- a/dg1cloud-core/src/main/java/it/digione/dg1cloud/service/CloudService.java
+++ b/dg1cloud-core/src/main/java/it/digione/dg1cloud/service/CloudService.java
@@ -8,13 +8,7 @@
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
-import java.nio.file.LinkOption;
-import java.nio.file.attribute.GroupPrincipal;
-import java.nio.file.attribute.PosixFileAttributeView;
-import java.nio.file.attribute.PosixFileAttributes;
import java.nio.file.attribute.PosixFilePermission;
-import java.nio.file.attribute.UserPrincipal;
-import java.nio.file.attribute.UserPrincipalLookupService;
import java.security.NoSuchAlgorithmException;
import java.time.LocalDate;
import java.time.ZoneId;
diff --git a/dg1cloud-core/src/main/java/it/digione/dg1cloud/ws/client/isd/IsdProperties.java b/dg1cloud-core/src/main/java/it/digione/dg1cloud/ws/client/isd/IsdProperties.java
index 2dfbf52..e5289cd 100644
--- a/dg1cloud-core/src/main/java/it/digione/dg1cloud/ws/client/isd/IsdProperties.java
+++ b/dg1cloud-core/src/main/java/it/digione/dg1cloud/ws/client/isd/IsdProperties.java
@@ -81,6 +81,7 @@
private String metaviewname;
private String direction;
private String transition;
+ private String modTrasmissione;
private List<Contact> contacts;
public String getPuid() {
@@ -119,6 +120,12 @@
public void setTransition(String transition) {
this.transition = transition;
}
+ public String getModTrasmissione() {
+ return modTrasmissione;
+ }
+ public void setModTrasmissione(String modTrasmissione) {
+ this.modTrasmissione = modTrasmissione;
+ }
public List<Contact> getContacts() {
return contacts;
}
--
Gitblit v1.6.2