Skip to content
Snippets Groups Projects
Commit 7ca44641 authored by Eilert Tunheim's avatar Eilert Tunheim
Browse files

Combined searching data from multiple sawmills

parent 64c3d23b
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 266 additions and 186 deletions
src/main/java/com/application/DB/Constants.java
+ 98
− 42
View file @ 7ca44641
......@@ -3,22 +3,18 @@ package com.application.DB;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Map;
/**
* 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());
public static final String TODAYS_DATE = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.now());
// User inputs
public static String TREE_SPECIES = "";
......@@ -27,79 +23,139 @@ public final class Constants {
public static String MOISTURE_GOAL = "";
// Number of wanted drying periods
public static int NUMBER_OF_PERIODS = 1;
// Database ID/name
public static final String PROJECT_ID = "sf-drying-optimization";
// Location Valasen(124)
// Project settings
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";
public static final int VALASEN_LOCATION_ID = 124;
public static final String VALASEN_TABLE_NAME_VALMATICS = "int_dk_valmaticsdryingbatches_v2";
public static final String VALASEN_TABLE_NAME_KWH = "int_sd_winccsensordata";
// Parameters settings
// Valmatics
public static final String NAME_PARAMATERS = "Name";
public static final String START_DRYING_NAME = "DryingStarted";
public static final String STOP_DRYING_NAME = "CalculatedStop";
public static final String KILIN_NAME = "KilnName";
public static int KILIN_ID = 5; // Kammer 5
//public static int KILIN_ID = 6; // Kammer 6
public static final int LIMIT = 1000;
public static final String VALASEN_NAME_PARAMATERS = "Name";
public static final String VALASEN_START_DRYING_NAME = "DryingStarted";
public static final String VALASEN_STOP_DRYING_NAME = "CalculatedStop";
public static final String VALASEN_KILIN_NAME = "KilnName";
public static int VALASEN_KILIN_ID = 5; // Kammer 5
//public static int VALASEN_KILIN_ID = 6; // Kammer 6
public static final int VALASEN_LIMIT = 1000;
// Winccsensordata
public static final String KWH_NAME = "VariantValue";
public static final String TIMESTAMP_NAME = "Timestamp";
public static final String VALUE_ID_NAME = "ValueID";
public static final int VALUE_ID = 51; // Kammer 5
//public static final int VALUE_ID = 56; // Kammer 6
public static final String VALASEN_KWH_NAME = "VariantValue";
public static final String VALASEN_TIMESTAMP_NAME = "Timestamp";
public static final String VALASEN_VALUE_ID_NAME = "ValueID";
public static final int VALASEN_VALUE_ID = 51; // Kammer 5
//public static final int VALASEN_VALUE_ID = 56; // Kammer 6
/*
// Location Arjang(174)
// Project settings
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";
public static final int ARJANG_LOCATION_ID = 174;
public static final String ARJANG_TABLE_NAME_VALMATICS = "int_dk_valmaticsdryingbatches";
public static final String ARJANG_TABLE_NAME_KWH = "int_sd_swappconsensordata";
// Parameters settings
// Valmatics
public static final String NAME_PARAMATERS = "Name";
public static final String START_DRYING_NAME = "DryingStarted";
public static final String STOP_DRYING_NAME = "DryingCompleted";
public static final String KILIN_NAME = "KilinId";
public static int KILIN_ID = 18;
//public static int KILIN_ID = 18554;
public static final int LIMIT = 1000;
public static final String ARJANG_NAME_PARAMATERS = "Name";
public static final String ARJANG_START_DRYING_NAME = "DryingStarted";
public static final String ARJANG_STOP_DRYING_NAME = "DryingCompleted";
public static final String ARJANG_KILIN_NAME = "KilinId";
public static int ARJANG_KILIN_ID = 18;
//public static int ARJANG_KILIN_ID = 18554;
public static final int ARJANG_LIMIT = 1000;
// Swappconsensordata
public static final String KWH_NAME = "RealValue";
public static final String TIMESTAMP_NAME = "Timestamp";
public static final String VALUE_ID_NAME = "ValueID";
public static final int VALUE_ID = 19;
public static final String ARJANG_KWH_NAME = "RealValue";
public static final String ARJANG_TIMESTAMP_NAME = "Timestamp";
public static final String ARJANG_VALUE_ID_NAME = "ValueID";
public static final int ARJANG_VALUE_ID = 19;
*/
public static HashMap<Integer, HashMap<String, HashMap<String, String>>> getSawmills(){
HashMap<Integer, HashMap<String, HashMap<String, String>>> sawmillInfo = new HashMap<>();
sawmillInfo.put(VALASEN_LOCATION_ID, getValasenTables());
sawmillInfo.put(ARJANG_LOCATION_ID, getArjangTables());
return sawmillInfo;
}
// Valasen
private static HashMap<String, HashMap<String, String>> getValasenTables(){
HashMap<String, HashMap<String, String>> valasenTables = new HashMap<>();
valasenTables.put(getValasenTableNames().get("Valmetics"), getValasenValmeticsParameters());
valasenTables.put(getValasenTableNames().get("Kwh"), getValasenWinccsensordataParameters());
return valasenTables;
}
public static HashMap<String, String> getValasenTableNames(){
HashMap<String, String> valasenTables = new HashMap<>();
valasenTables.put("Valmetics", VALASEN_TABLE_NAME_VALMATICS);
valasenTables.put("Kwh", VALASEN_TABLE_NAME_KWH);
return valasenTables;
}
private static HashMap<String, String> getValasenValmeticsParameters(){
HashMap<String, String> valasenValmeticsParameters = new HashMap<>();
valasenValmeticsParameters.put("Name", VALASEN_NAME_PARAMATERS);
valasenValmeticsParameters.put("DryingStarted", VALASEN_START_DRYING_NAME);
valasenValmeticsParameters.put("DryingStopped", VALASEN_STOP_DRYING_NAME);
valasenValmeticsParameters.put("KilnName", VALASEN_KILIN_NAME);
valasenValmeticsParameters.put("KilinID", String.valueOf(VALASEN_KILIN_ID));
valasenValmeticsParameters.put("Limit", String.valueOf(VALASEN_LIMIT));
return valasenValmeticsParameters;
}
private static HashMap<String, String> getValasenWinccsensordataParameters(){
HashMap<String, String> valasenWinccsensordataParameters = new HashMap<>();
valasenWinccsensordataParameters.put("KwhName", VALASEN_KWH_NAME);
valasenWinccsensordataParameters.put("Timestamp", VALASEN_TIMESTAMP_NAME);
valasenWinccsensordataParameters.put("ValueIDName", VALASEN_VALUE_ID_NAME);
valasenWinccsensordataParameters.put("ValueID", String.valueOf(VALASEN_VALUE_ID));
return valasenWinccsensordataParameters;
}
// Arjang
private static HashMap<String, HashMap<String, String>> getArjangTables(){
HashMap<String, HashMap<String, String>> arjangTables = new HashMap<>();
arjangTables.put(getArjangTableNames().get("Valmetics"), getArjangValmeticsParameters());
arjangTables.put(getArjangTableNames().get("Kwh"), getArjangWinccsensordataParameters());
return arjangTables;
}
public static HashMap<String, String> getArjangTableNames(){
HashMap<String, String> valasenTables = new HashMap<>();
valasenTables.put("Valmetics", ARJANG_TABLE_NAME_VALMATICS);
valasenTables.put("Kwh", ARJANG_TABLE_NAME_KWH);
return valasenTables;
}
private static HashMap<String, String> getArjangValmeticsParameters(){
HashMap<String, String> arjangValmeticsParameters = new HashMap<>();
arjangValmeticsParameters.put("Name", ARJANG_NAME_PARAMATERS);
arjangValmeticsParameters.put("DryingStarted", ARJANG_START_DRYING_NAME);
arjangValmeticsParameters.put("DryingStopped", ARJANG_STOP_DRYING_NAME);
arjangValmeticsParameters.put("KilnName", ARJANG_KILIN_NAME);
arjangValmeticsParameters.put("KilinID", String.valueOf(ARJANG_KILIN_ID));
arjangValmeticsParameters.put("Limit", String.valueOf(ARJANG_LIMIT));
return arjangValmeticsParameters;
}
private static HashMap<String, String> getArjangWinccsensordataParameters(){
HashMap<String, String> arjangWinccsensordataParameters = new HashMap<>();
arjangWinccsensordataParameters.put("KwhName", ARJANG_KWH_NAME);
arjangWinccsensordataParameters.put("Timestamp", ARJANG_TIMESTAMP_NAME);
arjangWinccsensordataParameters.put("ValueIDName", ARJANG_VALUE_ID_NAME);
arjangWinccsensordataParameters.put("ValueID", String.valueOf(ARJANG_VALUE_ID));
return arjangWinccsensordataParameters;
}
}
src/main/java/com/application/DB/DB.java
+ 165
− 143
View file @ 7ca44641
This diff is collapsed.
src/main/java/com/application/GUI/LineChartFunctionality.java
+ 0
− 1
View file @ 7ca44641
......@@ -53,7 +53,6 @@ public class LineChartFunctionality {
for (Map.Entry<Integer, Map<String, Number>> entryKwh : userInput.entrySet()) {
Map data = entryKwh.getValue();
//System.out.println(data.size());
XYChart.Series<String, Number> newSeries = new XYChart.Series<String, Number>();
int index = 0;
for (Object entryData : data.entrySet()) {
......
src/main/java/com/application/Main.java
+ 3
− 0
View file @ 7ca44641
package com.application;
import com.application.DB.Constants;
import com.application.GUI.InputPopUpWindow;
import com.application.GUI.OutputPopUpWindow;
import com.application.GUI.RingProgressIndicator;
......@@ -121,6 +122,8 @@ public class Main extends Application {
// Displays the input parameters popup window
InputPopUpWindow.display();
System.out.println(Constants.getSawmills());
}
/**
......
target/classes/com/application/DB/DB.class
+ 0
− 0
View file @ 7ca44641
No preview for this file type
target/classes/com/application/Main$1WorkerThread.class
+ 0
− 0
View file @ 7ca44641
No preview for this file type
target/classes/com/application/Main.class
+ 0
− 0
View file @ 7ca44641
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment