From d5a9070a7f4b00ed074ea6f24e92c65689638861 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Fri, 1 Mar 2024 09:19:48 +0100 Subject: [PATCH] Aggiunto servizio setActivitySolved --- .../ems_model/config/EmsRestConstants.java | 1 + .../controller/ActivityController.java | 21 +++- .../integry/ems/activity/dto/ActivityDTO.java | 12 ++ .../ems/activity/service/ActivityService.java | 109 ++++++++++-------- .../controller/GrigliaAcquistoController.java | 2 + .../service/GrigliaAcquistoService.java | 2 + 6 files changed, 92 insertions(+), 55 deletions(-) create mode 100644 ems-engine/src/main/java/it/integry/ems/retail/controller/GrigliaAcquistoController.java create mode 100644 ems-engine/src/main/java/it/integry/ems/retail/service/GrigliaAcquistoService.java diff --git a/ems-core/src/main/java/it/integry/ems_model/config/EmsRestConstants.java b/ems-core/src/main/java/it/integry/ems_model/config/EmsRestConstants.java index 48a44004f4..f3993ce866 100644 --- a/ems-core/src/main/java/it/integry/ems_model/config/EmsRestConstants.java +++ b/ems-core/src/main/java/it/integry/ems_model/config/EmsRestConstants.java @@ -291,6 +291,7 @@ public class EmsRestConstants { public static final String PATH_DELETE_ACTIVITY = PATH + "activity/delete"; public static final String PATH_GET_COMMESSA_FROM_USERNAME = PATH + "activity/getCommessaFromUsername"; public static final String PATH_GET_ACTIVITY_HISTORY = PATH + "activity/getActivityHistory"; + public static final String PATH_SET_ACTIVITY_SOLVED = PATH + "activity/activitySolved"; //SteUP public static final String PATH_LOGIN_STEUP = PATH + "login"; public static final String PATH_LOGINAZIENDA_STEUP = PATH + "loginAzienda"; diff --git a/ems-engine/src/main/java/it/integry/ems/activity/controller/ActivityController.java b/ems-engine/src/main/java/it/integry/ems/activity/controller/ActivityController.java index 9cb8b52b26..d652e5cb1a 100644 --- a/ems-engine/src/main/java/it/integry/ems/activity/controller/ActivityController.java +++ b/ems-engine/src/main/java/it/integry/ems/activity/controller/ActivityController.java @@ -107,7 +107,7 @@ public class ActivityController { @RequestParam(CommonConstants.PROFILE_DB) String configuration, @RequestParam String activityId, @RequestParam String codJcom, - @RequestParam (required = false) String parentActivityId) throws Exception { + @RequestParam(required = false) String parentActivityId) throws Exception { return ServiceRestResponse.createPositiveResponse(activityService.changeCodJcom(activityId, codJcom, parentActivityId)); } @@ -291,9 +291,9 @@ public class ActivityController { @PreAuthorize("isAuthenticated()") @RequestMapping(value = EmsRestConstants.PATH_DELETE_ACTIVITY, method = RequestMethod.GET) public ServiceRestResponse deleteActivity(HttpServletRequest request, - @RequestParam(CommonConstants.PROFILE_DB) String config, - @RequestParam(value = "activityId") String activityId, - @RequestParam(value = "deleteSubActivity") boolean deleteSubActivity) throws Exception { + @RequestParam(CommonConstants.PROFILE_DB) String config, + @RequestParam(value = "activityId") String activityId, + @RequestParam(value = "deleteSubActivity") boolean deleteSubActivity) throws Exception { return ServiceRestResponse.createPositiveResponse(activityService.deleteActivity(activityId, deleteSubActivity)); @@ -302,8 +302,8 @@ public class ActivityController { @PreAuthorize("isAuthenticated()") @RequestMapping(value = EmsRestConstants.PATH_GET_COMMESSA_FROM_USERNAME, method = RequestMethod.GET) public ServiceRestResponse getCommessaFromUsername(HttpServletRequest request, - @RequestParam(CommonConstants.PROFILE_DB) String config, - @RequestParam(value = "username") String username) throws Exception { + @RequestParam(CommonConstants.PROFILE_DB) String config, + @RequestParam(value = "username") String username) throws Exception { return ServiceRestResponse.createPositiveResponse(activityService.getCommessaFromUsername(username)); @@ -317,4 +317,13 @@ public class ActivityController { return ServiceRestResponse.createPositiveResponse(activityService.getActivityHistory(activityId)); } + + @PreAuthorize("isAuthenticated()") + @RequestMapping(value = EmsRestConstants.PATH_SET_ACTIVITY_SOLVED, method = RequestMethod.GET) + public ServiceRestResponse activitySolved(HttpServletRequest request, + @RequestParam() String activityId) throws Exception { + + activityService.setActivitySolved(activityId); + return ServiceRestResponse.createPositiveResponse(); + } } \ No newline at end of file diff --git a/ems-engine/src/main/java/it/integry/ems/activity/dto/ActivityDTO.java b/ems-engine/src/main/java/it/integry/ems/activity/dto/ActivityDTO.java index 2d193b3203..2365b23cfa 100644 --- a/ems-engine/src/main/java/it/integry/ems/activity/dto/ActivityDTO.java +++ b/ems-engine/src/main/java/it/integry/ems/activity/dto/ActivityDTO.java @@ -145,6 +145,9 @@ public class ActivityDTO { @SqlField(value = "descrizione_sottoattivita") private String descrizioneSottoattivita; + @SqlField(value = "flag_risolto") + private String flagRisolto; + public StbActivity getStbActivity() { return stbActivity; @@ -602,6 +605,15 @@ public class ActivityDTO { return this; } + public String getFlagRisolto() { + return flagRisolto; + } + + public ActivityDTO setFlagRisolto(String flagRisolto) { + this.flagRisolto = flagRisolto; + return this; + } + public static class WorkedHours { @SqlField("parent_activity_id") private String parentActivityId; diff --git a/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java b/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java index 0099889f03..425b7db7ce 100644 --- a/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java +++ b/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java @@ -395,7 +395,7 @@ public class ActivityService { .setDataChk(new Date()); stbActivityCheck.setOperation(OperationType.INSERT); - return entityProcessor.processEntity(stbActivityCheck, multiDBTransactionManager); + return entityProcessor.processEntity(stbActivityCheck, multiDBTransactionManager); } @@ -404,17 +404,17 @@ public class ActivityService { StbActivity stbActivity = economyStatusDTO.getStbActivity(); stbActivity.setOperation(OperationType.UPDATE); entityBaseList.add(stbActivity); - String codjfas ="C02"; + String codjfas = "C02"; if (economyStatusDTO.getDaPagare()) - codjfas = "C01"; + codjfas = "C01"; String sql = - Query.format( - "SELECT activity_id, %s as cod_jfas FROM stb_activity WHERE parent_activity_id = %s AND cod_jfas <> %s\n"+ - " AND NOT EXISTS(SELECT * from stb_activity_check WHERE stb_activity.cod_jcom = stb_activity_check.cod_jcom AND stb_activity.effective_date between stb_activity_check.data_iniz AND stb_activity_check.data_fine )", - codjfas, - stbActivity.getActivityId(), - codjfas); + Query.format( + "SELECT activity_id, %s as cod_jfas FROM stb_activity WHERE parent_activity_id = %s AND cod_jfas <> %s\n" + + " AND NOT EXISTS(SELECT * from stb_activity_check WHERE stb_activity.cod_jcom = stb_activity_check.cod_jcom AND stb_activity.effective_date between stb_activity_check.data_iniz AND stb_activity_check.data_fine )", + codjfas, + stbActivity.getActivityId(), + codjfas); List sottoAttivita = new ResultSetMapper().mapQuerySetToList(multiDBTransactionManager.getPrimaryConnection(), sql, StbActivity.class, OperationType.UPDATE); if (!sottoAttivita.isEmpty()) @@ -430,13 +430,13 @@ public class ActivityService { public ActivityTaskDTO insSubactivity(StbActivity stbActivity) throws Exception { String sql = Query.format( - "SELECT activity_id " + - " FROM stb_activity " + - " WHERE stb_activity.parent_activity_id = %s AND " + - "stb_activity.user_name = %s AND " + - "stb_activity.effective_date is null ", - stbActivity.getParentActivityId(), - stbActivity.getUserName()); + "SELECT activity_id " + + " FROM stb_activity " + + " WHERE stb_activity.parent_activity_id = %s AND " + + "stb_activity.user_name = %s AND " + + "stb_activity.effective_date is null ", + stbActivity.getParentActivityId(), + stbActivity.getUserName()); String activityId = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql); @@ -447,7 +447,7 @@ public class ActivityService { stbActivity.setEffectiveEndtime(endTime); if (UtilityString.isNullOrEmpty(activityId)) { stbActivity.setOperation(OperationType.INSERT); - if ( UtilityString.isNullOrEmpty(stbActivity.getActivityDescription())) { + if (UtilityString.isNullOrEmpty(stbActivity.getActivityDescription())) { sql = Query.format("SELECT activity_description FROM stb_activity WHERE stb_activity.activity_id = %s", stbActivity.getParentActivityId()); String activityDescr = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql); stbActivity.setActivityDescription(activityDescr); @@ -588,7 +588,7 @@ public class ActivityService { } String description = planActivityDTO.getDescription(); - if (description == null || description.isEmpty()){ + if (description == null || description.isEmpty()) { description = parentStbActivity.getActivityDescription(); } @@ -683,7 +683,6 @@ public class ActivityService { UtilityEntity.throwEntitiesException(entityList); - EntityBase entityBase = Stream.of(entityList) .filter(e -> e instanceof StbActivity && ((StbActivity) e).getCodJcom().equalsIgnoreCase(codJcom)) .findFirst().orElse(null); @@ -699,7 +698,7 @@ public class ActivityService { stbActivity .setCodJcom(codJcom) .setActivityId(activityId) - .setParentActivityId(parentActivityId ==null?EmsRestConstants.NULL: parentActivityId) + .setParentActivityId(parentActivityId == null ? EmsRestConstants.NULL : parentActivityId) .setEstimatedTime(EmsRestConstants.DATE_NULL) .setEstimatedDate(EmsRestConstants.DATE_NULL) .setEstimatedEnddate(EmsRestConstants.DATE_NULL) @@ -791,7 +790,7 @@ public class ActivityService { " INNER JOIN stb_user ON stb_activity.user_name = stb_user.user_name\n" + " LEFT OUTER JOIN jtb_rlavr ON stb_activity.activity_id = jtb_rlavr.activity_id\n" + " WHERE stb_activity.flag_tipologia = 'A'\n" + - (isTable?"":" AND stb_activity.user_name = '" + username + "'") + + (isTable ? "" : " AND stb_activity.user_name = '" + username + "'") + " GROUP BY stb_activity.parent_activity_id),\n" + " processi AS (SELECT stb_activity.cod_jcom,\n" + " stb_activity.user_name,\n" + @@ -802,6 +801,7 @@ public class ActivityService { " stb_activity.estimated_endtime,\n" + " stb_activity.effective_time,\n" + " stb_activity.effective_endtime,\n" + + " stb_activity.flag_risolto,\n" + " stb_activity.estimated_hours,\n" + " stb_activity.activity_result_id AS 'esito',\n" + " stb_activity.result_description AS 'descr_esito',\n" + @@ -836,13 +836,13 @@ public class ActivityService { " DENSE_RANK() OVER (ORDER BY parent.project_description, parent.activity_description) AS 'id_processo',\n" + " gtb_anag.rag_soc"; - if (daInstallare){ - sql += ", lastUpdt.data \n"; - } else { - sql += ", null AS 'data' \n"; - } + if (daInstallare) { + sql += ", lastUpdt.data \n"; + } else { + sql += ", null AS 'data' \n"; + } - sql += " FROM stb_activity\n" + + sql += " FROM stb_activity\n" + " INNER JOIN stb_user ON stb_activity.user_name = stb_user.user_name\n" + " INNER JOIN (SELECT *\n" + " FROM jtb_comt\n" + @@ -865,11 +865,11 @@ public class ActivityService { " ON stb_activity.activity_result_id = stb_activity_result.activity_result_id\n" + " LEFT OUTER JOIN integry_tag ON stb_activity.activity_id = integry_tag.activity_id\n"; - if (daInstallare){ - sql += " LEFT OUTER JOIN integry_last_upd_clie lastUpdt ON stb_activity.cod_anag = lastUpdt.cod_anag\n"; - } + if (daInstallare) { + sql += " LEFT OUTER JOIN integry_last_upd_clie lastUpdt ON stb_activity.cod_anag = lastUpdt.cod_anag\n"; + } - sql += " WHERE stb_activity.flag_tipologia = 'P'\n" + + sql += " WHERE stb_activity.flag_tipologia = 'P'\n" + " AND NOT EXISTS(SELECT *\n" + " FROM escludi_commesse\n" + " WHERE stb_activity.cod_jcom = escludi_commesse.cod_jcom)\n" + @@ -929,6 +929,7 @@ public class ActivityService { " sottoattivita.next_activity_date AS 'data_prossima_attivita',\n" + " processi.rag_soc,\n" + " processi.data AS 'ultimo_aggiornamento',\n" + + " processi.flag_risolto,\n" + " CASE\n" + " WHEN sottoattivita.activity_description <> processi.activity_description\n" + " THEN sottoattivita.activity_description\n" + @@ -937,13 +938,13 @@ public class ActivityService { "FROM processi\n" + " LEFT OUTER JOIN sottoattivita ON processi.activity_id = sottoattivita.parent_activity_id\n"; - if (!isTable){ + if (!isTable) { sql += " where processi.effective_endtime IS NULL"; - if (daInstallare){ + if (daInstallare) { sql += " AND esito = 'DA INSTALLARE' AND cod_jcom not like 'INTEGRY%'"; } - }else if (activityId != null){ + } else if (activityId != null) { sql += " where processi.activity_id = " + UtilityDB.valueToString(activityId); } @@ -961,7 +962,7 @@ public class ActivityService { List activityResponseDtoWorkedHours = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, ActivityDTO.WorkedHours.class); - if(activityResponseDtoWorkedHours != null){ + if (activityResponseDtoWorkedHours != null) { final HashMap> subActivityList = activityResponseDtoWorkedHours.stream() .collect(Collectors.groupingBy( ActivityDTO.WorkedHours::getParentActivityId, @@ -1009,7 +1010,7 @@ public class ActivityService { if (activityId != null && !activityId.isEmpty()) { conditions.add("stb_activity.parent_activity_id = " + UtilityDB.valueToString(activityId)); - }else{ + } else { conditions.add("stb_activity.user_name LIKE " + UtilityDB.valueToString(username)); } @@ -1049,6 +1050,7 @@ public class ActivityService { return UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, ActivityTypeDTO.class); } + public List getActivityTypeTask(String username) throws Exception { String sql = "SELECT srl_activity_type.activity_type_id,\n" + " srl_activity_type.activity_type_id_next,\n" + @@ -1102,7 +1104,7 @@ public class ActivityService { return UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, ActivityCommessaDTO.class); } - public void insertOrUpdateActivity(ActivityDTO activity) throws Exception{ + public void insertOrUpdateActivity(ActivityDTO activity) throws Exception { StbActivity stbActivity = new StbActivity(); stbActivity.setOperation(OperationType.INSERT_OR_UPDATE); @@ -1125,7 +1127,7 @@ public class ActivityService { entityProcessor.processEntity(stbActivity, true, multiDBTransactionManager); } - public void updateActivityTask(ActivityTaskDTO activity) throws Exception{ + public void updateActivityTask(ActivityTaskDTO activity) throws Exception { StbActivity stbActivity = new StbActivity(); stbActivity.setOperation(OperationType.UPDATE); @@ -1149,7 +1151,7 @@ public class ActivityService { entityProcessor.processEntity(stbActivity, true, multiDBTransactionManager); } - public List getAllActivitiesByActiveCustomers() throws Exception{ + public List getAllActivitiesByActiveCustomers() throws Exception { String sql = "SELECT DISTINCT stb_activity.activity_id as Id_Attivita,\n" + " stb_activity.data_ins_act as data_insermento,\n" + " stb_activity.activity_type_id as tipo_attivita,\n" + @@ -1177,7 +1179,7 @@ public class ActivityService { return UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, ActivityDTO.class); } - public List getPersoneRif() throws Exception{ + public List getPersoneRif() throws Exception { String sql = "SELECT DISTINCT vtb_clie_pers_rif.persona_rif, jtb_comt.cod_jcom, e_mail, vtb_clie_pers_rif.cod_anag, vtb_clie_pers_rif.persona_rif AS persona_cod_jcom\n" + "FROM vtb_clie_pers_rif, jtb_comt, vtb_clie\n" + "WHERE vtb_clie_pers_rif.cod_anag = vtb_clie.cod_anag AND\n" + @@ -1189,10 +1191,10 @@ public class ActivityService { return UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, PersoneRifDTO.class); } - public List getTreeView(String codJcom, String activityId, boolean loadTasks) throws Exception{ + public List getTreeView(String codJcom, String activityId, boolean loadTasks) throws Exception { String sql; - if(activityId == null){ + if (activityId == null) { sql = "SELECT t.livello,\n" + " t.activity_id,\n" + " stb_activity.activity_description,\n" + @@ -1216,7 +1218,7 @@ public class ActivityService { "-- AND tipo_attivita.flag_tipologia = srl_activity_type.flag_tipologia)\n" + " AND srl_activity_type.flag_tipologia = stb_activity.flag_tipologia\n" + " AND srl_activity_type.activity_type_id = stb_activity.activity_type_id)"; - }else{ + } else { sql = "select activity_id, activity_description, parent_activity_id, stb_activity.activity_type_id\n" + "from stb_activity where parent_activity_id = " + UtilityDB.valueToString(activityId) + " and effective_enddate is null"; @@ -1225,7 +1227,7 @@ public class ActivityService { return UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, TreeViewDTO.class); } - public List getActivityCalendar(String username, String startDate, String endDate) throws Exception{ + public List getActivityCalendar(String username, String startDate, String endDate) throws Exception { String sql = "WITH sottoattivita AS (SELECT stb_activity.activity_id, stb_activity.activity_type_id\n" + " FROM stb_activity\n" + " INNER JOIN stb_user ON stb_activity.user_name = stb_user.user_name\n" + @@ -1273,11 +1275,11 @@ public class ActivityService { activity.setActivityId(activityId); activity.setOperation(OperationType.DELETE); - if (deleteSubActivity){ + if (deleteSubActivity) { List stbActivityList = new ArrayList<>(); List activityTasks = getActivityTasks(activityId, null, null, null); - for (ActivityTaskDTO activityTask : activityTasks){ + for (ActivityTaskDTO activityTask : activityTasks) { StbActivity stbActivity = new StbActivity(); stbActivity.setActivityId(activityTask.getActivityId()); stbActivity.setOperation(OperationType.DELETE); @@ -1305,7 +1307,7 @@ public class ActivityService { return UtilityDB.executeSimpleQueryOnlyFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql); } - public List getActivityHistory(String activityId) throws Exception{ + public List getActivityHistory(String activityId) throws Exception { MultiDBTransactionManager m = new MultiDBTransactionManager(); DataSource ds = new DataSource(); @@ -1314,7 +1316,7 @@ public class ActivityService { List returnList = new ArrayList<>(); - try{ + try { m.addConnection(historyProfileDb, ds); m.setPrimaryDs(historyProfileDb); @@ -1340,11 +1342,20 @@ public class ActivityService { "AND log_created_operation LIKE '%UPDATE'"; returnList = UtilityDB.executeSimpleQueryDTO(m.getPrimaryConnection(), sql, ActivityHistoryDTO.class); - }catch (Exception e){ + } catch (Exception e) { m.rollbackAll(); } m.closeAll(); return returnList; } + + public void setActivitySolved(String activityId) throws Exception { + StbActivity stbActivity = new StbActivity(); + stbActivity.setActivityId(activityId) + .setFlagRisolto("S") + .setOperation(OperationType.UPDATE); + + entityProcessor.processEntity(stbActivity, true, multiDBTransactionManager); + } } \ No newline at end of file diff --git a/ems-engine/src/main/java/it/integry/ems/retail/controller/GrigliaAcquistoController.java b/ems-engine/src/main/java/it/integry/ems/retail/controller/GrigliaAcquistoController.java new file mode 100644 index 0000000000..d7b7c2176c --- /dev/null +++ b/ems-engine/src/main/java/it/integry/ems/retail/controller/GrigliaAcquistoController.java @@ -0,0 +1,2 @@ +package it.integry.ems.retail.controller;public class GrigliaAcquistoController { +} diff --git a/ems-engine/src/main/java/it/integry/ems/retail/service/GrigliaAcquistoService.java b/ems-engine/src/main/java/it/integry/ems/retail/service/GrigliaAcquistoService.java new file mode 100644 index 0000000000..a84477f7a7 --- /dev/null +++ b/ems-engine/src/main/java/it/integry/ems/retail/service/GrigliaAcquistoService.java @@ -0,0 +1,2 @@ +package it.integry.ems.retail.service;public class GrigliaAcquistoService { +}