diff --git a/src/main/java/com/application/DB/Constants.java b/src/main/java/com/application/DB/Constants.java
index ae704396fb2dbb59cd3be5faf3c33da172dfcef5..65b1741171af1dea4e0d992c5d199a9096d008e0 100644
--- a/src/main/java/com/application/DB/Constants.java
+++ b/src/main/java/com/application/DB/Constants.java
@@ -1,14 +1,38 @@
package com.application.DB;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
+import java.util.Date;
+
/**
* This class contains constants to be used related to database activities
*/
public final class Constants {
+ // Format for today's date
+ static DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
private Constants() {
// Empty constructor
}
+ // Today's date
+ public static final String TODAYS_DATE = format.format(LocalDateTime.now());
+
+ // Database ID/name
public static final String PROJECT_ID = "sf-drying-optimization";
+ // Location Valasen
+ public static final int LOCATION_ID = 124;
+ public static final String TABLE_NAME_VALMATICS = "int_dk_valmaticsdryingbatches_v2";
+ public static final String TABLE_NAME_KWH = "int_sd_winccsensordata";
+
+ // Location Arjang
+ /*
+ public static final int LOCATION_ID = 174;
+ public static final String TABLE_NAME_VALMATICS = "int_dk_valmaticsdryingbatches";
+ public static final String TABLE_NAME_KWH = "int_sd_swappconsensordata";
+ */
+
}
diff --git a/src/main/java/com/application/DB/DB.java b/src/main/java/com/application/DB/DB.java
index b425377c0b0e6e5cf2c10ea6f77735fdd614e124..eb340cd964bda702431f63c95dcb82a05c9da79e 100644
--- a/src/main/java/com/application/DB/DB.java
+++ b/src/main/java/com/application/DB/DB.java
@@ -158,7 +158,7 @@ public class DB {
// Preparing a query statement
/*
final String sqlStatement = "SELECT DISTINCT TimeStamp, VariantValue " +
- "FROM sf-drying-optimization.124.int_sd_winccsensordata " +
+ "FROM `" + PROJECT_ID + "." + LOCATION_ID + "." + TABLE_NAME_KWH + "` " +
"WHERE TimeStamp BETWEEN " + '"'+ entry.getKey() + '"' +
" AND " + '"' + entry.getValue() + '"' +
" ORDER BY TimeStamp ASC";
@@ -168,7 +168,7 @@ public class DB {
// Preparing a query statement
// Query statement 124 Valåsen
final String sqlStatement = "SELECT `TimeStamp`, `VariantValue` " +
- "FROM `sf-drying-optimization.124.int_sd_winccsensordata` " +
+ "FROM `" + PROJECT_ID + "." + LOCATION_ID + "." + TABLE_NAME_KWH + "` " +
"WHERE TimeStamp BETWEEN " + '"'+ entry.getKey() + '"' +
" AND " + '"' + entry.getValue() + '"' +
" AND ValueID = 51" +
@@ -178,12 +178,13 @@ public class DB {
/*
// Query statement 174 Årjang
final String sqlStatement =
- "SELECT Timestamp, RealValue FROM `sf-drying-optimization.174.int_sd_swappconsensordata` " +
- "WHERE TimeStamp BETWEEN " + '"'+ entry.getKey() + '"' +
- " AND " + '"' + entry.getValue() + '"' +
- "AND ValueID = 19 " +
- "AND RealValue <> 0 " +
- "ORDER BY TimeStamp ASC";
+ "SELECT Timestamp, RealValue
+ "FROM `" + PROJECT_ID + "." + LOCATION_ID + "." + TABLE_NAME_KWH + "` " +
+ "WHERE TimeStamp BETWEEN " + '"'+ entry.getKey() + '"' +
+ " AND " + '"' + entry.getValue() + '"' +
+ "AND ValueID = 19 " +
+ "AND RealValue <> 0 " +
+ "ORDER BY TimeStamp ASC";
*/
@@ -210,16 +211,12 @@ public class DB {
// Riktig format, men i string
String formatedTimeStamp = getDateFormat().format(timeStamp);
-/*
- // Checks for negative values and unresonable large values
- if(variantValue > 0){ //&& variantValue < 5000000){
+ // Checks for negative values
+ if(variantValue > 0) {
// Adding the data to a list in order to sort through later
data.put(formatedTimeStamp, variantValue);
}
- */
- data.put(formatedTimeStamp, variantValue);
-
//System.out.printf("Timestamp: \t%s\t\t\tkWh: \t%s\t\t\tBaseline: %s\n",formatedTimeStamp,variantValue,baseline);
// Checks if the data is empty
}
@@ -243,7 +240,6 @@ public class DB {
System.out.printf("Timestamp: \t%s\t\t\tkWh: \t%s\n",entry.getKey(),entry.getValue());
}
-
return sortedFinalResults;
}
@@ -280,21 +276,26 @@ public class DB {
// Sqlstatement for Valåsen(124)
final String sqlStatement =
- "SELECT MAX(Name) as DryingSchedule, MAX(KilnName) as Kiln_name, DryingStarted, Max(CalculatedStop) as CalculatedStop\n" +
- "FROM `sf-drying-optimization.124.int_dk_valmaticsdryingbatches_v2` \n" +
- "WHERE KilnName = 5 \n" +
- "AND DATE(DryingStarted) BETWEEN \"1990-08-17\" AND \"2022-08-17\"\n" +
- "AND DATE(CalculatedStop) BETWEEN \"1990-08-17\" AND \"2022-08-17\"\n" +
- "AND DATE(CalculatedStart) BETWEEN \"1990-08-17\" AND \"2022-08-17\"\n" +
- "Group by DryingStarted\n" +
- "Order by DryingStarted ASC";
+ "SELECT MAX(Name) as DryingSchedule, MAX(KilnName) as Kiln_name, DryingStarted, Max(CalculatedStop) as CalculatedStop " +
+ "FROM `" + PROJECT_ID + "." + LOCATION_ID + "." + TABLE_NAME_VALMATICS + "` " +
+ "WHERE KilnName = 5 " +
+ //"AND DATE(DryingStarted) BETWEEN \"1990-08-17\" AND \"2022-08-17\" " +
+ //"AND DATE(CalculatedStop) BETWEEN \"1990-08-17\" AND \"2022-08-17\" " +
+ //"AND DATE(CalculatedStart) BETWEEN \"1990-08-17\" AND \"2022-08-17\" " +
+ "AND DryingStarted BETWEEN \"1990-01-01 00:00:00\" AND \"" + TODAYS_DATE + "\" " +
+ "AND CalculatedStop BETWEEN \"1990-01-01 00:00:00\" AND \"" + TODAYS_DATE + "\" " +
+ "AND CalculatedStart BETWEEN \"1990-01-01 00:00:00\" AND \"" + TODAYS_DATE + "\" " +
+ "Group by DryingStarted " +
+ "Order by DryingStarted ASC ";
+
+ System.out.println(sqlStatement);
/*
// Sqlstatement for Årjang(174)
final String sqlStatement =
"SELECT MAX(Name) as DryingSchedule, MAX(KilinId)+1 as KilnName, DryingStarted, Max(DryingCompleted) as DryingCompleted\n" +
- "FROM `sf-drying-optimization.174.int_dk_valmaticsdryingbatches` \n" +
+ "FROM `" + PROJECT_ID + "." + LOCATION_ID + "." + TABLE_NAME_VALMATICS + "` " +
"WHERE KilinId = 16 \n" +
"AND DATE(DryingStarted) BETWEEN \"1990-08-17\" AND \"2022-08-17\"\n" +
"AND DATE(DryingCompleted) BETWEEN \"1990-08-17\" AND \"2022-08-17\"\n" +
diff --git a/target/classes/com/application/DB/Constants.class b/target/classes/com/application/DB/Constants.class
new file mode 100644
index 0000000000000000000000000000000000000000..36d1dfcf105d9904e54bdde59aeb74409a514b91
Binary files /dev/null and b/target/classes/com/application/DB/Constants.class differ
diff --git a/target/classes/com/application/DB/DB.class b/target/classes/com/application/DB/DB.class
index 30cd375022bc63510dd2aad4cd576d38dced7e46..386565ccedb8265adb368a8df6a4c7ae9917907c 100644
Binary files a/target/classes/com/application/DB/DB.class and b/target/classes/com/application/DB/DB.class differ