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

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

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-09-15 15:47:24 +02:00
parent d048ea1f9c ab9672cae3
commit c4e8985642
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ems-core/src/main/java/it/integry/ems/sync/MultiDBTransaction/BasicConnectionPool.java
View File

@@ -61,7 +61,7 @@ public class BasicConnectionPool {
}
}
private void initializeConnections() throws Exception {
private void initializeConnections() {
final List<AvailableConnectionsModel> availableConnections =
settingsModel.getAvailableConnectionsWithoutDuplicatedProfiles(false);
@@ -111,15 +111,9 @@ public class BasicConnectionPool {
private void registerDataSourceIfNotExists(AvailableConnectionsModel connectionModel) throws Exception {
String dbName = connectionModel.getDbName();
registeredDatasources.computeIfAbsent(dbName, k -> {
try {
return createNewDataSource(connectionModel);
} catch (Exception e) {
logger.error("Errore creazione lazy DataSource per {}", dbName, e);
throw new RuntimeException(e);
}
});
if (!registeredDatasources.containsKey(dbName)) {
registeredDatasources.put(dbName, createNewDataSource(connectionModel));
}
}
}

2
ems-core/src/main/java/it/integry/ems/sync/MultiDBTransaction/MultiDBTransactionManager.java
View File

@@ -52,11 +52,13 @@ public class MultiDBTransactionManager implements AutoCloseable {
public MultiDBTransactionManager() {
connectionPool = ApplicationContextProvider.getApplicationContext().getBean(BasicConnectionPool.class);
settingsModel = ApplicationContextProvider.getApplicationContext().getBean(SettingsModel.class);
emsDBConst = ApplicationContextProvider.getApplicationContext().getBean(EmsDBConst.class);
}
public MultiDBTransactionManager(BasicConnectionPool connectionPool) throws Exception {
this.connectionPool = connectionPool;
settingsModel = ApplicationContextProvider.getApplicationContext().getBean(SettingsModel.class);
emsDBConst = ApplicationContextProvider.getApplicationContext().getBean(EmsDBConst.class);
}
public MultiDBTransactionManager(AvailableConnectionsModel connectionsModel) throws Exception {

1
ems-engine/src/main/java/it/integry/ems/logistic/controller/Slim2kLogisticController.java
View File

@@ -64,6 +64,7 @@ public class Slim2kLogisticController {
List<ServiceRestResponse> list = new ArrayList<ServiceRestResponse>();
try {
logger.debug(requestDataDTO.getUsername() + " " + requestDataDTO.getPassword() + " " + requestDataDTO.getProfileDB());
multiDBTransactionManager.setPrimaryDB(configuration);
list.add(ServiceRestResponse.createEntityPositiveResponse(slim2kLogisticService.importListeDiCarico(scode, dcode, docdate, docnum, refdoc)));
} catch (Exception e) {
logger.error(request.getRequestURI(), e);

6
ems-engine/src/main/java/it/integry/ems/logistic/service/Slim2kLogisticService.java
View File

@@ -396,6 +396,7 @@ public class Slim2kLogisticService {
}
try (MultiDBTransactionManager dsSlim2k = new MultiDBTransactionManager(profileSlim2k)) {
HashMap<String, Object> lista = new HashMap<>();
if (!UtilityString.isNullOrEmpty(refdoc)) {
String sql = "SELECT DISTINCT scode,"
+ " docnum,"
@@ -403,13 +404,16 @@ public class Slim2kLogisticService {
+ " FROM documents_export "
+ " WHERE refdoc = " + UtilityDB.valueToString(refdoc);
HashMap<String, Object> lista = UtilityDB.executeSimpleQueryOnlyFirstRow(dsSlim2k.getPrimaryConnection(), sql);
lista = UtilityDB.executeSimpleQueryOnlyFirstRow(dsSlim2k.getPrimaryConnection(), sql);
if (UtilityHashMap.isPresent(lista)) {
scode = ((String) lista.get("scode")).trim();
docnum = ((String) lista.get("docnum")).trim();
docDate = ((String) lista.get("docdate")).trim();
}
}
String whereCond = "";
if (!UtilityString.isNullOrEmpty(scode)) {
whereCond = "trim(documents_export.scode) = " + UtilityDB.valueToString(scode);

4
ems-engine/src/main/java/it/integry/ems/retail/service/BilanceService.java
View File

@@ -110,8 +110,8 @@ public class BilanceService {
UtilityEntity.throwEntitiesException(entityList);
// Move a file to imported directory
File importedFile = new File(pathFileImported + File.separator + fileName);
FileUtils.moveFile(file, importedFile);
// File importedFile = new File(pathFileImported + File.separator + fileName);
// FileUtils.moveFile(file, importedFile);
returnList.addAll(entityList);
}