Rimosso codice inutile in getSetupList, ignorato getConfigurationFile in SettingsModel
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
This commit is contained in:
@@ -275,6 +275,7 @@ public class SettingsModel implements InitializingBean {
|
||||
}
|
||||
|
||||
|
||||
@JsonIgnore
|
||||
public File getConfigurationFile() {
|
||||
return configurationFile;
|
||||
}
|
||||
|
||||
@@ -604,17 +604,8 @@ public class SystemService {
|
||||
}).toList();
|
||||
|
||||
baseQuery = baseQuery.concat(UtilityQuery.concatFieldListInWhereCond(whereCondMap));
|
||||
List<StbGestSetup> setupList = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), baseQuery, StbGestSetup.class);
|
||||
Stream.of(stbGestSetups).forEach(setup -> {
|
||||
StbGestSetup setupValue = Stream.of(setupList)
|
||||
.filter(x -> x.getGestName().equalsIgnoreCase(setup.getGestName()) &&
|
||||
x.getSection().equalsIgnoreCase(setup.getSection()) &&
|
||||
x.getKeySection().equalsIgnoreCase(setup.getKeySection()))
|
||||
.findFirst()
|
||||
.orElse(new StbGestSetup());
|
||||
setup.setValue(setupValue.getValue());
|
||||
});
|
||||
return setupList;
|
||||
|
||||
return UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), baseQuery, StbGestSetup.class);
|
||||
}
|
||||
|
||||
public EntityBase updateGestSetup(StbGestSetup stbGestSetup, String username) throws Exception {
|
||||
|
||||
Reference in New Issue
Block a user