Mercurial > lada > lada-server

changeset 812:9ed60af6e61e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added attribute 'type' to query configs.
author Raimund Renkert <raimund.renkert@intevation.de>
date Thu, 03 Dec 2015 11:59:41 +0100
parents 4d73c1eff7eb
children 5155b0b375cd
files src/main/java/de/intevation/lada/query/QueryConfig.java src/main/resources/messprogrammquery.json src/main/resources/probequery.json
diffstat 3 files changed, 30 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/query/QueryConfig.java	Thu Dec 03 11:58:51 2015 +0100
+++ b/src/main/java/de/intevation/lada/query/QueryConfig.java	Thu Dec 03 11:59:41 2015 +0100
@@ -21,12 +21,13 @@
  */
 public class QueryConfig
 {
-    String id;
-    String name;
-    String description;
-    String sql;
-    List<QueryFilter> filters;
-    List<ResultConfig> results;
+    private String id;
+    private String name;
+    private String description;
+    private String sql;
+    private String type;
+    private List<QueryFilter> filters;
+    private List<ResultConfig> results;
 
     public QueryConfig()
     {
@@ -89,6 +90,20 @@
     }
 
     /**
+     * @return the type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * @param type the type to set
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
      * @return the filter
      */
     public List<QueryFilter> getFilters() {
--- a/src/main/resources/messprogrammquery.json	Thu Dec 03 11:58:51 2015 +0100
+++ b/src/main/resources/messprogrammquery.json	Thu Dec 03 11:59:41 2015 +0100
@@ -3,6 +3,7 @@
     "name": "Kein Filter",
     "description": "Abfrage der Messprogramme ohne Filter",
     "sql": "select m.id as id, m.name as name, m.mst_id as mstId, m.umw_id as umwId from land.messprogramm m",
+    "type": "messprogramm",
     "result": [
         {"dataIndex": "name", "header": "Name", "width": 100},
         {"dataIndex": "mstId", "header": "MST", "width": 100},
--- a/src/main/resources/probequery.json	Thu Dec 03 11:58:51 2015 +0100
+++ b/src/main/resources/probequery.json	Thu Dec 03 11:59:41 2015 +0100
@@ -3,6 +3,7 @@
     "name": "Kein Filter",
     "description": "Abfrage der Proben ohne Filter",
     "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr from land.probe p join land.probe_translation pt on p.id = pt.probe_id",
+    "type": "probe",
     "result": [
         {"dataIndex": "probeId", "header": "ProbeId", "width": 120},
         {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50},
@@ -17,6 +18,7 @@
     "name": "HP-Nr-Filter",
     "description": "Abfrage der Proben mit Wildcardfilter für die Hauptproben-Nr.",
     "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr from land.probe p join land.probe_translation pt on p.id = pt.probe_id where (p.hauptproben_nr like :hp_nr_id or '' = :hp_nr_id)",
+    "type": "probe",
     "result": [
         {"dataIndex": "probeId", "header": "ProbeId", "width": 120},
         {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50},
@@ -32,6 +34,7 @@
     "name": "Probe-ID-Filter",
     "description": "Abfrage der Proben mit Wildcardfilter für die Probe_id",
     "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr from land.probe p join land.probe_translation pt on p.id = pt.probe_id where (pt.probe_id_alt like :probe_id or '' = :probe_id)",
+    "type": "probe",
     "result": [
         {"dataIndex": "probeId", "header": "ProbeId", "width": 120},
         {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50},
@@ -47,6 +50,7 @@
     "name": "MST und UMW",
     "description": "Abfrage der Proben gefiltert nach Messtellen ID und ID des Umweltbereichs",
     "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr from land.probe p join land.probe_translation pt on p.id = pt.probe_id where (p.mst_id = :mst_id OR '' = :mst_id) and (p.umw_id = :umw_id OR '' = :umw_id)",
+    "type": "probe",
     "result": [
         {"dataIndex": "probeId", "header": "ProbeId", "width": 120},
         {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50},
@@ -63,6 +67,7 @@
     "name": "Proben pro Land",
     "description": "Proben gefiltert nach Ländern",
     "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr from land.probe p join land.probe_translation pt on p.id = pt.probe_id where (netzbetreiber_id = :netz OR '' = :netz)",
+    "type": "probe",
     "result": [
         {"dataIndex": "probeId", "header": "ProbeId", "width": 100},
         {"dataIndex": "netzbetreiberId", "header": "Land", "width": 100},
@@ -78,6 +83,7 @@
     "name": "alle Proben mit Ort",
     "description": "alle Proben mit Entnahmeort",
     "sql": "select p.id as id,  pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr, so.gem_id as gemId, v.bezeichnung as bezeichnung from land.probe p join land.probe_translation pt on p.id = pt.probe_id left outer join land.ort o on (p.id = o.probe_id) left outer join stammdaten.ort so on (o.ort_id = so.id) left outer join stammdaten.verwaltungseinheit v on (so.gem_id = v.id) where o.orts_typ = 'E' or o.orts_typ is null",
+    "type": "probe",
     "result": [
         {"dataIndex": "probeId", "header": "ProbeId", "width": 100},
         {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50},
@@ -94,6 +100,7 @@
     "name": "Proben pro Land und UMW (Multiselect)",
     "description": "Abfrage aller Proben gefiltert pro Land und Umweltbereich (mit Mehrfachauswahl)",
     "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, to_char(p.probeentnahme_beginn,'YYYY-mm-dd HH24:MI') entnahmeVon, to_char(p.probeentnahme_ende,'YYYY-mm-dd HH24:MI') entnahmeBis, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr, o.orts_typ as ortsTyp, so.gem_id as gemId, v.bezeichnung as bezeichnung from land.probe p join land.probe_translation pt on p.id = pt.probe_id left outer join land.ort o on (p.id = o.probe_id) left outer join stammdaten.ort so on (o.ort_id = so.id) left outer join stammdaten.verwaltungseinheit v on (so.gem_id = v.id) where (o.orts_typ = 'E' or o.orts_typ is null) and (p.netzbetreiber_id = :netz OR '' =:netz) and (p.umw_id similar to (:umw_id) OR '' = :umw_id)",
+    "type": "probe",
     "result": [
         {"dataIndex": "probeId", "header": "ProbeId", "width": 100},
         {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50},
@@ -115,6 +122,7 @@
     "name": "Proben und Messungen pro Land und UMW (Multiselect)",
     "description": "Abfrage aller Proben/Messungen gefiltert pro Land und Umweltbereich (mit Mehrfachauswahl)",
     "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, to_char(p.probeentnahme_beginn,'YYYY-mm-dd HH24:MI') entnahmeVon, to_char(p.probeentnahme_ende,'YYYY-mm-dd HH24:MI') entnahmeBis, m.mmt_id as mmtId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr, o.orts_typ as ortsTyp, so.gem_id as gemId, v.bezeichnung as bezeichnung from land.probe p left outer join land.probe_translation pt on p.id = pt.probe_id left outer join land.messung m on p.id = m.probe_id left outer join land.ort o on (p.id = o.probe_id) left outer join stammdaten.ort so on (o.ort_id = so.id) left outer join stammdaten.verwaltungseinheit v on (so.gem_id = v.id) where (o.orts_typ = 'E' or o.orts_typ is null) and (p.netzbetreiber_id = :netz OR '' =:netz) and (p.umw_id similar to (:umw_id) OR '' = :umw_id)",
+    "type": "probe",
     "result": [
         {"dataIndex": "probeId", "header": "ProbeId", "width": 100},
         {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50},
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)