Revize 26c4caa0
Přidáno uživatelem Vojtěch Danišík před téměř 4 roky(ů)
src/main/java/vldc/aswi/service/SqlQueryManagerImpl.java | ||
---|---|---|
28 | 28 |
/** Autowired databaseInterface component. */ |
29 | 29 |
@Autowired |
30 | 30 |
private DatabaseInterface databaseInterface; |
31 |
|
|
31 |
|
|
32 | 32 |
/** |
33 | 33 |
* Get list of contingencyTableRow. |
34 |
* @param configuration - configuration from which table will be created. |
|
34 |
* @param sqlQuery |
|
35 |
* @param parameterInConfigurations |
|
35 | 36 |
* @return List of contingencyTableRow. |
36 | 37 |
*/ |
37 | 38 |
@Override |
38 |
public List<ContingencyTableRow> getContingencyTableRow(Configuration configuration) {
|
|
39 |
public List<ContingencyTableRow> getContingencyTableRow(String sqlQuery, List<ParameterInConfiguration> parameterInConfigurations) {
|
|
39 | 40 |
long startTime = System.nanoTime(); |
40 |
Map<String, TableColumn> tableColumns = this.databaseInterface.executeQueryAndReturnTableColumns( |
|
41 |
configuration.getAssembly().getSQLQuery() |
|
42 |
); |
|
41 |
Map<String, TableColumn> tableColumns = this.databaseInterface.executeQueryAndReturnTableColumns(sqlQuery); |
|
43 | 42 |
long stopTime = System.nanoTime(); |
44 | 43 |
System.out.println("Select:" + TimeUnit.MILLISECONDS.convert((stopTime - startTime), TimeUnit.NANOSECONDS)); |
45 | 44 |
List<NameUserName> rowNames = new ArrayList<>(); |
46 | 45 |
List<NameUserName> columnNames = new ArrayList<>(); |
47 | 46 |
List<ValueFunction> valueFunctions = new ArrayList<>(); |
48 | 47 |
|
48 |
// Create a copy of list. |
|
49 |
List<ParameterInConfiguration> copiedParametersInConfiguration = new ArrayList<>(parameterInConfigurations); |
|
50 |
|
|
49 | 51 |
// sort parameters in configuration to have them in order set by user |
50 |
Collections.sort(configuration.getParametersInConfiguration());
|
|
52 |
Collections.sort(copiedParametersInConfiguration);
|
|
51 | 53 |
|
52 | 54 |
// TODO: 28.05.2020 map would be better |
53 |
for(ParameterInConfiguration parameterInConfiguration : configuration.getParametersInConfiguration()) {
|
|
55 |
for(ParameterInConfiguration parameterInConfiguration : copiedParametersInConfiguration) {
|
|
54 | 56 |
if (parameterInConfiguration.getLocation() != null && parameterInConfiguration.getLocation().getName().equals("Řádek")) { |
55 | 57 |
rowNames.add(new NameUserName(parameterInConfiguration.getParameter().getNameOfSelect().toUpperCase(), |
56 | 58 |
parameterInConfiguration.getColumnName())); |
Také k dispozici: Unified diff
re #8101 Bad saving changes for configuration.