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

Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2025-09-10 15:54:58 +02:00
parent 17b821157e c3e8ccf0c2
commit e799d0e577
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java
View File

@@ -1,6 +1,7 @@
package it.integry.ems.retail.service; package it.integry.ems.retail.service;
import com.annimon.stream.Stream; import com.annimon.stream.Stream;
import com.fasterxml.jackson.databind.ObjectMapper;
import it.integry.ems.exception.PrimaryDatabaseNotPresentException; import it.integry.ems.exception.PrimaryDatabaseNotPresentException;
import it.integry.ems.expansion.RunnableThrowable; import it.integry.ems.expansion.RunnableThrowable;
import it.integry.ems.javabeans.RequestDataDTO; import it.integry.ems.javabeans.RequestDataDTO;
@@ -10,7 +11,9 @@ import it.integry.ems.service.EntityProcessor;
import it.integry.ems.service.MailService; import it.integry.ems.service.MailService;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.utility.UtilityDebug; import it.integry.ems.utility.UtilityDebug;
import it.integry.ems.utility.UtilityDirs;
import it.integry.ems.utility.UtilityEntity; import it.integry.ems.utility.UtilityEntity;
import it.integry.ems.utility.UtilityFile;
import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.db.ResultSetMapper; import it.integry.ems_model.db.ResultSetMapper;
import it.integry.ems_model.entity.CarelliGiacenzaProg; import it.integry.ems_model.entity.CarelliGiacenzaProg;
@@ -27,9 +30,12 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.StringWriter;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.SQLException; import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -801,6 +807,15 @@ public class GiacenzaService {
} }
} }
if ( codMdep.equalsIgnoreCase("LA")) {
String pathFile = UtilityDirs.getEmsApiTempDirectoryPath() + File.separator + "Giacenza_" + codMdep + File.separator;
String fileName = codMdep + "_" + new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()) + ".json";
StringWriter writer = new StringWriter();
new ObjectMapper().writeValue(writer, listGiacenza);
String contentBody = writer.toString();
UtilityFile.saveFile(pathFile, fileName, contentBody);
}
return listGiacenza; return listGiacenza;
} }

2
ems-engine/src/main/java/it/integry/ems/system/service/SystemService.java
View File

@@ -350,7 +350,7 @@ public class SystemService {
} }
if (foundUser == null) { if (foundUser == null) {
logger.debug(String.format("Credenziali non valide utente: %s ( %s) ", logger.error(String.format("Credenziali non valide utente: %s ( %s) ",
username, multiDBTransactionManager.getPrimaryConnection().getCatalog() + " )")); username, multiDBTransactionManager.getPrimaryConnection().getCatalog() + " )"));
throw new Exception("Credenziali non valide"); throw new Exception("Credenziali non valide");
} else if (!foundUser.isAttivo()) { } else if (!foundUser.isAttivo()) {