Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Mina Ruggiero
2024-09-17 15:58:46 +02:00
parent 3647fb995d 441804f254
commit 8e862e3e41
1 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
ems-engine/src/main/java/it/integry/ems/system/controller/SystemController.java
View File

@@ -52,6 +52,7 @@ import net.schmizz.sshj.sftp.SFTPClient;
import net.schmizz.sshj.transport.verification.PromiscuousVerifier;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.text.WordUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -736,9 +737,12 @@ public class SystemController {
entityProcessor.processEntity(stbActivity, multiDBTransactionManager);
// se ok
String emailTo = "";
if (!UtilityString.isNullOrEmpty(emailPersRif)) {
String ccn = "", emailAssegnatoA;
emailTo = emailPersRif;
}
List<String> listEmailCcn= new ArrayList<>();
if (!activity.getUserCreator().equals(activity.getUserName())) {
// SE SONO DIVERSI (E NON E' "CC") MANDA UN EMAIL AD
// "ASSEGNATO A"
@@ -748,15 +752,33 @@ public class SystemController {
" WHERE jrl_flav_users.cod_jflav = " + UtilityDB.valueToString(activity.getUserName()) + " AND " +
"jrl_flav_users.flag_jflav_default = 'S'";
emailAssegnatoA = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), query);
String emailAssegnatoA = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), query);
if (!UtilityString.isNullOrEmpty(emailAssegnatoA)) {
ccn = emailAssegnatoA;
if (UtilityString.isNullOrEmpty(emailTo))
emailTo = emailAssegnatoA;
else
listEmailCcn.add( emailAssegnatoA );
}
}
notifica(stbActivity.getActivityId(), personaRif, emailPersRif, activity.getUserCreator(), ccn, notificationType, null, multiDBTransactionManager);
}
String query =
Query.format(
"select stb_user.e_mail\n" +
"from jtb_comt \n" +
"inner join jrl_flav_users on jtb_comt.cod_jflav_tec = jrl_flav_users.cod_jflav and jrl_flav_users.flag_jflav_default = 's'\n" +
"inner join stb_user on jrl_flav_users.user_name =stb_user.user_name "+
"where cod_jcom = %S ", activity.getCodJcom());
String emailResponsabile = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), query);
if (!UtilityString.isNullOrEmpty(emailResponsabile) && !listEmailCcn.contains(emailResponsabile))
listEmailCcn.add( emailResponsabile );
if (!UtilityString.isNullOrEmpty(emailTo)) {
String ccn = StringUtils.join(listEmailCcn, ";");
notifica(stbActivity.getActivityId(), personaRif, emailPersRif, activity.getUserCreator(), ccn, notificationType, null, multiDBTransactionManager);
}
activity.setActivityId(stbActivity.getActivityId());
return ServiceRestResponse.createPositiveResponse(activity);
@@ -910,15 +932,11 @@ public class SystemController {
* Chiusura, 'F' - Note feedback, 'S' - Sollecito
*/
String htmlNotifyMail, subject, codAnag = "", includeFb = "", activityResultId, emailUtente = "", emailTo = "", query;
String htmlNotifyMail, subject, includeFb = "", emailTo = "", query, emailUtente = "";
String webUrl = "https://www.studioml.it/integry/";
String taskUrl = "https://task.studioml.it/";
String emailHelpdesk = "helpdesk@integry.it";
PreparedStatement info;
ResultSet res;
/** VALUTARE SE IL SEGUENTE CONTROLLO LO SI DEBBA FARE IN WINACT: */
// CONTROLLO PER INSERIRE LINK FEEDBACK DEL CLIENTE SE ...
includeFb = "";
@@ -929,16 +947,11 @@ public class SystemController {
// ... OPPURE AGG. A STATO "RISCONTRO CLIE."
query = " SELECT activity_result_id FROM stb_activity WHERE activity_id = "
+ UtilityDB.valueToString(activityID);
info = multiDBTransactionManager.prepareStatement(query);
res = info.executeQuery();
if (res.next()) {
activityResultId = res.getString(1);
if ("RISCONTRO CLIE.".equals(activityResultId)) {
String activityResultId = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), query);
if (UtilityString.equalsIgnoreCase(activityResultId, "RISCONTRO CLIE.")) {
includeFb = "&linkfb=1";
}
}
res.close();
info.close();
} else if ("F".equals(azione) || "S".equals(azione)) {
// RECUPERA EMAIL UTENTE PER INVIO NOTIFICA FEEDBACK NEGATIVO O
@@ -946,16 +959,12 @@ public class SystemController {
query = "SELECT e_mail " +
"FROM stb_activity INNER JOIN jtb_flav ON cod_jflav = user_name " +
"WHERE activity_id = " + UtilityDB.valueToString(activityID);
info = multiDBTransactionManager.prepareStatement(query);
res = info.executeQuery();
if (res.next()) {
emailUtente = res.getString(1);
}
emailUtente = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), query);
if (emailUtente.length() == 0) {
emailUtente = emailHelpdesk;
}
res.close();
info.close();
}
URL url = new URL(webUrl + "mail_models/ticket_mail.php?act=" + azione + includeFb);
@@ -992,7 +1001,7 @@ public class SystemController {
}
if (!emailTo.isEmpty()) {
mailService.sendMailPrimary("noreply@integry.it", "Integry Ticketing", emailTo, null, ccn, subject, htmlNotifyMail, true, true, null, null, null);
mailService.sendMailPrimary("noreply@integry.it", "Integry Ticketing", emailTo, "", ccn, subject, htmlNotifyMail, true, true, null, null, null);
StbActivity activity = new StbActivity();
activity.setOperation(OperationType.NO_OP);
@@ -1014,13 +1023,7 @@ public class SystemController {
+ " vtb_clie_pers_rif.e_mail IS NULL " + "WHERE stb_activity.activity_id = "
+ UtilityDB.valueToString(activityID) + " AND "
+ " vtb_clie_pers_rif.e_mail IS NULL";
info = multiDBTransactionManager.prepareStatement(query);
res = info.executeQuery();
if (res.next())
codAnag = res.getString(1);
res.close();
info.close();
String codAnag = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), query);
String domainIntegry = "integry.it";
if (!UtilityString.isNullOrEmpty(codAnag) && !UtilityString.isNullOrEmpty(personaRif)