diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar deleted file mode 100644 index ef846d8c..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalService.java index b06801d3..956a1296 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalService.java @@ -686,6 +686,10 @@ public interface AvvisoLocalService extends BaseLocalService, com.liferay.portal.service.ServiceContext serviceContext) throws java.lang.Exception; + public it.tref.liferay.portos.bo.model.Avviso simulaFirma(long avvisoId, + com.liferay.portal.service.ServiceContext serviceContext) + throws java.lang.Exception; + public java.util.List protocolliSearch( java.lang.String dataDa, java.lang.String dataA, java.lang.String numeroProtocollo, int start, int end) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceClp.java index b2969f87..023f3d0e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceClp.java @@ -515,46 +515,52 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { "com.liferay.portal.service.ServiceContext" }; - _methodName102 = "protocolliSearch"; + _methodName102 = "simulaFirma"; _methodParameterTypes102 = new String[] { + "long", "com.liferay.portal.service.ServiceContext" + }; + + _methodName103 = "protocolliSearch"; + + _methodParameterTypes103 = new String[] { "java.lang.String", "java.lang.String", "java.lang.String", "int", "int" }; - _methodName103 = "countProtocolliSearch"; + _methodName104 = "countProtocolliSearch"; - _methodParameterTypes103 = new String[] { + _methodParameterTypes104 = new String[] { "java.lang.String", "java.lang.String", "java.lang.String" }; - _methodName104 = "getAvvisiPerAggiuntaProtocollo"; + _methodName105 = "getAvvisiPerAggiuntaProtocollo"; - _methodParameterTypes104 = new String[] { "int", "int" }; + _methodParameterTypes105 = new String[] { "int", "int" }; - _methodName105 = "dynamicQueryAggiuntaProtocollo"; + _methodName106 = "dynamicQueryAggiuntaProtocollo"; - _methodParameterTypes105 = new String[] { }; + _methodParameterTypes106 = new String[] { }; - _methodName106 = "findByClassPk"; + _methodName107 = "findByClassPk"; - _methodParameterTypes106 = new String[] { "long" }; + _methodParameterTypes107 = new String[] { "long" }; - _methodName107 = "countAvvisiInvioTecnicoNew"; + _methodName108 = "countAvvisiInvioTecnicoNew"; - _methodParameterTypes107 = new String[] { }; + _methodParameterTypes108 = new String[] { }; - _methodName108 = "getAvvisiInvioTecnicoNew"; + _methodName109 = "getAvvisiInvioTecnicoNew"; - _methodParameterTypes108 = new String[] { "int", "int" }; + _methodParameterTypes109 = new String[] { "int", "int" }; - _methodName109 = "getAvvisoVidimazione"; + _methodName110 = "getAvvisoVidimazione"; - _methodParameterTypes109 = new String[] { "long", "long" }; + _methodParameterTypes110 = new String[] { "long", "long" }; - _methodName110 = "getLastAvvisoIntegrazione"; + _methodName111 = "getLastAvvisoIntegrazione"; - _methodParameterTypes110 = new String[] { "long" }; + _methodParameterTypes111 = new String[] { "long" }; } @Override @@ -3977,6 +3983,40 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { return (it.tref.liferay.portos.bo.model.Avviso)ClpSerializer.translateOutput(returnObj); } + @Override + public it.tref.liferay.portos.bo.model.Avviso simulaFirma(long avvisoId, + com.liferay.portal.service.ServiceContext serviceContext) + throws java.lang.Exception { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName102, + _methodParameterTypes102, + new Object[] { + avvisoId, + + ClpSerializer.translateInput(serviceContext) + }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof java.lang.Exception) { + throw (java.lang.Exception)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return (it.tref.liferay.portos.bo.model.Avviso)ClpSerializer.translateOutput(returnObj); + } + @Override public java.util.List protocolliSearch( java.lang.String dataDa, java.lang.String dataA, @@ -3986,8 +4026,8 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName102, - _methodParameterTypes102, + returnObj = _invokableLocalService.invokeMethod(_methodName103, + _methodParameterTypes103, new Object[] { ClpSerializer.translateInput(dataDa), @@ -4031,8 +4071,8 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName103, - _methodParameterTypes103, + returnObj = _invokableLocalService.invokeMethod(_methodName104, + _methodParameterTypes104, new Object[] { ClpSerializer.translateInput(dataDa), @@ -4071,8 +4111,8 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName104, - _methodParameterTypes104, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName105, + _methodParameterTypes105, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4099,8 +4139,8 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName105, - _methodParameterTypes105, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName106, + _methodParameterTypes106, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4128,8 +4168,8 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName106, - _methodParameterTypes106, new Object[] { classPk }); + returnObj = _invokableLocalService.invokeMethod(_methodName107, + _methodParameterTypes107, new Object[] { classPk }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4156,8 +4196,8 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName107, - _methodParameterTypes107, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName108, + _methodParameterTypes108, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4185,8 +4225,8 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName108, - _methodParameterTypes108, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName109, + _methodParameterTypes109, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4214,8 +4254,8 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName109, - _methodParameterTypes109, + returnObj = _invokableLocalService.invokeMethod(_methodName110, + _methodParameterTypes110, new Object[] { intPraticaId, dettPraticaID }); } catch (Throwable t) { @@ -4244,8 +4284,8 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName110, - _methodParameterTypes110, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName111, + _methodParameterTypes111, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4487,4 +4527,6 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { private String[] _methodParameterTypes109; private String _methodName110; private String[] _methodParameterTypes110; + private String _methodName111; + private String[] _methodParameterTypes111; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceUtil.java index 5b74fc8a..72c816f9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceUtil.java @@ -903,6 +903,12 @@ public class AvvisoLocalServiceUtil { .addFileFirmato(avvisoId, classPk, fileToSave, serviceContext); } + public static it.tref.liferay.portos.bo.model.Avviso simulaFirma( + long avvisoId, com.liferay.portal.service.ServiceContext serviceContext) + throws java.lang.Exception { + return getService().simulaFirma(avvisoId, serviceContext); + } + public static java.util.List protocolliSearch( java.lang.String dataDa, java.lang.String dataA, java.lang.String numeroProtocollo, int start, int end) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceWrapper.java index dda0e8a3..be28987e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceWrapper.java @@ -983,6 +983,13 @@ public class AvvisoLocalServiceWrapper implements AvvisoLocalService, fileToSave, serviceContext); } + @Override + public it.tref.liferay.portos.bo.model.Avviso simulaFirma(long avvisoId, + com.liferay.portal.service.ServiceContext serviceContext) + throws java.lang.Exception { + return _avvisoLocalService.simulaFirma(avvisoId, serviceContext); + } + @Override public java.util.List protocolliSearch( java.lang.String dataDa, java.lang.String dataA, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalService.java index 15e0274e..b30b2cdd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalService.java @@ -310,6 +310,10 @@ public interface ConfigurazioneLocalService extends BaseLocalService, java.lang.String[] parameterTypes, java.lang.Object[] arguments) throws java.lang.Throwable; + public java.util.List findByC_ChiaveList(long companyId, + java.lang.String chiave) + throws com.liferay.portal.kernel.exception.SystemException; + public long findByC_ChiaveLong(long companyId, java.lang.String chiave) throws com.liferay.portal.kernel.exception.SystemException; @@ -317,13 +321,31 @@ public interface ConfigurazioneLocalService extends BaseLocalService, java.lang.String chiave) throws com.liferay.portal.kernel.exception.SystemException; - public it.tref.liferay.portos.bo.model.Configurazione storeConfig( - java.lang.String chiave, java.lang.String valore, - com.liferay.portal.service.ServiceContext serviceContext) + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public long getAndIncrement(long companyId, java.lang.String chiave) + throws com.liferay.portal.kernel.exception.SystemException; + + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public boolean isDeveloper(long userId) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public long getAndIncrement(long companyId, java.lang.String chiave) + public boolean isDeveloper(com.liferay.portal.model.User user) throws com.liferay.portal.kernel.exception.SystemException; + + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public boolean isProduction(); + + public it.tref.liferay.portos.bo.model.Configurazione storeConfig( + java.lang.String chiave, java.util.List valori, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + public it.tref.liferay.portos.bo.model.Configurazione storeConfig( + java.lang.String chiave, java.lang.String valore, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceClp.java index ca6ccfef..e9a6878a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceClp.java @@ -131,24 +131,47 @@ public class ConfigurazioneLocalServiceClp implements ConfigurazioneLocalService _methodParameterTypes21 = new String[] { "java.lang.String" }; - _methodName23 = "findByC_ChiaveLong"; + _methodName23 = "findByC_ChiaveList"; _methodParameterTypes23 = new String[] { "long", "java.lang.String" }; - _methodName24 = "findByC_ChiaveString"; + _methodName24 = "findByC_ChiaveLong"; _methodParameterTypes24 = new String[] { "long", "java.lang.String" }; - _methodName25 = "storeConfig"; + _methodName25 = "findByC_ChiaveString"; - _methodParameterTypes25 = new String[] { - "java.lang.String", "java.lang.String", - "com.liferay.portal.service.ServiceContext" - }; + _methodParameterTypes25 = new String[] { "long", "java.lang.String" }; _methodName26 = "getAndIncrement"; _methodParameterTypes26 = new String[] { "long", "java.lang.String" }; + + _methodName27 = "isDeveloper"; + + _methodParameterTypes27 = new String[] { "long" }; + + _methodName28 = "isDeveloper"; + + _methodParameterTypes28 = new String[] { "com.liferay.portal.model.User" }; + + _methodName29 = "isProduction"; + + _methodParameterTypes29 = new String[] { }; + + _methodName30 = "storeConfig"; + + _methodParameterTypes30 = new String[] { + "java.lang.String", "java.util.List", + "com.liferay.portal.service.ServiceContext" + }; + + _methodName31 = "storeConfig"; + + _methodParameterTypes31 = new String[] { + "java.lang.String", "java.lang.String", + "com.liferay.portal.service.ServiceContext" + }; } @Override @@ -832,7 +855,8 @@ public class ConfigurazioneLocalServiceClp implements ConfigurazioneLocalService } @Override - public long findByC_ChiaveLong(long companyId, java.lang.String chiave) + public java.util.List findByC_ChiaveList(long companyId, + java.lang.String chiave) throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; @@ -858,6 +882,36 @@ public class ConfigurazioneLocalServiceClp implements ConfigurazioneLocalService } } + return (java.util.List)ClpSerializer.translateOutput(returnObj); + } + + @Override + public long findByC_ChiaveLong(long companyId, java.lang.String chiave) + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName24, + _methodParameterTypes24, + new Object[] { companyId, ClpSerializer.translateInput( + chiave) }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + return ((Long)returnObj).longValue(); } @@ -868,8 +922,8 @@ public class ConfigurazioneLocalServiceClp implements ConfigurazioneLocalService Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName24, - _methodParameterTypes24, + returnObj = _invokableLocalService.invokeMethod(_methodName25, + _methodParameterTypes25, new Object[] { companyId, ClpSerializer.translateInput( chiave) }); } @@ -892,21 +946,136 @@ public class ConfigurazioneLocalServiceClp implements ConfigurazioneLocalService return (java.lang.String)ClpSerializer.translateOutput(returnObj); } + @Override + public long getAndIncrement(long companyId, java.lang.String chiave) + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName26, + _methodParameterTypes26, + new Object[] { companyId, ClpSerializer.translateInput( + chiave) }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return ((Long)returnObj).longValue(); + } + + @Override + public boolean isDeveloper(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName27, + _methodParameterTypes27, new Object[] { userId }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return ((Boolean)returnObj).booleanValue(); + } + + @Override + public boolean isDeveloper(com.liferay.portal.model.User user) + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName28, + _methodParameterTypes28, + new Object[] { ClpSerializer.translateInput(user) }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return ((Boolean)returnObj).booleanValue(); + } + + @Override + public boolean isProduction() { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName29, + _methodParameterTypes29, new Object[] { }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return ((Boolean)returnObj).booleanValue(); + } + @Override public it.tref.liferay.portos.bo.model.Configurazione storeConfig( - java.lang.String chiave, java.lang.String valore, + java.lang.String chiave, java.util.List valori, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName25, - _methodParameterTypes25, + returnObj = _invokableLocalService.invokeMethod(_methodName30, + _methodParameterTypes30, new Object[] { ClpSerializer.translateInput(chiave), - ClpSerializer.translateInput(valore), + ClpSerializer.translateInput(valori), ClpSerializer.translateInput(serviceContext) }); @@ -935,19 +1104,31 @@ public class ConfigurazioneLocalServiceClp implements ConfigurazioneLocalService } @Override - public long getAndIncrement(long companyId, java.lang.String chiave) - throws com.liferay.portal.kernel.exception.SystemException { + public it.tref.liferay.portos.bo.model.Configurazione storeConfig( + java.lang.String chiave, java.lang.String valore, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName26, - _methodParameterTypes26, - new Object[] { companyId, ClpSerializer.translateInput( - chiave) }); + returnObj = _invokableLocalService.invokeMethod(_methodName31, + _methodParameterTypes31, + new Object[] { + ClpSerializer.translateInput(chiave), + + ClpSerializer.translateInput(valore), + + ClpSerializer.translateInput(serviceContext) + }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { throw (com.liferay.portal.kernel.exception.SystemException)t; } @@ -961,7 +1142,7 @@ public class ConfigurazioneLocalServiceClp implements ConfigurazioneLocalService } } - return ((Long)returnObj).longValue(); + return (it.tref.liferay.portos.bo.model.Configurazione)ClpSerializer.translateOutput(returnObj); } private InvokableLocalService _invokableLocalService; @@ -1017,4 +1198,14 @@ public class ConfigurazioneLocalServiceClp implements ConfigurazioneLocalService private String[] _methodParameterTypes25; private String _methodName26; private String[] _methodParameterTypes26; + private String _methodName27; + private String[] _methodParameterTypes27; + private String _methodName28; + private String[] _methodParameterTypes28; + private String _methodName29; + private String[] _methodParameterTypes29; + private String _methodName30; + private String[] _methodParameterTypes30; + private String _methodName31; + private String[] _methodParameterTypes31; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceUtil.java index 66b6e53c..832146ba 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceUtil.java @@ -336,6 +336,12 @@ public class ConfigurazioneLocalServiceUtil { return getService().invokeMethod(name, parameterTypes, arguments); } + public static java.util.List findByC_ChiaveList( + long companyId, java.lang.String chiave) + throws com.liferay.portal.kernel.exception.SystemException { + return getService().findByC_ChiaveList(companyId, chiave); + } + public static long findByC_ChiaveLong(long companyId, java.lang.String chiave) throws com.liferay.portal.kernel.exception.SystemException { @@ -348,17 +354,40 @@ public class ConfigurazioneLocalServiceUtil { return getService().findByC_ChiaveString(companyId, chiave); } + public static long getAndIncrement(long companyId, java.lang.String chiave) + throws com.liferay.portal.kernel.exception.SystemException { + return getService().getAndIncrement(companyId, chiave); + } + + public static boolean isDeveloper(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return getService().isDeveloper(userId); + } + + public static boolean isDeveloper(com.liferay.portal.model.User user) + throws com.liferay.portal.kernel.exception.SystemException { + return getService().isDeveloper(user); + } + + public static boolean isProduction() { + return getService().isProduction(); + } + public static it.tref.liferay.portos.bo.model.Configurazione storeConfig( - java.lang.String chiave, java.lang.String valore, + java.lang.String chiave, java.util.List valori, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { - return getService().storeConfig(chiave, valore, serviceContext); + return getService().storeConfig(chiave, valori, serviceContext); } - public static long getAndIncrement(long companyId, java.lang.String chiave) - throws com.liferay.portal.kernel.exception.SystemException { - return getService().getAndIncrement(companyId, chiave); + public static it.tref.liferay.portos.bo.model.Configurazione storeConfig( + java.lang.String chiave, java.lang.String valore, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return getService().storeConfig(chiave, valore, serviceContext); } public static void clearService() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceWrapper.java index c87b6bb8..df32f1de 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ConfigurazioneLocalServiceWrapper.java @@ -356,6 +356,13 @@ public class ConfigurazioneLocalServiceWrapper arguments); } + @Override + public java.util.List findByC_ChiaveList(long companyId, + java.lang.String chiave) + throws com.liferay.portal.kernel.exception.SystemException { + return _configurazioneLocalService.findByC_ChiaveList(companyId, chiave); + } + @Override public long findByC_ChiaveLong(long companyId, java.lang.String chiave) throws com.liferay.portal.kernel.exception.SystemException { @@ -370,20 +377,48 @@ public class ConfigurazioneLocalServiceWrapper chiave); } + @Override + public long getAndIncrement(long companyId, java.lang.String chiave) + throws com.liferay.portal.kernel.exception.SystemException { + return _configurazioneLocalService.getAndIncrement(companyId, chiave); + } + + @Override + public boolean isDeveloper(long userId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _configurazioneLocalService.isDeveloper(userId); + } + + @Override + public boolean isDeveloper(com.liferay.portal.model.User user) + throws com.liferay.portal.kernel.exception.SystemException { + return _configurazioneLocalService.isDeveloper(user); + } + + @Override + public boolean isProduction() { + return _configurazioneLocalService.isProduction(); + } + @Override public it.tref.liferay.portos.bo.model.Configurazione storeConfig( - java.lang.String chiave, java.lang.String valore, + java.lang.String chiave, java.util.List valori, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { - return _configurazioneLocalService.storeConfig(chiave, valore, + return _configurazioneLocalService.storeConfig(chiave, valori, serviceContext); } @Override - public long getAndIncrement(long companyId, java.lang.String chiave) - throws com.liferay.portal.kernel.exception.SystemException { - return _configurazioneLocalService.getAndIncrement(companyId, chiave); + public it.tref.liferay.portos.bo.model.Configurazione storeConfig( + java.lang.String chiave, java.lang.String valore, + com.liferay.portal.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _configurazioneLocalService.storeConfig(chiave, valore, + serviceContext); } /** diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneFirmePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneFirmePortlet.java index b4a18921..edf2760f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneFirmePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneFirmePortlet.java @@ -5,6 +5,7 @@ import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; import it.tref.liferay.portos.bo.service.AvvisoServiceUtil; +import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil; import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; @@ -54,46 +55,52 @@ import com.liferay.util.bridges.mvc.MVCPortlet; public class GestioneFirmePortlet extends MVCPortlet { - public void assignaFirma(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, - SystemException { + public void assegnaFirma(ActionRequest request, ActionResponse response) throws PortalException, SystemException { - ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); + ServiceContext serviceContext = ServiceContextFactory.getInstance(request); User user = UserLocalServiceUtil.getUser(serviceContext.getUserId()); - long avvisoId = ParamUtil.getLong(actionRequest, "avvisoId"); + long avvisoId = ParamUtil.getLong(request, "avvisoId"); Avviso avviso = AvvisoLocalServiceUtil.getAvviso(avvisoId); if (GestioneFirmeUtil.userCanSignAvviso(user.getUserId(), avviso.getGroupId(), avviso.getAvvisoId())) { AvvisoServiceUtil.assegnaFirma(avviso.getAvvisoId(), user.getScreenName()); - PortalUtil.copyRequestParameters(actionRequest, actionResponse); + PortalUtil.copyRequestParameters(request, response); } else { - SessionErrors.add(actionRequest, "non possibile asssegnazione firma"); + SessionErrors.add(request, "non possibile asssegnazione firma"); } } - public void rilasciaFirma(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, - SystemException { + public void rilasciaFirma(ActionRequest request, ActionResponse response) throws PortalException, SystemException { - ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); + ServiceContext serviceContext = ServiceContextFactory.getInstance(request); User user = UserLocalServiceUtil.getUser(serviceContext.getUserId()); - long avvisoId = ParamUtil.getLong(actionRequest, "avvisoId"); - Avviso avviso = AvvisoLocalServiceUtil.getAvviso(avvisoId); - AvvisoServiceUtil.rilasciaFirma(avviso.getAvvisoId(), user.getScreenName()); - PortalUtil.copyRequestParameters(actionRequest, actionResponse); + long avvisoId = ParamUtil.getLong(request, "avvisoId"); + AvvisoServiceUtil.rilasciaFirma(avvisoId, user.getScreenName()); + PortalUtil.copyRequestParameters(request, response); + } + + public void simulaFirma(ActionRequest request, ActionResponse response) throws Exception { + + ServiceContext serviceContext = ServiceContextFactory.getInstance(request); + if (ConfigurazioneLocalServiceUtil.isDeveloper(serviceContext.getUserId())) { + long avvisoId = ParamUtil.getLong(request, "avvisoId"); + AvvisoLocalServiceUtil.simulaFirma(avvisoId, serviceContext); + } else { + throw new PortletException("Firma simulata non permessa"); + } } // ADT BUG-ID=16 Sezione Pratiche Assegnate / Export CSV delle firme @Override - public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws IOException, - PortletException { + public void serveResource(ResourceRequest request, ResourceResponse response) throws IOException, PortletException { - String resourceId = GetterUtil.getString(resourceRequest.getResourceID()); + String resourceId = GetterUtil.getString(request.getResourceID()); if (resourceId.equals("exportCSV")) { - ThemeDisplay themeDisplay = (ThemeDisplay) resourceRequest.getAttribute(WebKeys.THEME_DISPLAY); + ThemeDisplay themeDisplay = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY); long companyId = themeDisplay.getCompanyId(); Locale locale = themeDisplay.getLocale(); User user = themeDisplay.getUser(); - String tabs1 = ParamUtil.getString(resourceRequest, "tabs1"); + String tabs1 = ParamUtil.getString(request, "tabs1"); try { - String csv = null; String fileName = null; if ("Tab_AvvisiDaFirmare".equals(tabs1)) { @@ -106,15 +113,15 @@ public class GestioneFirmePortlet extends MVCPortlet { fileName = "da_firmare"; csv = exportToCSVAvvisiFirme(companyId, user.getScreenName(), locale); } - HttpServletRequest request = PortalUtil.getHttpServletRequest(resourceRequest); - HttpServletResponse response = PortalUtil.getHttpServletResponse(resourceResponse); - ServletResponseUtil.sendFile(request, response, "export_firme_" + fileName + ".csv", + HttpServletRequest httpRequest = PortalUtil.getHttpServletRequest(request); + HttpServletResponse httpResponse = PortalUtil.getHttpServletResponse(response); + ServletResponseUtil.sendFile(httpRequest, httpResponse, "export_firme_" + fileName + ".csv", csv.getBytes(StringPool.UTF8), ContentTypes.TEXT_CSV_UTF8); } catch (Exception e) { throw new IOException(e); } } - super.serveResource(resourceRequest, resourceResponse); + super.serveResource(request, response); } // ADT BUG-ID=16 Sezione Pratiche Assegnate / Export CSV delle firme @@ -124,18 +131,16 @@ public class GestioneFirmePortlet extends MVCPortlet { StringBuilder sb = new StringBuilder(); List lista = AvvisoLocalServiceUtil.getAvvisiFirmatiByCF(companyId, cf, QueryUtil.ALL_POS, QueryUtil.ALL_POS); - sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.progetto"))) - .append(StringPool.SEMICOLON) + sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.progetto"))).append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.protocollo"))) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.descrizione"))) - .append(StringPool.SEMICOLON) - .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "provincia"))) - .append(StringPool.SEMICOLON) + .append(':').append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "provincia"))) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.dataAvviso"))) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.tipoDocumento"))) - .append(StringPool.SEMICOLON).append(StringPool.NEW_LINE); + .append(':').append('\n'); for (Iterator iterator = lista.iterator(); iterator.hasNext();) { Avviso avviso = iterator.next(); DettPratica dettPratica = DettPraticaLocalServiceUtil.fetchDettPratica(avviso.getClassPk()); @@ -150,18 +155,18 @@ public class GestioneFirmePortlet extends MVCPortlet { long organizationId = GroupLocalServiceUtil.getGroup(territorioGroupId).getOrganizationId(); String genio = OrganizationLocalServiceUtil.getOrganization(organizationId).getName(); sb.append(CSVUtil.encode(intPratica.getNumeroProgetto())) - .append(StringPool.SEMICOLON) + .append(':') .append(Validator.isNull(dettPratica) ? StringPool.BLANK : CSVUtil.encode(dettPratica .getProtocollo())) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(avviso.getDescLong())) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(genio)) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(dateFormat.format(avviso.getDtAvviso()))) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, avviso.translateTipoDocumento()))) - .append(StringPool.SEMICOLON).append(StringPool.NEW_LINE); + .append(':').append('\n'); } return sb.toString(); } @@ -171,30 +176,27 @@ public class GestioneFirmePortlet extends MVCPortlet { Format dateFormat = FastDateFormatFactoryUtil.getDate(locale); StringBuilder sb = new StringBuilder(); - long[] gruopIds = new long[0]; + long[] groupIds = new long[0]; List organizations = OrganizationLocalServiceUtil.getUserOrganizations(user.getUserId()); for (Organization organization : organizations) { if (UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), organization.getGroupId(), Constants.ROLE_NAME_FIRMA, true)) { - gruopIds = ArrayUtil.append(gruopIds, organization.getGroupId()); + groupIds = ArrayUtil.append(groupIds, organization.getGroupId()); } } - List lista = AvvisoLocalServiceUtil.getAvvisiDaFirmarePrimaFirmaByNotCF(companyId, gruopIds, + List lista = AvvisoLocalServiceUtil.getAvvisiDaFirmarePrimaFirmaByNotCF(companyId, groupIds, user.getScreenName(), QueryUtil.ALL_POS, QueryUtil.ALL_POS); - sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.progetto"))) - .append(StringPool.SEMICOLON) + sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.progetto"))).append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.protocollo"))) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.descrizione"))) - .append(StringPool.SEMICOLON) - .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "provincia"))) - .append(StringPool.SEMICOLON) + .append(':').append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "provincia"))) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.dataAvviso"))) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.tipoDocumento"))) - .append(StringPool.SEMICOLON) - .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.firma"))) - .append(StringPool.SEMICOLON).append(StringPool.NEW_LINE); + .append(':').append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.firma"))) + .append(':').append('\n'); for (Iterator iterator = lista.iterator(); iterator.hasNext();) { Avviso avviso = iterator.next(); DettPratica dettPratica = DettPraticaLocalServiceUtil.fetchDettPratica(avviso.getClassPk()); @@ -211,20 +213,19 @@ public class GestioneFirmePortlet extends MVCPortlet { String cf = avviso.getUserCodiceFiscalePrimaFirma(); User userFirma = UserLocalServiceUtil.fetchUserByScreenName(companyId, cf); sb.append(CSVUtil.encode(intPratica.getNumeroProgetto())) - .append(StringPool.SEMICOLON) + .append(':') .append(Validator.isNull(dettPratica) ? StringPool.BLANK : CSVUtil.encode(dettPratica .getProtocollo())) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(avviso.getDescLong())) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(genio)) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(dateFormat.format(avviso.getDtAvviso()))) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, avviso.translateTipoDocumento()))) - .append(StringPool.SEMICOLON) - .append(CSVUtil.encode(Validator.isNull(userFirma) ? cf : userFirma.getFullName())) - .append(StringPool.SEMICOLON).append(StringPool.NEW_LINE); + .append(':').append(CSVUtil.encode(Validator.isNull(userFirma) ? cf : userFirma.getFullName())) + .append(':').append('\n'); } return sb.toString(); } @@ -238,19 +239,17 @@ public class GestioneFirmePortlet extends MVCPortlet { user.getScreenName(), QueryUtil.ALL_POS, QueryUtil.ALL_POS); sb.append("LE TUE FIRME\n") .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.progetto"))) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.protocollo"))) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.descrizione"))) - .append(StringPool.SEMICOLON) - .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "provincia"))) - .append(StringPool.SEMICOLON) + .append(':').append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "provincia"))) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.dataAvviso"))) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.tipoDocumento"))) - .append(StringPool.SEMICOLON) - .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.firma"))) - .append(StringPool.SEMICOLON).append(StringPool.NEW_LINE); + .append(':').append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.firma"))) + .append(':').append('\n'); for (Iterator iterator = listaLeTueFirme.iterator(); iterator.hasNext();) { Avviso avviso = iterator.next(); DettPratica dettPratica = DettPraticaLocalServiceUtil.fetchDettPratica(avviso.getClassPk()); @@ -267,70 +266,68 @@ public class GestioneFirmePortlet extends MVCPortlet { String cf = avviso.getUserCodiceFiscalePrimaFirma(); User userFirma = UserLocalServiceUtil.fetchUserByScreenName(companyId, cf); sb.append(CSVUtil.encode(intPratica.getNumeroProgetto())) - .append(StringPool.SEMICOLON) + .append(':') .append(Validator.isNull(dettPratica) ? StringPool.BLANK : CSVUtil.encode(dettPratica .getProtocollo())) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(avviso.getDescLong())) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(genio)) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(dateFormat.format(avviso.getDtAvviso()))) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, avviso.translateTipoDocumento()))) - .append(StringPool.SEMICOLON) - .append(CSVUtil.encode(Validator.isNull(userFirma) ? cf : userFirma.getFullName())) - .append(StringPool.SEMICOLON).append(StringPool.NEW_LINE); + .append(':').append(CSVUtil.encode(Validator.isNull(userFirma) ? cf : userFirma.getFullName())) + .append(':').append('\n'); } - long[] gruopIds = new long[0]; + long[] groupIds = new long[0]; List organizations = OrganizationLocalServiceUtil.getUserOrganizations(user.getUserId()); for (Organization organization : organizations) { if (UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), organization.getGroupId(), Constants.ROLE_NAME_FIRMA, true)) { - gruopIds = ArrayUtil.append(gruopIds, organization.getGroupId()); + groupIds = ArrayUtil.append(groupIds, organization.getGroupId()); } } List listaFirmeAssegnateAlRuolo = AvvisoLocalServiceUtil.getAvvisiDaFirmarePrimaFirma(companyId, - gruopIds, QueryUtil.ALL_POS, QueryUtil.ALL_POS); + groupIds, QueryUtil.ALL_POS, QueryUtil.ALL_POS); sb.append("\n\nFIRME ASSEGNATE AL RUOLO\n") .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.progetto"))) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.protocollo"))) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.descrizione"))) - .append(StringPool.SEMICOLON) - .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "provincia"))) - .append(StringPool.SEMICOLON) + .append(':').append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "provincia"))) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.dataAvviso"))) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.avviso.tipoDocumento"))) - .append(StringPool.SEMICOLON).append(StringPool.NEW_LINE); + .append(':').append('\n'); for (Iterator iterator = listaFirmeAssegnateAlRuolo.iterator(); iterator.hasNext();) { Avviso avviso = iterator.next(); DettPratica dettPratica = DettPraticaLocalServiceUtil.fetchDettPratica(avviso.getClassPk()); IntPratica intPratica = null; - if (Validator.isNotNull(dettPratica)) { - intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - } else { + if (Validator.isNull(dettPratica)) { intPratica = IntPraticaLocalServiceUtil.getIntPratica(avviso.getIntPraticaId()); + } else { + intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); } long territorioGroupId = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()) .getGroupId(); long organizationId = GroupLocalServiceUtil.getGroup(territorioGroupId).getOrganizationId(); String genio = OrganizationLocalServiceUtil.getOrganization(organizationId).getName(); sb.append(CSVUtil.encode(intPratica.getNumeroProgetto())) - .append(StringPool.SEMICOLON) + .append(':') .append(Validator.isNull(dettPratica) ? StringPool.BLANK : CSVUtil.encode(dettPratica .getProtocollo())) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(avviso.getDescLong())) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(genio)) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(dateFormat.format(avviso.getDtAvviso()))) - .append(StringPool.SEMICOLON) + .append(':') .append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, avviso.translateTipoDocumento()))) - .append(StringPool.SEMICOLON).append(StringPool.NEW_LINE); + .append(':').append('\n'); } return sb.toString(); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceClpInvoker.java index a620e992..b385aa7f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceClpInvoker.java @@ -531,46 +531,52 @@ public class AvvisoLocalServiceClpInvoker { "com.liferay.portal.service.ServiceContext" }; - _methodName275 = "protocolliSearch"; + _methodName275 = "simulaFirma"; _methodParameterTypes275 = new String[] { + "long", "com.liferay.portal.service.ServiceContext" + }; + + _methodName276 = "protocolliSearch"; + + _methodParameterTypes276 = new String[] { "java.lang.String", "java.lang.String", "java.lang.String", "int", "int" }; - _methodName276 = "countProtocolliSearch"; + _methodName277 = "countProtocolliSearch"; - _methodParameterTypes276 = new String[] { + _methodParameterTypes277 = new String[] { "java.lang.String", "java.lang.String", "java.lang.String" }; - _methodName277 = "getAvvisiPerAggiuntaProtocollo"; + _methodName278 = "getAvvisiPerAggiuntaProtocollo"; - _methodParameterTypes277 = new String[] { "int", "int" }; + _methodParameterTypes278 = new String[] { "int", "int" }; - _methodName278 = "dynamicQueryAggiuntaProtocollo"; + _methodName279 = "dynamicQueryAggiuntaProtocollo"; - _methodParameterTypes278 = new String[] { }; + _methodParameterTypes279 = new String[] { }; - _methodName279 = "findByClassPk"; + _methodName280 = "findByClassPk"; - _methodParameterTypes279 = new String[] { "long" }; + _methodParameterTypes280 = new String[] { "long" }; - _methodName280 = "countAvvisiInvioTecnicoNew"; + _methodName281 = "countAvvisiInvioTecnicoNew"; - _methodParameterTypes280 = new String[] { }; + _methodParameterTypes281 = new String[] { }; - _methodName281 = "getAvvisiInvioTecnicoNew"; + _methodName282 = "getAvvisiInvioTecnicoNew"; - _methodParameterTypes281 = new String[] { "int", "int" }; + _methodParameterTypes282 = new String[] { "int", "int" }; - _methodName283 = "getAvvisoVidimazione"; + _methodName284 = "getAvvisoVidimazione"; - _methodParameterTypes283 = new String[] { "long", "long" }; + _methodParameterTypes284 = new String[] { "long", "long" }; - _methodName284 = "getLastAvvisoIntegrazione"; + _methodName285 = "getLastAvvisoIntegrazione"; - _methodParameterTypes284 = new String[] { "long" }; + _methodParameterTypes285 = new String[] { "long" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -1232,53 +1238,59 @@ public class AvvisoLocalServiceClpInvoker { if (_methodName275.equals(name) && Arrays.deepEquals(_methodParameterTypes275, parameterTypes)) { - return AvvisoLocalServiceUtil.protocolliSearch((java.lang.String)arguments[0], - (java.lang.String)arguments[1], (java.lang.String)arguments[2], - ((Integer)arguments[3]).intValue(), - ((Integer)arguments[4]).intValue()); + return AvvisoLocalServiceUtil.simulaFirma(((Long)arguments[0]).longValue(), + (com.liferay.portal.service.ServiceContext)arguments[1]); } if (_methodName276.equals(name) && Arrays.deepEquals(_methodParameterTypes276, parameterTypes)) { - return AvvisoLocalServiceUtil.countProtocolliSearch((java.lang.String)arguments[0], - (java.lang.String)arguments[1], (java.lang.String)arguments[2]); + return AvvisoLocalServiceUtil.protocolliSearch((java.lang.String)arguments[0], + (java.lang.String)arguments[1], (java.lang.String)arguments[2], + ((Integer)arguments[3]).intValue(), + ((Integer)arguments[4]).intValue()); } if (_methodName277.equals(name) && Arrays.deepEquals(_methodParameterTypes277, parameterTypes)) { - return AvvisoLocalServiceUtil.getAvvisiPerAggiuntaProtocollo(((Integer)arguments[0]).intValue(), - ((Integer)arguments[1]).intValue()); + return AvvisoLocalServiceUtil.countProtocolliSearch((java.lang.String)arguments[0], + (java.lang.String)arguments[1], (java.lang.String)arguments[2]); } if (_methodName278.equals(name) && Arrays.deepEquals(_methodParameterTypes278, parameterTypes)) { - return AvvisoLocalServiceUtil.dynamicQueryAggiuntaProtocollo(); + return AvvisoLocalServiceUtil.getAvvisiPerAggiuntaProtocollo(((Integer)arguments[0]).intValue(), + ((Integer)arguments[1]).intValue()); } if (_methodName279.equals(name) && Arrays.deepEquals(_methodParameterTypes279, parameterTypes)) { - return AvvisoLocalServiceUtil.findByClassPk(((Long)arguments[0]).longValue()); + return AvvisoLocalServiceUtil.dynamicQueryAggiuntaProtocollo(); } if (_methodName280.equals(name) && Arrays.deepEquals(_methodParameterTypes280, parameterTypes)) { - return AvvisoLocalServiceUtil.countAvvisiInvioTecnicoNew(); + return AvvisoLocalServiceUtil.findByClassPk(((Long)arguments[0]).longValue()); } if (_methodName281.equals(name) && Arrays.deepEquals(_methodParameterTypes281, parameterTypes)) { + return AvvisoLocalServiceUtil.countAvvisiInvioTecnicoNew(); + } + + if (_methodName282.equals(name) && + Arrays.deepEquals(_methodParameterTypes282, parameterTypes)) { return AvvisoLocalServiceUtil.getAvvisiInvioTecnicoNew(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName283.equals(name) && - Arrays.deepEquals(_methodParameterTypes283, parameterTypes)) { + if (_methodName284.equals(name) && + Arrays.deepEquals(_methodParameterTypes284, parameterTypes)) { return AvvisoLocalServiceUtil.getAvvisoVidimazione(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName284.equals(name) && - Arrays.deepEquals(_methodParameterTypes284, parameterTypes)) { + if (_methodName285.equals(name) && + Arrays.deepEquals(_methodParameterTypes285, parameterTypes)) { return AvvisoLocalServiceUtil.getLastAvvisoIntegrazione(((Long)arguments[0]).longValue()); } @@ -1507,8 +1519,10 @@ public class AvvisoLocalServiceClpInvoker { private String[] _methodParameterTypes280; private String _methodName281; private String[] _methodParameterTypes281; - private String _methodName283; - private String[] _methodParameterTypes283; + private String _methodName282; + private String[] _methodParameterTypes282; private String _methodName284; private String[] _methodParameterTypes284; + private String _methodName285; + private String[] _methodParameterTypes285; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneLocalServiceClpInvoker.java index 656491d0..fa66ea4c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ConfigurazioneLocalServiceClpInvoker.java @@ -130,24 +130,47 @@ public class ConfigurazioneLocalServiceClpInvoker { _methodParameterTypes177 = new String[] { "java.lang.String" }; - _methodName182 = "findByC_ChiaveLong"; + _methodName182 = "findByC_ChiaveList"; _methodParameterTypes182 = new String[] { "long", "java.lang.String" }; - _methodName183 = "findByC_ChiaveString"; + _methodName183 = "findByC_ChiaveLong"; _methodParameterTypes183 = new String[] { "long", "java.lang.String" }; - _methodName184 = "storeConfig"; + _methodName184 = "findByC_ChiaveString"; - _methodParameterTypes184 = new String[] { - "java.lang.String", "java.lang.String", - "com.liferay.portal.service.ServiceContext" - }; + _methodParameterTypes184 = new String[] { "long", "java.lang.String" }; _methodName185 = "getAndIncrement"; _methodParameterTypes185 = new String[] { "long", "java.lang.String" }; + + _methodName186 = "isDeveloper"; + + _methodParameterTypes186 = new String[] { "long" }; + + _methodName187 = "isDeveloper"; + + _methodParameterTypes187 = new String[] { "com.liferay.portal.model.User" }; + + _methodName188 = "isProduction"; + + _methodParameterTypes188 = new String[] { }; + + _methodName189 = "storeConfig"; + + _methodParameterTypes189 = new String[] { + "java.lang.String", "java.util.List", + "com.liferay.portal.service.ServiceContext" + }; + + _methodName190 = "storeConfig"; + + _methodParameterTypes190 = new String[] { + "java.lang.String", "java.lang.String", + "com.liferay.portal.service.ServiceContext" + }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -277,21 +300,20 @@ public class ConfigurazioneLocalServiceClpInvoker { if (_methodName182.equals(name) && Arrays.deepEquals(_methodParameterTypes182, parameterTypes)) { - return ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(((Long)arguments[0]).longValue(), + return ConfigurazioneLocalServiceUtil.findByC_ChiaveList(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } if (_methodName183.equals(name) && Arrays.deepEquals(_methodParameterTypes183, parameterTypes)) { - return ConfigurazioneLocalServiceUtil.findByC_ChiaveString(((Long)arguments[0]).longValue(), + return ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } if (_methodName184.equals(name) && Arrays.deepEquals(_methodParameterTypes184, parameterTypes)) { - return ConfigurazioneLocalServiceUtil.storeConfig((java.lang.String)arguments[0], - (java.lang.String)arguments[1], - (com.liferay.portal.service.ServiceContext)arguments[2]); + return ConfigurazioneLocalServiceUtil.findByC_ChiaveString(((Long)arguments[0]).longValue(), + (java.lang.String)arguments[1]); } if (_methodName185.equals(name) && @@ -300,6 +322,35 @@ public class ConfigurazioneLocalServiceClpInvoker { (java.lang.String)arguments[1]); } + if (_methodName186.equals(name) && + Arrays.deepEquals(_methodParameterTypes186, parameterTypes)) { + return ConfigurazioneLocalServiceUtil.isDeveloper(((Long)arguments[0]).longValue()); + } + + if (_methodName187.equals(name) && + Arrays.deepEquals(_methodParameterTypes187, parameterTypes)) { + return ConfigurazioneLocalServiceUtil.isDeveloper((com.liferay.portal.model.User)arguments[0]); + } + + if (_methodName188.equals(name) && + Arrays.deepEquals(_methodParameterTypes188, parameterTypes)) { + return ConfigurazioneLocalServiceUtil.isProduction(); + } + + if (_methodName189.equals(name) && + Arrays.deepEquals(_methodParameterTypes189, parameterTypes)) { + return ConfigurazioneLocalServiceUtil.storeConfig((java.lang.String)arguments[0], + (java.util.List)arguments[1], + (com.liferay.portal.service.ServiceContext)arguments[2]); + } + + if (_methodName190.equals(name) && + Arrays.deepEquals(_methodParameterTypes190, parameterTypes)) { + return ConfigurazioneLocalServiceUtil.storeConfig((java.lang.String)arguments[0], + (java.lang.String)arguments[1], + (com.liferay.portal.service.ServiceContext)arguments[2]); + } + throw new UnsupportedOperationException(); } @@ -355,4 +406,14 @@ public class ConfigurazioneLocalServiceClpInvoker { private String[] _methodParameterTypes184; private String _methodName185; private String[] _methodParameterTypes185; + private String _methodName186; + private String[] _methodParameterTypes186; + private String _methodName187; + private String[] _methodParameterTypes187; + private String _methodName188; + private String[] _methodParameterTypes188; + private String _methodName189; + private String[] _methodParameterTypes189; + private String _methodName190; + private String[] _methodParameterTypes190; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java index 0fbaf1b7..1598bdf1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java @@ -82,7 +82,7 @@ public class AvvisoLocalServiceImpl extends AvvisoLocalServiceBaseImpl { * it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil} to access the avviso local service. */ - private static final Log _log = LogFactoryUtil.getLog(AvvisoLocalServiceImpl.class.getName()); + private static final Log _log = LogFactoryUtil.getLog(AvvisoLocalServiceImpl.class); @Override public Avviso createStandardAvvisoPratica(IntPratica intPratica, long classPk, String className, @@ -1106,6 +1106,22 @@ public class AvvisoLocalServiceImpl extends AvvisoLocalServiceBaseImpl { return avviso; } + public Avviso simulaFirma(long avvisoId, ServiceContext serviceContext) throws Exception { + + if (configurazioneLocalService.isDeveloper(serviceContext.getUserId())) { + Avviso avviso = fetchAvviso(avvisoId); + avviso.setFileEntryIdInvio(avviso.getFileEntryIdBase()); + avviso = updateAvviso(avviso); + if (Validator.isNull(avviso.getProtocollo())) { + String protocollo = ProtocollazioneUtil.protocollaPartenza(avviso, avviso.getFileEntryIdInvio()); + avviso = updateAvvisoProtocollo(avviso.getAvvisoId(), protocollo); + } + return avviso; + } else { + throw new PortalException("Firma simulata non permessa"); + } + } + @SuppressWarnings("unchecked") @Override public List protocolliSearch(String dataDa, String dataA, String numeroProtocollo, int start, int end) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java index 262902ee..84187d6d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java @@ -11,15 +11,24 @@ package it.tref.liferay.portos.bo.service.impl; import it.tref.liferay.portos.bo.NoSuchConfigurazioneException; import it.tref.liferay.portos.bo.model.Configurazione; import it.tref.liferay.portos.bo.service.base.ConfigurazioneLocalServiceBaseImpl; +import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; import java.util.Date; +import java.util.List; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.json.JSONDeserializer; +import com.liferay.portal.kernel.json.JSONFactoryUtil; +import com.liferay.portal.kernel.json.JSONSerializer; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.util.PropsUtil; import com.liferay.portal.kernel.util.StringPool; +import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; +import com.liferay.portal.service.UserLocalServiceUtil; /** * The implementation of the configurazione local service. @@ -40,8 +49,18 @@ public class ConfigurazioneLocalServiceImpl extends ConfigurazioneLocalServiceBa * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link * it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil} to access the configurazione local service. */ + private static final JSONDeserializer> DESERIALIZER = JSONFactoryUtil.createJSONDeserializer(); + private static final JSONSerializer SERIALIZER = JSONFactoryUtil.createJSONSerializer().exclude("*.class"); + private static final Log _log = LogFactoryUtil.getLog(ConfigurazioneLocalServiceImpl.class); + @Override + public List findByC_ChiaveList(long companyId, String chiave) throws SystemException { + + Configurazione configurazione = configurazionePersistence.fetchByC_Chiave(companyId, chiave); + return DESERIALIZER.deserialize(configurazione.getValore()); + } + @Override public long findByC_ChiaveLong(long companyId, String chiave) throws SystemException { @@ -60,58 +79,88 @@ public class ConfigurazioneLocalServiceImpl extends ConfigurazioneLocalServiceBa public String findByC_ChiaveString(long companyId, String chiave) throws SystemException { Configurazione configurazione = configurazionePersistence.fetchByC_Chiave(companyId, chiave); - if (configurazione == null) { - return StringPool.BLANK; - } else if (configurazione.getValore() == null) { + if ((configurazione == null) || (configurazione.getValore() == null)) { return StringPool.BLANK; } return configurazione.getValore(); } @Override - public Configurazione storeConfig(String chiave, String valore, ServiceContext serviceContext) - throws SystemException, PortalException { + public long getAndIncrement(long companyId, String chiave) throws SystemException { - Configurazione configurazione = null; - try { - configurazione = configurazionePersistence.findByC_Chiave(serviceContext.getCompanyId(), chiave); - } catch (NoSuchConfigurazioneException e) {} - if (configurazione == null) { - configurazione = createConfigurazione(counterLocalService.increment(Configurazione.class.getName())); - configurazione.setChiave(chiave); - configurazione.setCompanyId(serviceContext.getCompanyId()); - configurazione.setCreateDate(new Date()); - configurazione.setGroupId(serviceContext.getScopeGroupId()); - configurazione.setUserId(serviceContext.getUserId()); - configurazione.setUserName(userLocalService.getUser(serviceContext.getUserId()).getFullName()); + synchronized (Configurazione.class) { + Configurazione configurazione = null; + long current = 1L; + try { + configurazione = configurazionePersistence.findByC_Chiave(companyId, chiave); + current = Long.parseLong(configurazione.getValore()); + } catch (NoSuchConfigurazioneException e) { + configurazione = createConfigurazione(counterLocalService.increment(Configurazione.class.getName())); + configurazione.setChiave(chiave); + configurazione.setCompanyId(companyId); + configurazione.setCreateDate(new Date()); + configurazione.setGroupId(-1L); + configurazione.setUserId(0L); + } catch (NumberFormatException e) { + _log.error("error", e); + throw new SystemException("Errore imprevisto", e); + } + configurazione.setValore(String.valueOf((current + 1))); + updateConfigurazione(configurazione); + return current; } - configurazione.setValore(valore); - return configurazioneLocalService.updateConfigurazione(configurazione); } @Override - public long getAndIncrement(long companyId, String chiave) throws SystemException { + public boolean isDeveloper(long userId) throws SystemException, PortalException { - try { - Configurazione configurazione = configurazionePersistence.findByC_Chiave(companyId, chiave); - long current = Long.parseLong(configurazione.getValore()); - configurazione.setValore(String.valueOf((current + 1))); - configurazioneLocalService.updateConfigurazione(configurazione); - return current; - } catch (NoSuchConfigurazioneException e) { - Configurazione configurazione = createConfigurazione(counterLocalService.increment(Configurazione.class - .getName())); - configurazione.setChiave(chiave); - configurazione.setCompanyId(companyId); - configurazione.setCreateDate(new Date()); - configurazione.setGroupId(-1); - configurazione.setUserId(0L); - configurazione.setValore("2"); - configurazioneLocalService.updateConfigurazione(configurazione); - return 1L; - } catch (NumberFormatException e) { - _log.error("error", e); - throw new SystemException("Errore imprevisto", e); + return isDeveloper(UserLocalServiceUtil.getUser(userId)); + } + + @Override + public boolean isDeveloper(User user) throws SystemException { + + return !isProduction() + && configurazioneLocalService.findByC_ChiaveList(user.getCompanyId(), + ConfigurazioneConstants.SVILUPPATORI).contains(user.getScreenName()); + } + + @Override + public boolean isProduction() { + + return Validator.isNull(PropsUtil.get("mwg.test.display")); + } + + @Override + public Configurazione storeConfig(String chiave, List valori, ServiceContext serviceContext) + throws SystemException, PortalException { + + String valore = SERIALIZER.serializeDeep(valori); + return storeConfig(chiave, valore, serviceContext); + } + + @Override + public Configurazione storeConfig(String chiave, String valore, ServiceContext serviceContext) + throws SystemException, PortalException { + + synchronized (Configurazione.class) { + Date now = new Date(); + Configurazione configurazione = null; + try { + configurazione = configurazionePersistence.findByC_Chiave(serviceContext.getCompanyId(), chiave); + } catch (NoSuchConfigurazioneException e) {} + if (configurazione == null) { + configurazione = createConfigurazione(counterLocalService.increment(Configurazione.class.getName())); + configurazione.setChiave(chiave); + configurazione.setCompanyId(serviceContext.getCompanyId()); + configurazione.setCreateDate(now); + configurazione.setGroupId(serviceContext.getScopeGroupId()); + configurazione.setUserId(serviceContext.getUserId()); + configurazione.setUserName(userLocalService.getUser(serviceContext.getUserId()).getFullName()); + } + configurazione.setValore(valore); + configurazione.setModifiedDate(now); + return updateConfigurazione(configurazione); } } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index f7aa6aa4..fa554cd7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=2741 - build.date=1637055953976 + build.number=2745 + build.date=1637921423767 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp index c10cadcf..a0a446b9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp @@ -62,7 +62,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar deleted file mode 100644 index ef846d8c..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ConfigurazioneConstants.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ConfigurazioneConstants.java index 9f0d3ea7..c0f72efb 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ConfigurazioneConstants.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ConfigurazioneConstants.java @@ -3,9 +3,7 @@ package it.tref.liferay.portos.bo.shared.util; public class ConfigurazioneConstants { public static final String TEMPLATE_FOLDER_ID = "conf.geniocivile.template.folder.id"; - public static final String ATTACHMENT_FOLDER_ID = "conf.geniocivile.attachment.folder.id"; - public static final String MANUAL_AVVISO_FOLDER_ID = "conf.geniocivile.avviso.folder.id.manual"; public static final String DIGITAL_SIGNATURE_SERVICE_ADDRESS_SIGN = "conf.geniocivile.digitalSignature.serviceAddressSign"; @@ -44,4 +42,5 @@ public class ConfigurazioneConstants { public static final String MAPPE_URL_IFRAME_RICERCA = "conf.sismica.mappe.iframe.url.ricerca"; public static final String MAPPE_SHARED_SECRET = "conf.sismica.mappe.secret"; -} \ No newline at end of file + public static final String SVILUPPATORI = "conf.sismica.sviluppo.sviluppatori"; +} diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar deleted file mode 100644 index ef846d8c..00000000 Binary files a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and /dev/null differ