admin/gateway-dbc-fx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DBCFX_SM_675

Browse Source
This commit is contained in:
vincenzofariello
2024-05-22 16:54:23 +02:00
parent 537f72fc14
commit 7110b814bb
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/formatcontroller/dbss/DBSSFormatController.java
View File

@@ -1416,7 +1416,7 @@ public class DBSSFormatController extends FormatController {
return request; return request;
} }
//TODO verificare nome / cod fiscale se servono a CCC
public WirelineCeaseCheck82RequestType getXmlForNotificaD82(GnpCrmNotifyDonorOut dbssDonorOut, String operation) { public WirelineCeaseCheck82RequestType getXmlForNotificaD82(GnpCrmNotifyDonorOut dbssDonorOut, String operation) {
WirelineCeaseCheck82RequestType request = new WirelineCeaseCheck82RequestType(); WirelineCeaseCheck82RequestType request = new WirelineCeaseCheck82RequestType();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
@@ -1424,6 +1424,9 @@ public class DBSSFormatController extends FormatController {
int charValueIndex = 0; //usato come indice per l'array CharacteristicValueType 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)) { if (operation.equals(DBSSMap.EVENTO_ESITO_VERIFICA_COD_SESSIONE)) {
request.setOperationType(OP_TYPE_CHECKFASE3); request.setOperationType(OP_TYPE_CHECKFASE3);
} else { } else {
@@ -1433,19 +1436,25 @@ public class DBSSFormatController extends FormatController {
CharacteristicValueType[] characteristics = new CharacteristicValueType[11]; CharacteristicValueType[] characteristics = new CharacteristicValueType[11];
// Check lunghezza array characteristics - begin
if (!Func.isNull(dbssDonorOut.getAggiuntivi())) { if (!Func.isNull(dbssDonorOut.getAggiuntivi())) {
characteristics = new CharacteristicValueType[12]; characteristics = new CharacteristicValueType[12];
} }
if (operation.equals(DBSSMap.EVENTO_ESITO_VERIFICA_COD_SESSIONE)) { 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]; characteristics = new CharacteristicValueType[14];
} }
else { 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(); CharacteristicValueType reqType = new CharacteristicValueType();
CharacteristicSpecificationType reqName = new CharacteristicSpecificationType(); CharacteristicSpecificationType reqName = new CharacteristicSpecificationType();
@@ -1475,15 +1484,6 @@ public class DBSSFormatController extends FormatController {
dnType.setValue(dbssDonorOut.getDirectoryNumber()); dnType.setValue(dbssDonorOut.getDirectoryNumber());
characteristics[charValueIndex++] = dnType; 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(); CharacteristicValueType donorType = new CharacteristicValueType();
CharacteristicSpecificationType donorName = new CharacteristicSpecificationType(); CharacteristicSpecificationType donorName = new CharacteristicSpecificationType();
donorName.setName("DonorCode"); donorName.setName("DonorCode");
@@ -1543,9 +1543,6 @@ public class DBSSFormatController extends FormatController {
characteristics[charValueIndex++] = cognomeClienteType; characteristics[charValueIndex++] = cognomeClienteType;
if (operation.equals(DBSSMap.EVENTO_ESITO_VERIFICA_COD_SESSIONE)) { if (operation.equals(DBSSMap.EVENTO_ESITO_VERIFICA_COD_SESSIONE)) {
GnpNowD82RichiesteOutDAO nowDonorOutDAO = new GnpNowD82RichiesteOutDAO();
GnpNowD82RichiesteOut nowDonorOut = nowDonorOutDAO.findByIdRichiesta82(dbssDonorOut.getCodiceRichiesta());
if (nowDonorOut != null) { if (nowDonorOut != null) {
CharacteristicValueType phase3Result = new CharacteristicValueType(); CharacteristicValueType phase3Result = new CharacteristicValueType();
CharacteristicSpecificationType phase3ResultName = new CharacteristicSpecificationType(); CharacteristicSpecificationType phase3ResultName = new CharacteristicSpecificationType();
@@ -1554,14 +1551,15 @@ public class DBSSFormatController extends FormatController {
phase3Result.setValue(nowDonorOut.getEsito()); phase3Result.setValue(nowDonorOut.getEsito());
characteristics[charValueIndex++] = phase3Result; characteristics[charValueIndex++] = phase3Result;
CharacteristicValueType phase3ResultD = new CharacteristicValueType(); if (!Func.isNull(nowDonorOut.getMotivazione())){
CharacteristicSpecificationType phase3ResultDName = new CharacteristicSpecificationType(); CharacteristicValueType phase3ResultD = new CharacteristicValueType();
phase3ResultDName.setName("Phase3ResultDescription"); CharacteristicSpecificationType phase3ResultDName = new CharacteristicSpecificationType();
phase3ResultD.setCharacteristicSpecification(phase3ResultDName); phase3ResultDName.setName("Phase3ResultDescription");
phase3ResultD.setValue(nowDonorOut.getMotivazione()); phase3ResultD.setCharacteristicSpecification(phase3ResultDName);
characteristics[charValueIndex++] = phase3ResultD; phase3ResultD.setValue(nowDonorOut.getMotivazione());
characteristics[charValueIndex++] = phase3ResultD;
}
} }
} }
request.setCharacteristicValue(characteristics); request.setCharacteristicValue(characteristics);

2
gnpdev/dbcfx/src/it/valueteam/gnp/ws/dbss/client/WirelinePortOutOrderMgmtClient.java
View File

@@ -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("javax.xml.rpc.service.endpoint.address", Resources.getURL_WIRELINE_CEASE_CHECK82());
((WirelineCeaseCheck82PortType_Stub) endPoint)._setProperty("weblogic.wsee.transport.connection.timeout", Integer.parseInt(timeOutStr)); ((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(); HeaderTypeHolder header = new HeaderTypeHolder();
HeaderType headerType = new HeaderType(); HeaderType headerType = new HeaderType();