Feature/#1863 QuestDB integration

build.xml

@@ -249,6 +249,9 @@
 				  haltonfailure="yes">
 			</test>
 
+			<test name="org.scada_lts.InitObjectTestsSuite"
+				  haltonfailure="yes">
+			</test>
 		</junit>
 
 		<junitreport todir="${build-project.test.report}">
@@ -660,6 +663,7 @@
         <pathelement location="WebContent/WEB-INF/lib/xmlsec-1.4.3.jar"/>
 		<pathelement location="WebContent/WEB-INF/lib/cache-api-1.1.1.jar"/>
 		<pathelement location="WebContent/WEB-INF/lib/ehcache-3.9.4.jar"/>
+		<pathelement location="WebContent/WEB-INF/lib/questdb-jdk8-6.0.1.jar"/>
         <pathelement location="WebContent/WEB-INF/classes"/>
     </path>
 	<path id="EAR Libraries.libraryclasspath"/>

scadalts-ui/src/locales/de.json

@@ -337,6 +337,7 @@
 	"systemsettings.notification.save.systemevent": "System Event Types Settings saved!",
 	"systemsettings.notification.save.systeminfo": "Systeminfo-Einstellungen gespeichert!",
 	"systemsettings.notification.send.email": "E-Mail wurde gesendet an ",
+	"systemsettings.notification.save.dbquery": "DbQuery Einstellungen gespeichert!",
 	"systemsettings.scadaconf.aclServer": "Zugriffskontrolllistenserver",
 	"systemsettings.scadaconf.apiReplaceAlertOnView": "Ersetzen Sie die angezeigte Warnung",
 	"systemsettings.scadaconf.cacheEnable": "Event cache",
@@ -356,6 +357,8 @@
 	"systemsettings.scadaconf.useCacheDataSourcePointsWhenSystemIsReady": "Verwenden Sie Cache-Datenquellenpunkte, wenn das System bereit ist",
 	"systemsettings.smsdomain.label": "SMS-Gateway-Serveradresse",
 	"systemsettings.smsdomain.title": "SMS Domain",
+	"systemsettings.dbquery.title": "DBQuery-Einstellungen",
+	"systemsettings.dbquery.readEnabled": "Lesen aktivieren",
 	"systemsettings.title": "Systemeinstellungen",
 	"systemsettings.tooltip.derbydatabase": "Die Derby-Datenbank ist in dieser ScadaLTS-Version nicht verfügbar!",
 	"systemsettings.tooltip.purgedata": "Löschen Sie die Zustimmung zum historischen Datenpunkt",

scadalts-ui/src/locales/en.json

@@ -787,6 +787,7 @@
 	"systemsettings.notification.save.systemevent": "System Event Types settings saved!",
 	"systemsettings.notification.save.systeminfo": "System info settings saved!",
 	"systemsettings.notification.send.email": "Email has been sent to ",
+	"systemsettings.notification.save.dbquery": "DbQuery settings saved!",
 	"systemsettings.scadaconf.aclServer": "Access Control List server",
 	"systemsettings.scadaconf.apiReplaceAlertOnView": "Replace alert on view",
 	"systemsettings.scadaconf.cacheEnable": "Event cache",
@@ -806,6 +807,8 @@
 	"systemsettings.scadaconf.useCacheDataSourcePointsWhenSystemIsReady": "Use cache data sources points when the system is ready",
 	"systemsettings.smsdomain.label": "SMS-Gateway server address",
 	"systemsettings.smsdomain.title": "SMS Domain",
+	"systemsettings.dbquery.title": "DBQuery settings",
+	"systemsettings.dbquery.readEnabled": "Enable read",
 	"systemsettings.title": "System settings",
 	"systemsettings.tooltip.derbydatabase": "Derby database is unavailable in this ScadaLTS version!",
 	"systemsettings.tooltip.purgedata": "Delete all historical datapoint values",

scadalts-ui/src/store/systemSettings/index.js

