From 8ea21994457a0dbe1d8c0137becfde00a9156e17 Mon Sep 17 00:00:00 2001 From: Abdelaziz Said Date: Wed, 12 Jan 2022 01:44:58 +0200 Subject: [PATCH] - Create a native query to find the DataSourceModbus with the Server ID. - Edit the Conversion tool to override the Mapping elements when the DataSourceModbus is existing in the database. - Edit the data_point_modbus table by adding new threshold percentage column. - Edit the Mapping to consider the thresholdPercentage in the DataPointModbus. - Edit the APIs to accept requests from the Combo-boxes as an Objects. --- .gitignore | 3 +++ target/iec61850-0.0.1-SNAPSHOT.jar | Bin 325801 -> 325800 bytes target/maven-archiver/pom.properties | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3415e4f..14117ef 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,6 @@ out/ .metadata/ **/bin/main/ **/bin/test/ +target/iec61850-0.0.1-SNAPSHOT.jar +target/maven-archiver +*.jar \ No newline at end of file diff --git a/target/iec61850-0.0.1-SNAPSHOT.jar b/target/iec61850-0.0.1-SNAPSHOT.jar index 67569518b0a2c85c554ece9dd3044cc163e10032..aedbf5b7947d5405aaddeb5606ee2d2aad4d0cc7 100644 GIT binary patch delta 4399 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 O$y1nSUX#H85b{6bY{tR> diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index e885c0e..044654c 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon Jan 10 15:26:04 EET 2022 +#Wed Jan 12 00:19:49 EET 2022 version=0.0.1-SNAPSHOT groupId=com.master artifactId=iec61850