R58-25-0117 Progetto Trasformazione Prepagato Delivery SW CV1

Merge branch_C03_2025
MNP_RIL_3039 e MNP_RIL_3040 Ril. MNP_RU_653 - Adesione Accordo Quadro MNP e TCR per Dimensione SRL
2025-07-15 21:17:06 +02:00 · 2025-07-09 08:52:36 +02:00 · 2025-06-04 18:21:41 +02:00 · 2025-05-26 23:52:05 +02:00 · 2025-05-26 23:49:40 +02:00 · 2025-03-27 09:17:29 +01:00
23 changed files with 91 additions and 31 deletions
--- a/dbcmnpsrc/FE/domain/config1.xml
+++ b/dbcmnpsrc/FE/domain/config1.xml
@@ -711,6 +711,17 @@
        <JMSDistributedQueueMember
                JMSQueue="MessageQueueTrcsOut@TRCSJMSServer1" Name="MessageQueueTrcsOut@TRCSJMSServer1"/>
    </JMSDistributedQueue>
+    <!-- R58-25-0117	Progetto Trasformazione Prepagato - Delivery SW CV1 START-->
+    <JMSTemplate Name="MessageQueueTrcsOut2"
+                 RedeliveryDelayOverride="300000" TimeToDeliverOverride="30000"/>
+    <JMSDistributedQueue JNDIName="jms/MessageQueueTrcsOut2"
+                         Name="MessageQueueTrcsOut2" Targets="mnpCluster" Template="MessageQueueTrcsOut2">
+        <JMSDistributedQueueMember
+                JMSQueue="MessageQueueTrcsOut2@TRCSJMSServer2" Name="MessageQueueTrcsOut2@TRCSJMSServer2"/>
+        <JMSDistributedQueueMember
+                JMSQueue="MessageQueueTrcsOut2@TRCSJMSServer1" Name="MessageQueueTrcsOut2@TRCSJMSServer1"/>
+    </JMSDistributedQueue>
+    <!-- R58-25-0117	Progetto Trasformazione Prepagato - Delivery SW CV1 END-->
    <JMSTemplate Name="dbcgoRequestToMnp"
        RedeliveryDelayOverride="300000" TimeToDeliverOverride="30000"/>
    <JMSDistributedQueue JNDIName="jms/dbcgoRequestToMnp"
--- a/dbcmnpsrc/FE/domain/config2.xml
+++ b/dbcmnpsrc/FE/domain/config2.xml
@@ -984,6 +984,11 @@
        <JMSQueue CreationTime="1194444002406"
                  JNDIName="jms/MessageQueueTrcsOut@TRCSJMSServer1"
                  Name="MessageQueueTrcsOut@TRCSJMSServer1" Template="MessageQueueTrcsOut"/>
+        <!-- R58-25-0117	Progetto Trasformazione Prepagato - Delivery SW CV1 START-->
+        <JMSQueue CreationTime="1194444002406"
+                  JNDIName="jms/MessageQueueTrcsOut2@TRCSJMSServer1"
+                  Name="MessageQueueTrcsOut2@TRCSJMSServer1" Template="MessageQueueTrcsOut2"/>
+        <!-- R58-25-0117	Progetto Trasformazione Prepagato - Delivery SW CV1 END-->
    </JMSServer>
    <JMSServer Name="TRCSJMSServer2" Store="TRCSJMSFileStore2" Targets="mnpserver2 (migratable)">
        <JMSQueue CreationTime="1201789577640"
@@ -992,6 +997,11 @@
        <JMSQueue CreationTime="1194444002390"
                  JNDIName="jms/MessageQueueTrcsOut@TRCSJMSServer2"
                  Name="MessageQueueTrcsOut@TRCSJMSServer2" Template="MessageQueueTrcsOut"/>
