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

Finish Hotfix-48

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-02-26 09:56:56 +01:00
parent 0efbc8ba16 d5c285fa45
commit 0ad90cf961
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ems-core/src/main/java/it/integry/ems/menu/service/MenuConfigurationService.java
View File

@@ -7,6 +7,7 @@ import it.integry.ems.menu.dto.MenuConfigDTO;
import it.integry.ems.menu.dto.StbMenuDTO;
import it.integry.ems.menu.dto.StbMenuOpzDTO;
import it.integry.ems.menu.dto.StbTipoAziendaDTO;
import it.integry.ems.settings.SettingsController;
import it.integry.ems.sync.MultiDBTransaction.AdvancedDataSource;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.entity.Azienda;
@@ -17,6 +18,7 @@ import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.UtilityDB;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.IOException;
@@ -31,6 +33,10 @@ public class MenuConfigurationService {
private final Logger logger = LogManager.getLogger();
@Autowired
private SettingsController settingsController;
@PostContextAutowired
private MultiDBTransactionManager multiDBTransactionManager;
@@ -42,7 +48,7 @@ public class MenuConfigurationService {
for (AdvancedDataSource advancedDataSource : multiDBTransactionManager.getActiveConnections()) {
if (advancedDataSource.getDataSource().getDbName().equalsIgnoreCase("studioml"))
if (advancedDataSource.getDataSource().getDbName().equalsIgnoreCase("studioml") && !isHistoryDB(advancedDataSource))
continue;
try {
@@ -56,6 +62,11 @@ public class MenuConfigurationService {
}
}
private boolean isHistoryDB(AdvancedDataSource advancedDataSource) throws Exception {
String historyProfileDB = settingsController.getHistoryProfileDb();
return historyProfileDB.equalsIgnoreCase(advancedDataSource.getProfileName());
}
public void refresh(Connection connection) throws Exception {
final MenuConfigDTO menuConfig = loadMenuData();
internalRefresh(connection, menuConfig);