diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/.classpath index b05b6387..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/.classpath @@ -1,7 +1,6 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/commons-logging.jar deleted file mode 100644 index 8758a96b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/commons-logging.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/jstl-api.jar b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/jstl-api.jar deleted file mode 100644 index 80a5737f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/jstl-api.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/jstl-impl.jar b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/jstl-impl.jar deleted file mode 100644 index e5a9342f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/jstl-impl.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/log4j.jar deleted file mode 100644 index 068867eb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/log4j.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/schedulatore-portos-pratiche-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/schedulatore-portos-pratiche-portlet-service.jar index 6b35e030..f125f871 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/schedulatore-portos-pratiche-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/schedulatore-portos-pratiche-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/util-bridges.jar deleted file mode 100644 index 7d7435fe..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/util-bridges.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/util-taglib.jar deleted file mode 100644 index 6d182ade..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/lib/util-taglib.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/service.xml index 8a3a5799..ab628032 100644 --- a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/service.xml @@ -11,7 +11,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/META-INF/ext-spring.xml b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/META-INF/ext-spring.xml index def9f57a..cd8abd03 100644 --- a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/META-INF/ext-spring.xml +++ b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/META-INF/ext-spring.xml @@ -25,7 +25,7 @@ class="org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy"> - + diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml index 85fea60f..4d9e6dc2 100644 --- a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml +++ b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml @@ -30,7 +30,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml index 1491564f..baf2e8f6 100644 --- a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml +++ b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml @@ -59,7 +59,7 @@ - + @@ -76,7 +76,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/integratore/IntegratoreSchedulato.java b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/integratore/IntegratoreSchedulato.java index 518a4ac2..5a96fc6f 100644 --- a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/integratore/IntegratoreSchedulato.java +++ b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/integratore/IntegratoreSchedulato.java @@ -13,17 +13,12 @@ import com.liferay.portal.service.CompanyLocalServiceUtil; import com.liferay.portal.service.RoleLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserLocalServiceUtil; -import com.liferay.portal.util.PortalUtil; - import it.tref.liferay.portos.bo.model.Comune; -import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; -import it.tref.liferay.portos.bo.service.persistence.DettPraticaUtil; - import java.util.List; import portos.nextmind.model.ScheduledActions; @@ -61,7 +56,6 @@ public class IntegratoreSchedulato implements MessageListener { for (ScheduledActions scheduledActions : listSA) { Sportello sport = SportelloLocalServiceUtil.fetchSportello(scheduledActions.getShopId()); sport.getContext(); - sport.getIpaCode(); if (scheduledActions.getRequestAction() == 2){ Comune comune = ComuneLocalServiceUtil.findByC_CP( company.getCompanyId(), @@ -69,7 +63,10 @@ public class IntegratoreSchedulato implements MessageListener { long comuneId = comune.getComuneId(); Territorio territorio = TerritorioLocalServiceUtil.findByComuneId(comuneId, 0, 1).get(0); String tipoProcedura = sport.getProceedingType(); - User user = UserLocalServiceUtil.fetchUserByScreenName(company.getCompanyId(), sport.getDigitalHolderTaxCode()); + User user = UserLocalServiceUtil + .fetchUserByScreenName( + company.getCompanyId(), + sport.getDigitalHolderTaxCode()); if (user == null) { long userIdAdmin = UserLocalServiceUtil.getRoleUsers( RoleLocalServiceUtil.getRole(company.getCompanyId(), RoleConstants.ADMINISTRATOR).getRoleId()).get(0).getUserId(); @@ -90,6 +87,23 @@ public class IntegratoreSchedulato implements MessageListener { serviceContext.setUserId(user.getUserId()); IntPratica newIntestazione = IntPraticaLocalServiceUtil.addIntPratica( territorio.getTerritorioId(), tipoProcedura, new ServiceContext()); + ScheduledActionsLocalServiceUtil + .updateScheduledActions(scheduledActions) + .setIntPraticaId(newIntestazione.getIntPraticaId() + ); + Comune comuneDaAggiornare = ComuneLocalServiceUtil.updateComune(comune); + comuneDaAggiornare.setCodiceIstat(sport.getIpaCode()); + comuneDaAggiornare.setCodiceBelfiore(sport.getInstanceId()); + comuneDaAggiornare.setCodiceIstat(sport.getCadastralCode()); + IntPratica intestazioneDaAggiornare = IntPraticaLocalServiceUtil + .updateIntPratica(newIntestazione); + intestazioneDaAggiornare + .setNumeroProgetto(sport.getInstanceId()); + intestazioneDaAggiornare.setCreateDate(sport.getCreationDate()); + intestazioneDaAggiornare.setTipoProcedura(sport.getProceedingType()); + intestazioneDaAggiornare + .setCodiceFiscaleDelegatoCollaudo(sport.getDigitalHolderTaxCode()); + intestazioneDaAggiornare.setModifiedDate(sport.getLastUpdateDate()); } System.out.println(scheduledActions.getRequestAction()); System.out.println(sport.getUrl()); diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/portos/nextmind/model/impl/ScheduledActionsModelImpl.java b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/portos/nextmind/model/impl/ScheduledActionsModelImpl.java index 2f6992ba..4ef519b3 100644 --- a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/portos/nextmind/model/impl/ScheduledActionsModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/portos/nextmind/model/impl/ScheduledActionsModelImpl.java @@ -63,10 +63,10 @@ public class ScheduledActionsModelImpl extends BaseModelImpl { "headers", Types.VARCHAR }, { "error_log", Types.VARCHAR }, { "error_flag", Types.BOOLEAN }, - { "int_pratica_id", Types.BIGINT }, + { "intpraticaid", Types.BIGINT }, { "context", Types.VARCHAR } }; - public static final String TABLE_SQL_CREATE = "create table scheduled_actions (shop_id LONG not null primary key,request_action INTEGER,headers VARCHAR(75) null,error_log VARCHAR(75) null,error_flag BOOLEAN,int_pratica_id LONG,context VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table scheduled_actions (shop_id LONG not null primary key,request_action INTEGER,headers VARCHAR(75) null,error_log VARCHAR(75) null,error_flag BOOLEAN,intpraticaid LONG,context VARCHAR(75) null)"; public static final String TABLE_SQL_DROP = "drop table scheduled_actions"; public static final String ORDER_BY_JPQL = " ORDER BY scheduledActions.shopId ASC"; public static final String ORDER_BY_SQL = " ORDER BY scheduled_actions.shop_id ASC"; diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/portos/nextmind/model/impl/SportelloModelImpl.java b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/portos/nextmind/model/impl/SportelloModelImpl.java index 59b4e557..4c003963 100644 --- a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/portos/nextmind/model/impl/SportelloModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/portos/nextmind/model/impl/SportelloModelImpl.java @@ -63,7 +63,7 @@ public class SportelloModelImpl extends BaseModelImpl { "application", Types.VARCHAR }, { "client_id", Types.VARCHAR }, { "context", Types.VARCHAR }, - { "instance_id", Types.VARCHAR }, + { "instanceid", Types.VARCHAR }, { "ipa_code", Types.VARCHAR }, { "proceeding_type", Types.VARCHAR }, { "url", Types.VARCHAR }, @@ -79,7 +79,7 @@ public class SportelloModelImpl extends BaseModelImpl { "last_update_date", Types.TIMESTAMP }, { "sent_to_portos_date", Types.TIMESTAMP } }; - public static final String TABLE_SQL_CREATE = "create table sportello (id LONG not null primary key,application VARCHAR(75) null,client_id VARCHAR(75) null,context VARCHAR(75) null,instance_id VARCHAR(75) null,ipa_code VARCHAR(75) null,proceeding_type VARCHAR(75) null,url VARCHAR(75) null,content_type VARCHAR(75) null,operation VARCHAR(75) null,cadastral_code VARCHAR(75) null,digital_holder_tax_code VARCHAR(75) null,name VARCHAR(75) null,surname VARCHAR(75) null,address VARCHAR(75) null,stato BOOLEAN,creation_date DATE null,last_update_date DATE null,sent_to_portos_date DATE null)"; + public static final String TABLE_SQL_CREATE = "create table sportello (id LONG not null primary key,application VARCHAR(75) null,client_id VARCHAR(75) null,context VARCHAR(75) null,instanceid VARCHAR(75) null,ipa_code VARCHAR(75) null,proceeding_type VARCHAR(75) null,url VARCHAR(75) null,content_type VARCHAR(75) null,operation VARCHAR(75) null,cadastral_code VARCHAR(75) null,digital_holder_tax_code VARCHAR(75) null,name VARCHAR(75) null,surname VARCHAR(75) null,address VARCHAR(75) null,stato BOOLEAN,creation_date DATE null,last_update_date DATE null,sent_to_portos_date DATE null)"; public static final String TABLE_SQL_DROP = "drop table sportello"; public static final String ORDER_BY_JPQL = " ORDER BY sportello.id ASC"; public static final String ORDER_BY_SQL = " ORDER BY sportello.id ASC"; diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/portos/nextmind/service/impl/ScheduledActionsLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/portos/nextmind/service/impl/ScheduledActionsLocalServiceImpl.java index aa22eab4..49ec7025 100644 --- a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/portos/nextmind/service/impl/ScheduledActionsLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/portos/nextmind/service/impl/ScheduledActionsLocalServiceImpl.java @@ -61,7 +61,7 @@ public class ScheduledActionsLocalServiceImpl @SuppressWarnings("unchecked") public List findAzioniDaSvolgere(String context,int start, int end) throws SystemException{ DynamicQuery dq = scheduledActionsLocalService.dynamicQuery(); - dq.add(RestrictionsFactoryUtil.eq("intPraticaId", 0)); + dq.add(RestrictionsFactoryUtil.eq("intPraticaId", 0L)); dq.add(RestrictionsFactoryUtil.eq("context", context)); return (List)scheduledActionsLocalService.dynamicQuery(dq,start,end); } diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/service.properties index 24cd4ab1..1eaa028d 100644 --- a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_ss - build.number=47 - build.date=1683728676774 + build.number=56 + build.date=1683794074173 build.auto.upgrade=true ##