+        <!-- R58-25-0117	Progetto Trasformazione Prepagato - Delivery SW CV1 START-->
+        <JMSQueue CreationTime="1194444002390"
+                  JNDIName="jms/MessageQueueTrcsOut2@TRCSJMSServer2"
+                  Name="MessageQueueTrcsOut2@TRCSJMSServer2" Template="MessageQueueTrcsOut2"/>
+        <!-- R58-25-0117	Progetto Trasformazione Prepagato - Delivery SW CV1 END-->
    </JMSServer>
    <JMSServer Name="DBCFXJMSServer1" Store="DBCFXJMSFileStore1" Targets="mnpserver1 (migratable)">
        <JMSQueue CreationTime="1201789577625"
--- a/dbcmnpsrc/FE/mnpapp/properties/delta_R58_25_0117_resources.properties
+++ b/dbcmnpsrc/FE/mnpapp/properties/delta_R58_25_0117_resources.properties
@@ -0,0 +1,6 @@
+############### R58-25-0117	Progetto Trasformazione Prepagato - Delivery SW CV1 - BEGIN - ##############
+
+#Property per abilitare chiamata a nuova coda JMS TRCS
+CALL_NEW_JMS_TRCS_ENABLED = 0
+
+############### R58-25-0117	Progetto Trasformazione Prepagato - Delivery SW CV1 - END - ################
--- a/dbcmnpsrc/FE/mnpdev/build/build_WS_EsitoCessMnp.cmd
+++ b/dbcmnpsrc/FE/mnpdev/build/build_WS_EsitoCessMnp.cmd
@@ -0,0 +1,8 @@
+@set ANT_HOME=apache-ant-1.9.2
+@set JAVA_HOME=C:\jdk1.6.0_45
+@set PATH=%ANT_HOME%/bin;%JAVA_HOME%/bin
+@set ANT_OPTS=-Xms512m -Xmx512m
+
+@call ant -buildfile build_ws.xml ESITOCESSMNPWS
+
+@pause
--- a/dbcmnpsrc/FE/mnpdev/crontab/web/jsp/GUI/ErrorJSP.jsp
+++ b/dbcmnpsrc/FE/mnpdev/crontab/web/jsp/GUI/ErrorJSP.jsp
@@ -24,7 +24,7 @@ ErrorJSP
 <table width = "100%"  border = "0">
 <tr>
  <td HEIGHT = "100%" width = "10%" bgcolor = "#D61414" valign = "top">
-    <IMG src ="<%=Res.ReqURL%>/images/LogoMnp.gif">
+    <IMG src ="/MNP-GUI/images/LogoMnp.gif">
  </td>
  <td align = "right" valign = "top" width = "90%">
 <!-- td dove scrivere i dati a destra -->
--- a/dbcmnpsrc/FE/mnpdev/crontab/web/jsp/GUI/LoginCrontab.jsp
+++ b/dbcmnpsrc/FE/mnpdev/crontab/web/jsp/GUI/LoginCrontab.jsp
@@ -102,7 +102,7 @@ System.out.println("Sono dentro la LoginCrontab.jsp");

 <table width = "100%" class = "tableBannerRosso" border = 0>
 <tr>
-    <td align = "left" width = "100%"><IMG border = 0 SRC ="<%=Res.ReqURL%>/images/banner.gif"></td>
+    <td align = "left" width = "100%"><IMG border = 0 SRC ="/MNP-GUI/images/banner.gif"></td>
 </tr>
 </table>

@@ -115,7 +115,7 @@ System.out.println("Sono dentro la LoginCrontab.jsp");
  <td align = "right" valign = "top" width = "90%">
 <BR>
 <i><b><FONT face = "Arial" color = "#455598" size = 4 weight = "700">MNP-GUI</Font></b></i>
-<form name="loginForm" method="post" action="<%=Res.ReqURL%>/Login.do" target="_self">
+<form name="loginForm" method="post" action="/MNP-GUI/Login.do" target="_self">
 <INPUT type="hidden" name="ipclient">
 <INPUT type="hidden" name="hostnameclient">
 <INPUT type="hidden" name="utenzaclient">
