From 7110b814bbabd8a32935cdb200e780acf7235652 Mon Sep 17 00:00:00 2001 From: vincenzofariello Date: Wed, 22 May 2024 16:54:23 +0200 Subject: [PATCH] Fix DBCFX_SM_675 --- .../dbss/DBSSFormatController.java | 42 +++++++++---------- .../WirelinePortOutOrderMgmtClient.java | 2 + 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/formatcontroller/dbss/DBSSFormatController.java b/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/formatcontroller/dbss/DBSSFormatController.java index 1394a5da..684f9cee 100644 --- a/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/formatcontroller/dbss/DBSSFormatController.java +++ b/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/formatcontroller/dbss/DBSSFormatController.java @@ -1416,7 +1416,7 @@ public class DBSSFormatController extends FormatController { return request; } - //TODO verificare nome / cod fiscale se servono a CCC + public WirelineCeaseCheck82RequestType getXmlForNotificaD82(GnpCrmNotifyDonorOut dbssDonorOut, String operation) { WirelineCeaseCheck82RequestType request = new WirelineCeaseCheck82RequestType(); Calendar calendar = Calendar.getInstance(); @@ -1424,6 +1424,9 @@ public class DBSSFormatController extends FormatController { int charValueIndex = 0; //usato come indice per l'array CharacteristicValueType + GnpNowD82RichiesteOutDAO nowDonorOutDAO = new GnpNowD82RichiesteOutDAO(); + GnpNowD82RichiesteOut nowDonorOut = null; + if (operation.equals(DBSSMap.EVENTO_ESITO_VERIFICA_COD_SESSIONE)) { request.setOperationType(OP_TYPE_CHECKFASE3); } else { @@ -1433,19 +1436,25 @@ public class DBSSFormatController extends FormatController { CharacteristicValueType[] characteristics = new CharacteristicValueType[11]; + // Check lunghezza array characteristics - begin if (!Func.isNull(dbssDonorOut.getAggiuntivi())) { characteristics = new CharacteristicValueType[12]; } if (operation.equals(DBSSMap.EVENTO_ESITO_VERIFICA_COD_SESSIONE)) { + nowDonorOut = nowDonorOutDAO.findByIdRichiesta82(dbssDonorOut.getCodiceRichiesta()); - if (!Func.isNull(dbssDonorOut.getAggiuntivi())) { + if (!Func.isNull(dbssDonorOut.getAggiuntivi()) && (nowDonorOut != null && !Func.isNull(nowDonorOut.getMotivazione()))) { characteristics = new CharacteristicValueType[14]; } else { - characteristics = new CharacteristicValueType[13]; + if (!Func.isNull(dbssDonorOut.getAggiuntivi()) || (nowDonorOut != null && !Func.isNull(nowDonorOut.getMotivazione()))) + characteristics = new CharacteristicValueType[13]; + else + characteristics = new CharacteristicValueType[12]; } } + // Check lunghezza array characteristics - end CharacteristicValueType reqType = new CharacteristicValueType(); CharacteristicSpecificationType reqName = new CharacteristicSpecificationType(); @@ -1475,15 +1484,6 @@ public class DBSSFormatController extends FormatController { dnType.setValue(dbssDonorOut.getDirectoryNumber()); characteristics[charValueIndex++] = dnType; - /* - CharacteristicValueType noteType = new CharacteristicValueType(); - CharacteristicSpecificationType noteName = new CharacteristicSpecificationType(); - noteName.setName("Comments"); - noteType.setCharacteristicSpecification(noteName); - noteType.setValue(dbssDonorOut.getNote()); - characteristics[charValueIndex++] = noteType; - */ - CharacteristicValueType donorType = new CharacteristicValueType(); CharacteristicSpecificationType donorName = new CharacteristicSpecificationType(); donorName.setName("DonorCode"); @@ -1543,9 +1543,6 @@ public class DBSSFormatController extends FormatController { characteristics[charValueIndex++] = cognomeClienteType; if (operation.equals(DBSSMap.EVENTO_ESITO_VERIFICA_COD_SESSIONE)) { - GnpNowD82RichiesteOutDAO nowDonorOutDAO = new GnpNowD82RichiesteOutDAO(); - GnpNowD82RichiesteOut nowDonorOut = nowDonorOutDAO.findByIdRichiesta82(dbssDonorOut.getCodiceRichiesta()); - if (nowDonorOut != null) { CharacteristicValueType phase3Result = new CharacteristicValueType(); CharacteristicSpecificationType phase3ResultName = new CharacteristicSpecificationType(); @@ -1554,14 +1551,15 @@ public class DBSSFormatController extends FormatController { phase3Result.setValue(nowDonorOut.getEsito()); characteristics[charValueIndex++] = phase3Result; - CharacteristicValueType phase3ResultD = new CharacteristicValueType(); - CharacteristicSpecificationType phase3ResultDName = new CharacteristicSpecificationType(); - phase3ResultDName.setName("Phase3ResultDescription"); - phase3ResultD.setCharacteristicSpecification(phase3ResultDName); - phase3ResultD.setValue(nowDonorOut.getMotivazione()); - characteristics[charValueIndex++] = phase3ResultD; + if (!Func.isNull(nowDonorOut.getMotivazione())){ + CharacteristicValueType phase3ResultD = new CharacteristicValueType(); + CharacteristicSpecificationType phase3ResultDName = new CharacteristicSpecificationType(); + phase3ResultDName.setName("Phase3ResultDescription"); + phase3ResultD.setCharacteristicSpecification(phase3ResultDName); + phase3ResultD.setValue(nowDonorOut.getMotivazione()); + characteristics[charValueIndex++] = phase3ResultD; + } } - } request.setCharacteristicValue(characteristics); diff --git a/gnpdev/dbcfx/src/it/valueteam/gnp/ws/dbss/client/WirelinePortOutOrderMgmtClient.java b/gnpdev/dbcfx/src/it/valueteam/gnp/ws/dbss/client/WirelinePortOutOrderMgmtClient.java index 8e24ae62..849d600f 100644 --- a/gnpdev/dbcfx/src/it/valueteam/gnp/ws/dbss/client/WirelinePortOutOrderMgmtClient.java +++ b/gnpdev/dbcfx/src/it/valueteam/gnp/ws/dbss/client/WirelinePortOutOrderMgmtClient.java @@ -136,6 +136,8 @@ public class WirelinePortOutOrderMgmtClient implements Loggable { ((WirelineCeaseCheck82PortType_Stub) endPoint)._setProperty("javax.xml.rpc.service.endpoint.address", Resources.getURL_WIRELINE_CEASE_CHECK82()); ((WirelineCeaseCheck82PortType_Stub) endPoint)._setProperty("weblogic.wsee.transport.connection.timeout", Integer.parseInt(timeOutStr)); + log.write("9999", "Endpoint Resources.getURL_WIRELINE_CEASE_CHECK82(): " + Resources.getURL_WIRELINE_CEASE_CHECK82()); + HeaderTypeHolder header = new HeaderTypeHolder(); HeaderType headerType = new HeaderType();