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:
Valerio Castellana
2025-02-13 15:09:22 +01:00
parent 10fa73e2a0 217b084c5a
commit 36abb60aa4
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,32 +365,33 @@ public class SystemService {
String dbName = settingsModel.getDbNameFromProfileDb(profile);
UserDTO foundUser = userCacheService.retrieveUser(dbName, username, password, requestDataDTO.getApplication());
if (foundUser.isAttivo()) {
String sql = Query.format("SELECT * FROM " + StbUser.ENTITY + " WHERE user_name = {}", username);
StbUser stbUser;
try (MultiDBTransactionManager mdb = new MultiDBTransactionManager(profile)) {
stbUser = UtilityDB.executeSimpleQueryOnlyFirstRowDTO(mdb.getPrimaryConnection(), sql, StbUser.class);
}
if (foundUser == null || !foundUser.isAttivo())
continue;
StbUser finalStbUser = stbUser;
userData = new HashMap<String, Object>() {{
put("flag_attivo", foundUser.isAttivo() ? "S" : "N");
put("user_name", foundUser.getUsername());
put("fullName", foundUser.getFullname());
put("full_name", foundUser.getFullname());
put("cod_lang", finalStbUser.getCodLang());
put("cod_mdep", foundUser.getCodMdep());
put("profile_db", profile);
put("password_endtime", finalStbUser.getPasswordEndtime());
put("user_code", foundUser.getUserCode());
put("e_mail", foundUser.getEmail());
put("flag_password_expiring", finalStbUser.getFlagPasswordExpiring());
put("Last_access_datetime", finalStbUser.getLastAccessDatetime());
put("key_group", foundUser.getKeyGroup());
}};
String sql = Query.format("SELECT * FROM " + StbUser.ENTITY + " WHERE user_name = {}", username);
StbUser stbUser;
try (MultiDBTransactionManager mdb = new MultiDBTransactionManager(profile)) {
stbUser = UtilityDB.executeSimpleQueryOnlyFirstRowDTO(mdb.getPrimaryConnection(), sql, StbUser.class);
}
StbUser finalStbUser = stbUser;
userData = new HashMap<String, Object>() {{
put("flag_attivo", foundUser.isAttivo() ? "S" : "N");
put("user_name", foundUser.getUsername());
put("fullName", foundUser.getFullname());
put("full_name", foundUser.getFullname());
put("cod_lang", finalStbUser.getCodLang());
put("cod_mdep", foundUser.getCodMdep());
put("profile_db", profile);
put("password_endtime", finalStbUser.getPasswordEndtime());
put("user_code", foundUser.getUserCode());
put("e_mail", foundUser.getEmail());
put("flag_password_expiring", finalStbUser.getFlagPasswordExpiring());
put("Last_access_datetime", finalStbUser.getLastAccessDatetime());
put("key_group", foundUser.getKeyGroup());
}};
}
if (userData != null) {