--- a/dbcmnpsrc/FE/mnpdev/crontab/web/jsp/GUI/SecurityInfoClient.jsp
+++ b/dbcmnpsrc/FE/mnpdev/crontab/web/jsp/GUI/SecurityInfoClient.jsp
@@ -77,7 +77,7 @@ function inviaDatiClient() {

 <table width = "100%" class = "tableBannerRosso" border = 0>
 <tr>
-    <td align = "left" width = "100%"><IMG border = 0 SRC ="<%=Res.ReqURL%>/images/banner.gif"></td>
+    <td align = "left" width = "100%"><IMG border = 0 SRC ="/MNP-GUI/images/banner.gif"></td>
 </tr>
 </table>

@@ -90,7 +90,7 @@ function inviaDatiClient() {
  <td align = "right" valign = "top" width = "90%">
 <BR>
 <i><b><FONT face = "Arial" color = "#455598" size = 4 weight = "700">MNP-GUI</Font></b></i>
-<form name="loginForm" method="post" action="<%=Res.ReqURL%>/Login.do" target="_self">
+<form name="loginForm" method="post" action="/MNP-GUI/Login.do" target="_self">
 <INPUT type="hidden" name="ipclient">
 <INPUT type="hidden" name="hostnameclient">
 <INPUT type="hidden" name="utenzaclient">
--- a/dbcmnpsrc/FE/mnpdev/dbcgo/dbcgo/WebRoot/template/REPORT_AGCOM_TUTTI_template.xlsx
+++ b/dbcmnpsrc/FE/mnpdev/dbcgo/dbcgo/WebRoot/template/REPORT_AGCOM_TUTTI_template.xlsx
--- a/dbcmnpsrc/FE/mnpdev/mnp/ear/APP-INF/lib/WSO2CIBK63Client.jar
+++ b/dbcmnpsrc/FE/mnpdev/mnp/ear/APP-INF/lib/WSO2CIBK63Client.jar
--- a/dbcmnpsrc/FE/mnpdev/mnp/ear/APP-INF/lib/WSO2CIBK65Client.jar
+++ b/dbcmnpsrc/FE/mnpdev/mnp/ear/APP-INF/lib/WSO2CIBK65Client.jar
--- a/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/jms/MessageHandler.java
+++ b/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/jms/MessageHandler.java
@@ -16,6 +16,7 @@ import mnp.exception.jms.UnknownQueueSystemException;
 import mnp.objects.NotificationMessage;
 import mnp.objects.NotificationMessageIF;
 import mnp.utility.JNDINames;
+import mnp.utility.Resources;
 import weblogic.jms.extensions.WLMessageProducer;

 import javax.jms.*;
@@ -616,7 +617,12 @@ public class MessageHandler {
                    case NotificationMessageIF.NotificationType_TRCS_SlaRecOut:
                    case NotificationMessageIF.NotificationType_TRCS_SlaDonorOut:
                    case NotificationMessageIF.NotificationType_TRCS_DonorOut:
+                        if("0".equals(Resources.getCALL_NEW_JMS_TRCS_ENABLED())){
                            return JNDINames.QUEUE_NAME_TRCS_OUT;
+                        }else{
+                            return JNDINames.QUEUE_NAME_TRCS_OUT_2;
+                        }
+
                    default:
                        throw new UnknownQueueSystemException(
                                "Notification Type sconosciuto: " + notification_type);
--- a/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/proxy/ws/WSRestHandler.java
+++ b/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/proxy/ws/WSRestHandler.java
@@ -346,7 +346,7 @@ public class WSRestHandler extends GenericHandler {
 				try {
 					String line;
 					while ((line = reader.readLine()) != null) {
-						risposta = line;
+						risposta += line + '\n';
 					}
 				} finally {
 					reader.close();
--- a/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/systemcontroller/gisp/formatcontroller/GispRetrieveDonorFormatController.java
+++ b/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/systemcontroller/gisp/formatcontroller/GispRetrieveDonorFormatController.java
@@ -100,7 +100,7 @@ public class GispRetrieveDonorFormatController {
     * @return RetrieveGisp
     */
    public MnpGispRetrieveOut formatEsoDTO(String tracciato) throws Exception {
-        return RetrieveGispXAO.getRetrieveESOFromXmlResponse(tracciato);
+        return RetrieveGispXAO.getRetrieveESOFromJsonResponse(tracciato);
    }

  /**
--- a/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/utility/JNDINames.java
+++ b/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/utility/JNDINames.java
@@ -57,6 +57,7 @@ public class JNDINames {
  public static final String QUEUE_NAME_GINO_OUT = "jms/MessageQueueGinoOut";
  public static final String QUEUE_NAME_SDP_OUT = "jms/MessageQueueSdpOut";
  public static final String QUEUE_NAME_TRCS_OUT = "jms/MessageQueueTrcsOut";
+  public static final String QUEUE_NAME_TRCS_OUT_2 = "jms/MessageQueueTrcsOut2";
 //  public static final String QUEUE_NAME_TRCS_IN = "jms/TRCSAcqServiceQueue";
  public static final String QUEUE_NAME_FENP_OUT = "jms/MessageQueueFenpOut";
  public static final String QUEUE_NAME_FENP_IN  = "jms/MessageQueueFenpIn";
--- a/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/utility/Resources.java
+++ b/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/utility/Resources.java
@@ -2532,4 +2532,9 @@ public class Resources {
 		return trim(props.getProperty("ESO_RETRIEVE_REST_POST_MOCK_RESPONSE_ENABLED"));
 	}

+	public static String getCALL_NEW_JMS_TRCS_ENABLED() {
+		init();
+		return trim(props.getProperty("CALL_NEW_JMS_TRCS_ENABLED"));
+	}
+
 }
--- a/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/xml/dao/RetrieveGispXAO.java
+++ b/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/xml/dao/RetrieveGispXAO.java
@@ -392,7 +392,7 @@ public class RetrieveGispXAO {
     * @param xmlResponse String
     * @return String
     */
-    public static MnpGispRetrieveOut getRetrieveESOFromXmlResponse(String xmlResponse) throws Exception{
+    public static MnpGispRetrieveOut getRetrieveESOFromJsonResponse(String xmlResponse) throws Exception{
        MnpGispRetrieveOut retrieveGisp= new MnpGispRetrieveOut();
        try {
            // databinding con validazione
@@ -408,7 +408,9 @@ public class RetrieveGispXAO {
                mnp.proxy.ws.sdp.client.Attributi attributi = response.getAttributi();
                retrieveGisp.setStato(attributi.getStato());
                //cessazione_mnp
+                if(attributi.getDettaglioStato()!=null){
                    retrieveGisp.setRespCessazioneMnp(attributi.getDettaglioStato().getCessazioneMnp());
+                }
                //operatore_virtuale
                retrieveGisp.setRespOperatoreInterno(attributi.getEsp());
                // Descrizione profilo
@@ -416,21 +418,27 @@ public class RetrieveGispXAO {
                //profilo
                retrieveGisp.setProfilo(attributi.getProfilo());
                //blocco
+                if(attributi.getBlocco()!=null){
                    retrieveGisp.setAnagr(attributi.getBlocco().getAnagr());
                    retrieveGisp.setRespFs(attributi.getBlocco().getFs());
                    retrieveGisp.setRespFraud(attributi.getBlocco().getFraud());
-
+                }
+                //tipologia
                retrieveGisp.setRespTipologia(attributi.getTipologia());
+                //usage (value and main_msisdn)
+                if(attributi.getUsage()!=null){
                    retrieveGisp.setRespValueUsage(attributi.getUsage().getValue());

                    if (!retrieveGisp.getRespValueUsage().equals(GispMap.MAIN_USAGE)
                            || !retrieveGisp.getRespValueUsage().equals(GispMap.TCB_PADRE_USAGE)){
                        retrieveGisp.setRespMainMsisdn(attributi.getUsage().getMainMsisdn());
                    }
+                }
                //dati commerciali
+                if(attributi.getDatiCommerciali()!=null){
                    retrieveGisp.setRespCfPiva(attributi.getDatiCommerciali().getCliente());
                    retrieveGisp.setRespMarcaggio(attributi.getDatiCommerciali().getMarcaggioCliente());
-
+                }
                retrieveGisp.setRespPrepagato(attributi.getPrepagato());
            }//chiude if attributi

@@ -449,8 +457,10 @@ public class RetrieveGispXAO {
                    retrieveGisp.setRespServizioAttivo(elencoServizi[0].getName());
                    //prendo l'elenco degli attributi del servizio (i sottoservizi possono essere più di uno)
                    mnp.proxy.ws.sdp.client.ServiziAttributiServizio attributiServizi = elencoServizi[0].getAttributiServizio();
+                    if(attributiServizi != null){
                        retrieveGisp.setRespAdditional(attributiServizi.getAdditional());
                        retrieveGisp.setRespSottoservizio(attributiServizi.getSottoservizio());
+                    }
                  //  retrieveGisp.setRespAdditional(elencoServizi[0].getAttributi_servizi()[0].getAttributo(1).getContent());
                }
            } //chiudi if servizi
--- a/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/xml/dao/mvno/MvnoNotifyDonorOutXAO.java
+++ b/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/xml/dao/mvno/MvnoNotifyDonorOutXAO.java
@@ -139,14 +139,17 @@ public class MvnoNotifyDonorOutXAO {
                if(!Func.isNull(notificaDonOut.getTipoUtenza())) {
                    mawcts.setAccountType(AccountType.fromValue(notificaDonOut.getTipoUtenza()));
                }
+
+                //MNP_SM_2461 flag_furto non più dipendente da ICCID
+                NewSIMWithisStolen nsws_iccid_furto = of2.createNewSIMWithisStolen();
                if(!Func.isNull(notificaDonOut.getIccid())) {
-                    NewSIMWithisStolen nsws = of2.createNewSIMWithisStolen();
-                    nsws.setICCID(notificaDonOut.getIccid());
+                    nsws_iccid_furto.setICCID(notificaDonOut.getIccid());
+                }
                if(!Func.isNull(notificaDonOut.getFlagFurto())) {
-                        nsws.setIsStolen(YesNoType.fromValue(notificaDonOut.getFlagFurto()));
-                    }
-                    mawcts.setNewSIM(nsws);
+                    nsws_iccid_furto.setIsStolen(YesNoType.fromValue(notificaDonOut.getFlagFurto()));
                }
+                mawcts.setNewSIM(nsws_iccid_furto);
+
                if(!Func.isNull(notificaDonOut.getFlagTc())) {
                    mawcts.setIsCreditInTransfer(YesNoType.fromValue(notificaDonOut.getFlagTc()));
                }
--- a/dbcmnpsrc/FE/mnpdev/wsdbc/gisp/building/esito/esitoCessMnp.war
+++ b/dbcmnpsrc/FE/mnpdev/wsdbc/gisp/building/esito/esitoCessMnp.war
--- a/dbcmnpsrc/FE/mnpdev/wsdbc/o2c/building/esitoRicMvno/esitoRicMvno.war
+++ b/dbcmnpsrc/FE/mnpdev/wsdbc/o2c/building/esitoRicMvno/esitoRicMvno.war
--- a/dbcmnpsrc/FE/mnpdev/wsdbc/o2c/client/IBK63/WSO2CIBK63Client.jar
+++ b/dbcmnpsrc/FE/mnpdev/wsdbc/o2c/client/IBK63/WSO2CIBK63Client.jar
--- a/dbcmnpsrc/FE/mnpdev/wsdbc/o2c/client/IBK65/WSO2CIBK65Client.jar
+++ b/dbcmnpsrc/FE/mnpdev/wsdbc/o2c/client/IBK65/WSO2CIBK65Client.jar
--- a/dbcmnpsrc/FE/mnpdev/wsdbc/wsdl/gisp/esitoCessMnp.xsd
+++ b/dbcmnpsrc/FE/mnpdev/wsdbc/wsdl/gisp/esitoCessMnp.xsd
@@ -31,7 +31,7 @@

    <xs:simpleType name="typeNOME_RICHIESTA">
        <xs:restriction base="xs:string">
-            <xs:pattern value="DBC_DISATMNPG|DBC_ATTIVGSM|DBC_DISATMNPG_PP|DBC_DISATMNPG_CO|DBC_DISATMNPG_BU"/>
+            <xs:pattern value="DBC_DISATMNPG|DBC_ATTIVGSM|DBC_DISATMNPG_PP|DBC_DISATMNPG_CO|DBC_DISATMNPG_BU|DBC_RESTITUZIONE"/>
        </xs:restriction>
    </xs:simpleType>
Author	SHA1	Message	Date
maisto.salvatore	ff960d3281	R58-25-0117 Progetto Trasformazione Prepagato Delivery SW CV1	2025-07-15 21:17:06 +02:00
manuelstefanile	bf8a450c95	Merge branch_C03_2025	2025-07-09 08:52:36 +02:00
manuelstefanile	79ab3a8ec8	MNP_RIL_3039 e MNP_RIL_3040 Ril. MNP_RU_653 - Adesione Accordo Quadro MNP e TCR per Dimensione SRL	2025-06-04 18:21:41 +02:00
manuelstefanile	70ea2b493f	MNP_RIL_3038 - Ril. GATEWAY DBC MNP \|\| R58-24-0029 \|\| lotto 5 - DBC_RESTITUZIONE ClassNotFound + TIMAC	2025-05-26 23:52:05 +02:00
manuelstefanile	c44130cd16	MNP_RIL_3038 - Ril. GATEWAY DBC MNP \|\| R58-24-0029 \|\| lotto 5 - DBC_RESTITUZIONE ClassNotFound	2025-05-26 23:49:40 +02:00
manuelstefanile	5fc9f8bfb9	MNP_RIL_3035 - Ril. MNP_SM_2462 - GATEWAY MNP DBC \|\| R58-24-0029 \|\| ClassNotFoundException	2025-03-27 09:17:29 +01:00
manuelstefanile	e98713fd56	MNP_RIL_3034 - Ril. MNP_SM_2461 - Mancato invio FlagFurto verso TRCS	2025-03-26 16:09:39 +01:00
manuelstefanile	5ca47553de	MNP_RIL_3033 - Ril. MNP_SM_2460 - GATEWAY MNP DBC\|\|R58-24-1170\|\|errore ERRORE UNMARSHAL campi annidati mancanti nella retrieve xml	2025-03-20 17:50:35 +01:00
manuelstefanile	5db8f9da8f	Ril. MNP_SM_2460 - GATEWAY MNP DBC\|\|R58-24-1170\|\|errore ERRORE UNMARSHAL campi mancanti nella retrieve xml	2025-03-20 11:58:40 +01:00
vincenzofariello	3d9525c99e	Fix MNP_SM_2460 + correzione Mock (rimosso TIMAC)	2025-03-19 12:28:37 +01:00
vincenzofariello	7dab6a82bc	Merge file template from C02_2025 on master	2025-02-25 09:54:38 +01:00
vincenzofariello	ea01ee5eb0	Merge branch_C02_2025 on master	2025-02-25 09:43:58 +01:00
manuelstefanile	9c886f028b	MNP_RIL_3029 - Ril. MNP_RU_645 - Adesione Accordo Quadro MNP e TCR per Segnoverde SPA senza (TIMAC)	2025-02-20 14:44:08 +01:00
manuelstefanile	db1405adfe	Rollback - MNP_RU_645 per MNP e MNP_RU_646 per BI	2025-01-21 18:31:55 +01:00
manuelstefanile	0ef2c4f802	MNP_RU_645 per MNP e MNP_RU_646 per BI - Adesione Accordo Quadro MNP e TCR per Segnoverde SPA - REPORT_AGCOM_TUTTI_template.xlsx aggiornato	2025-01-21 12:36:09 +01:00
manuelstefanile	cf29bf810e	MNP_SM_2459 - settaggio del parametro obbligatorio session_Id	2024-12-11 17:09:19 +01:00
manuelstefanile	cfcb966633	MNP_SM_2458 - TSSC: Anomalia generata dal Ticket n. 000000001036489 (agigunto "SOSPESO" ai check)	2024-10-11 11:54:29 +02:00
manuelstefanile	5d7e768b0b	Update README	2024-10-04 16:37:51 +02:00