@@ -23,6 +23,7 @@ const storeSystemSettings = {
 		schemaVersion: undefined,
 		scadaConfig: undefined,
 		defaultLoggingType: undefined,
+		dbQuerySettings: undefined,
 	},
 	mutations: {
 		setDatabaseType(state, databaseType) {
@@ -71,6 +72,9 @@ const storeSystemSettings = {
 		setDefaultLoggingType(state, defaultLoggingType) {
 			state.defaultLoggingType = defaultLoggingType;
 		},
+		setDbQuerySettings(state, dbQuerySettings) {
+			state.dbQuerySettings = dbQuerySettings;
+		},
 	},
 	actions: {
 		getDatabaseType({ commit, dispatch }) {
@@ -272,6 +276,20 @@ const storeSystemSettings = {
 			});
 		},
 
+		getDbQuerySettings({ commit, dispatch }) {
+			return dispatch('requestGet', '/systemSettings/getDbQuerySettings').then((r) => {
+				commit('setDbQuerySettings', r);
+				return r;
+			});
+		},
+
+		saveDbQuerySettings({ state, dispatch }) {
+			return dispatch('requestPost', {
+				url: '/systemSettings/saveDbQuerySettings',
+				data: state.dbQuerySettings,
+			});
+		},
+
 		purgeData(context) {
 			return new Promise((resolve, reject) => {
 				axios

scadalts-ui/src/views/System/SystemSettings/DbQuerySettingsComponent.vue

@@ -0,0 +1,130 @@
+<template>
+  <v-col cols="12" md="6">
+    <v-card>
+      <v-card-title>
+        {{ $t('systemsettings.dbquery.title') }}
+        <span v-if="isDbQueryEdited">*</span>
+      </v-card-title>
+      <v-card-text>
+          <v-row>
+            <v-col cols="12">
+              <v-switch
+                  v-model="dbQuerySettings.readEnabled"
+                  :label="$t('systemsettings.dbquery.readEnabled')"
+                  @click="watchRadioDataChagne(dbQuerySettings.readEnabled)"
+              ></v-switch>
+            </v-col>
+          </v-row>
+      </v-card-text>
+    </v-card>
+
+    <v-snackbar v-model="response.status" :color="response.color">
+      {{ response.message }}
+    </v-snackbar>
+  </v-col>
+</template>
+<script>
+
+export default {
+  name: 'DbQuerySettingsComponent',
+
+  data() {
+    return {
+      dbQuerySettings: undefined,
+      dbQuerySettingsStore: undefined,
+      isDbQueryEdited: false,
+      response: {
+        color: 'success',
+        status: false,
+        message: '',
+      },
+    };
+  },
+
+  mounted() {
+    this.fetchData();
+  },
+
+  methods: {
+    async fetchData() {
+      this.dbQuerySettings = await this.$store.dispatch('getDbQuerySettings');
+      this.dbQuerySettingsStore = this.copyDataFromStore();
+    },
+
+    saveData() {
+      console.log('Saved!');
+      this.$store.commit('setDbQuerySettings', this.dbQuerySettings);
+      this.dbQuerySettingsStore = this.copyDataFromStore();
+      this.$store
+          .dispatch('saveDbQuerySettings')
+          .then((resp) => {
+            if (resp) {
+              this.restoreData();
+              this.response = {
+                status: true,
+                message: this.$t('systemsettings.notification.save.dbquery'),
+                color: 'success',
+              };
+            }
+          })
+          .catch(() => {
+            this.response = {
+              status: true,
+              message: this.$t('systemsettings.notification.fail'),
+              color: 'danger',
+            };
+          });
+    },
+
+    restoreData() {
+      this.fetchData();
+      this.isDbQueryEdited = false;
+    },
+
+    copyDataFromStore() {
+      return JSON.parse(JSON.stringify(this.$store.state.systemSettings.dbQuerySettings));
+    },
+
+    watchRadioDataChagne(value) {
+      this.dbQuerySettings.readEnabled = value;
+      this.watchDataChange();
+    },
+
+    async watchDataChange() {
+      this.isDbQueryEdited = await this.isDataChanged();
+      this.emitData(this.isDbQueryEdited);
+    },
+
+    async isDataChanged() {
+      return !(await this.$store.dispatch('configurationEqual', {
+        object1: this.dbQuerySettings,
+        object2: this.dbQuerySettingsStore,
+      }));
+    },
+
+    emitData(changed) {
+      this.$emit('changed', {
+        component: 'dbQuerySettingsComponent',
+        title: 'systemsettings.dbquery.title',
+        changed: changed,
+        data: this.sumarizeDataChanges(),
+      });
+    },
+
+    sumarizeDataChanges() {
+      let data = [];
+      for (let key in this.dbQuerySettings) {
+        if (this.dbQuerySettings[key] !== this.dbQuerySettingsStore[key]) {
+          data.push({
+            label: `systemsettings.dbquery.${key}`,
+            originalData: this.dbQuerySettingsStore[key],
+            changedData: this.dbQuerySettings[key],
+          });
+        }
+      }
+      return data;
+    },
+  },
+};
+</script>
+<style></style>

scadalts-ui/src/views/System/SystemSettings/index.vue

@@ -67,6 +67,11 @@
 								<ScadaConfigurationComponent
 								 id="scada-configuration"
 								></ScadaConfigurationComponent>
+                <DbQuerySettingsComponent
+                  ref="dbQuerySettingsComponent"
+                  @changed="componentChanged"
+                ></DbQuerySettingsComponent>
+								<ScadaConfigurationComponent></ScadaConfigurationComponent>
 							</v-row>
 						</v-col>
 					</v-row>
@@ -281,6 +286,7 @@ import SmsDomainSettingsComponent from './SmsDomainSettingsComponent';
 import ScadaConfigurationComponent from './ScadaConfigurationComponent';
 import AmChartSettingsComponent from './AmChartSettingsComponent';
 import DataBaseInfoComponent from './DataBaseInfoComponent';
+import DbQuerySettingsComponent from './DbQuerySettingsComponent';
 
 export default {
 	el: '#systemsettings',
@@ -298,6 +304,7 @@ export default {
 		ScadaConfigurationComponent,
 		AmChartSettingsComponent,
 		DataBaseInfoComponent,
+    DbQuerySettingsComponent,
 	},
 	filters: {
 		blank: function (value) {
@@ -347,7 +354,7 @@ export default {
 				setTimeout(() => {
 					let el = document.getElementById(element);
 					if(!!el) {
-						el.scrollIntoView();	
+						el.scrollIntoView();
 					}
 				}, 1000);
 			}

src/com/serotonin/mango/Common.java

@@ -117,6 +117,7 @@ public interface ContextKeys {
 		String HTTP_RECEIVER_MULTICASTER = "HTTP_RECEIVER_MULTICASTER";
 		String DOCUMENTATION_MANIFEST = "DOCUMENTATION_MANIFEST";
 		String DATA_POINTS_NAME_ID_MAPPING = "DATAPOINTS_NAME_ID_MAPPING";
+		String DATABASE_QUERY_ACCESS = "DATABASE_QUERY_ACCESS";
 	}
 
 	public interface TimePeriods {

src/com/serotonin/mango/MangoContextListener.java

@@ -414,13 +414,31 @@ private void databaseInitialize(ServletContext ctx) {
 		DatabaseAccess databaseAccess = DatabaseAccess
 				.createDatabaseAccess(ctx);
 		ctx.setAttribute(Common.ContextKeys.DATABASE_ACCESS, databaseAccess);
-		databaseAccess.initialize();
+		boolean dbQueryEnabled = Common.getEnvironmentProfile().getBoolean("dbquery.enabled",
+				false);
+		if(dbQueryEnabled) {
+			DatabaseAccess databaseQueryAccess = DatabaseAccess
+					.createDatabaseAccess(ctx, "dbquery.");
+			ctx.setAttribute(Common.ContextKeys.DATABASE_QUERY_ACCESS, databaseQueryAccess);
+
+			databaseAccess.initOnlyDatasourceJdbc();
+			databaseQueryAccess.initOnlyDatasourceJdbc();
+
+			databaseAccess.initialize();
+			databaseQueryAccess.initialize();
+		} else {
+			databaseAccess.initialize();
+		}
 	}
 
 	private void databaseTerminate(ContextWrapper ctx) {
 		DatabaseAccess databaseAccess = ctx.getDatabaseAccess();
 		if (databaseAccess != null)
 			databaseAccess.terminate();
+
+		DatabaseAccess databaseQueryAccess = ctx.getDatabaseQueryAccess();
+		if(databaseQueryAccess != null)
+			databaseQueryAccess.terminate();
 	}
 
 	//

src/com/serotonin/mango/db/BasePooledAccess.java

@@ -50,18 +50,23 @@ public BasePooledAccess(ServletContext ctx)
         super(ctx);
     }
 
+    public BasePooledAccess(ServletContext ctx, String dbPrefix)
+    {
+        super(ctx, dbPrefix);
+    }
+
     @SuppressWarnings("deprecation")
     @Override
     protected void initializeImpl(String propertyPrefix, String dataSourceName)
     {
         log.info("Initializing pooled connection manager");
 
-        if(Common.getEnvironmentProfile().getString(propertyPrefix + "db.datasource", "false").equals("true"))
+        if(Common.getEnvironmentProfile().getString(propertyPrefix + getDbPrefix() + "datasource", "false").equals("true"))
         {
             try
             {
-                log.info("Looking for Datasource: " + Common.getEnvironmentProfile().getString(propertyPrefix + "db.datasourceName"));
-                dataSource = (DataSource) new InitialContext().lookup(Common.getEnvironmentProfile().getString(propertyPrefix + "db.datasourceName"));
+                log.info("Looking for Datasource: " + Common.getEnvironmentProfile().getString(propertyPrefix + getDbPrefix() + "datasourceName"));
+                dataSource = (DataSource) new InitialContext().lookup(Common.getEnvironmentProfile().getString(propertyPrefix + getDbPrefix() + "datasourceName"));
                 Connection conn = dataSource.getConnection();
                 log.info("DataSource meta: " + conn.getMetaData().getDatabaseProductName() + " " + conn.getMetaData().getDatabaseProductVersion());
                 dataSourceFound = true;
@@ -84,15 +89,15 @@ protected void initializeImpl(String propertyPrefix)
         dataSource = new BasicDataSource();
         ((BasicDataSource) dataSource).setDriverClassName(getDriverClassName());
         ((BasicDataSource) dataSource).setUrl(getUrl(propertyPrefix));
-        ((BasicDataSource) dataSource).setUsername(Common.getEnvironmentProfile().getString(propertyPrefix + "db.username"));
+        ((BasicDataSource) dataSource).setUsername(Common.getEnvironmentProfile().getString(propertyPrefix + getDbPrefix() + "username"));
         ((BasicDataSource) dataSource).setPassword(getDatabasePassword(propertyPrefix));
-        ((BasicDataSource) dataSource).setMaxActive(Common.getEnvironmentProfile().getInt(propertyPrefix + "db.pool.maxActive", 10));
-        ((BasicDataSource) dataSource).setMaxIdle(Common.getEnvironmentProfile().getInt(propertyPrefix + "db.pool.maxIdle", 10));
+        ((BasicDataSource) dataSource).setMaxActive(Common.getEnvironmentProfile().getInt(propertyPrefix + getDbPrefix() + "pool.maxActive", 10));
+        ((BasicDataSource) dataSource).setMaxIdle(Common.getEnvironmentProfile().getInt(propertyPrefix + getDbPrefix() + "pool.maxIdle", 10));
     }
 
     protected String getUrl(String propertyPrefix)
     {
-        return Common.getEnvironmentProfile().getString(propertyPrefix + "db.url");
+        return Common.getEnvironmentProfile().getString(propertyPrefix + getDbPrefix() + "url");
     }
 
     abstract protected String getDriverClassName();