diff --git a/src/main/java/DataImport.java b/src/main/java/DataImport.java
new file mode 100644
index 0000000..48c939c
--- /dev/null
+++ b/src/main/java/DataImport.java
@@ -0,0 +1,88 @@
+import java.sql.*;
+import java.time.LocalDateTime;
+import java.util.Locale;
+
+import static java.lang.Thread.sleep;
+
+public class DataImport {
+ MonitoringPanel test = new MonitoringPanel();
+
+ public DataImport() throws InterruptedException {
+ dataImport1();
+ }
+
+ private void dataImport1() throws InterruptedException {
+ String url = "jdbc:mysql://34.159.157.247/monitoringDatenbank";
+ String user = "root";
+ String pass = "OA6I2K76r7BzEIGC";
+ String cpuFrequenz1 = "";
+ String cpuTemperatur1 = "";
+ String cpuFrequenz2 = "";
+ String cpuTemperatur2 = "";
+
+ while (true == true) {
+ sleep(10);
+ try {
+ Connection con = DriverManager.getConnection(url, user, pass);
+
+ Statement stm1 = con.createStatement();
+ ResultSet rs1 = stm1.executeQuery("SELECT * FROM entries ORDER BY entryID DESC LIMIT 1;");
+
+ Statement stm2 = con.createStatement();
+ ResultSet rs2 = stm2.executeQuery("SELECT * FROM entries2 ORDER BY entryID DESC LIMIT 1;");
+
+ while (rs1.next() && rs2.next()) {
+ long now = System.currentTimeMillis();
+ Timestamp sqlTimestamp = new Timestamp(now);
+
+
+ if ( Timestamp.valueOf( rs1.getString(3)).before( Timestamp.valueOf(LocalDateTime.now().minusMinutes(1).minusHours(1)))){
+
+ cpuTemperatur1= "offline";
+ cpuFrequenz1 = "offline";
+ } else {
+ cpuTemperatur1 = rs1.getString(1);
+ cpuFrequenz1 = rs1.getString(2);
+ System.out.println(rs1.getString(3));
+
+ }
+ if (Timestamp.valueOf( rs2.getString(3)).before(Timestamp.valueOf(LocalDateTime.now().minusMinutes(1).minusHours(1)))){
+
+ cpuTemperatur2= "offline";
+ cpuFrequenz2 = "offline";
+ } else {
+ cpuTemperatur2 = rs2.getString(1);
+ cpuFrequenz2 = rs2.getString(2);
+ System.out.println(rs2.getString(3));
+
+ }
+
+ // cpuTemperatur2 = rs2.getString(1);
+ // cpuFrequenz2 = rs2.getString(2);
+
+ //System.out.println(rs2.getString(3));
+
+
+ doWrite(cpuTemperatur1, cpuFrequenz1, cpuTemperatur2, cpuFrequenz2);
+ }
+ } catch (SQLException e) {
+ System.out.println(e.getMessage());
+ }
+ }
+ }
+
+ private void doWrite(String cpuTemp1, String cpuFrequenz1, String cpuTemp2, String cpuFrequenz2) {
+
+
+
+
+ test.doFill(cpuTemp1, cpuFrequenz1, cpuTemp2, cpuFrequenz2);
+
+ System.out.println("TEmp1" + cpuTemp1);
+ System.out.println("GHZ1" + cpuFrequenz1);
+ System.out.println("TEmp2" + cpuTemp2);
+ System.out.println("Ghz2" + cpuFrequenz2);
+
+
+ }
+}
diff --git a/src/main/java/Main.java b/src/main/java/Main.java
new file mode 100644
index 0000000..eaf0dd5
--- /dev/null
+++ b/src/main/java/Main.java
@@ -0,0 +1,10 @@
+public class Main {
+ public static void main(String[] args) throws InterruptedException {
+
+ String url = "jdbc:mysql://34.159.157.247/datenbank";
+ String user = "root";
+ String pass = "OA6I2K76r7BzEIGC";
+ new DataImport();
+
+ }
+}
diff --git a/src/main/java/MonitoringPanel.java b/src/main/java/MonitoringPanel.java
index 7268514..995fec9 100644
--- a/src/main/java/MonitoringPanel.java
+++ b/src/main/java/MonitoringPanel.java
@@ -2,53 +2,78 @@
import java.awt.*;
public class MonitoringPanel extends JFrame {
-private String CpuTemp1 = "10" ;
-private String CpuGhz1 ="1.2";
+ private JLabel labelPI1 = new JLabel("PI 1");
+ private JLabel labelPI2 = new JLabel("PI 2 ");
+ private JLabel labelCPUTemp1 = new JLabel("CPU Temperatur:");
+ private JLabel labelCPUFrequenz1 = new JLabel("CPU GHz:");
+ private JLabel labelCPUTemp2 = new JLabel("CPU Temperatur:");
+ private JLabel labelCPUFrequenz2 = new JLabel("CPU GHz:");
+
+ private TextField textboxCPUTemp1 = new TextField();
+ private TextField textboxCPUFrequenz1 = new TextField();
+ private TextField textboxCPUTemp2 = new TextField();
+ private TextField textboxCPUFrequenz2 = new TextField();
+ private JLabel labelTEst= new JLabel("");
- public MonitoringPanel() throws HeadlessException {
- MainFrameErzeugen();
+ public MonitoringPanel() throws HeadlessException {
+ generateFrame();
}
+ private JFrame generateFrame() {
+ JFrame frame = new JFrame();
+ frame.setSize(500, 500);
+ frame.setVisible(true);
+ frame.setTitle("Monitoring :)");
- private JPanel generateAreaPIOneFrame(){
- JPanel panel1 = new JPanel();
- Label labelTitle = new Label("Rasperry Pi 1 ");
+ labelCPUTemp1.setBounds(10, 150, 100, 20);
- Label labelCPUTemp = new Label("CPU");
- labelCPUTemp.setBounds(20,10,20,10);
- TextField textFieldCPUTemp1 = new TextField();
- textFieldCPUTemp1.setText(CpuTemp1);
- textFieldCPUTemp1.setBounds(60,10,20,10);
+ textboxCPUTemp1.setEditable(false);
+ textboxCPUTemp1.setBounds(120, 150, 50, 20);
- Label labelCPUGHz = new Label("GHz");
- labelCPUGHz.setBounds(20,30,20,10);
- TextField textFieldCPUGHz = new TextField();
- textFieldCPUGHz.setText(CpuGhz1);
- textFieldCPUGHz.setBounds(60,30,20,10);
+ labelCPUFrequenz1.setBounds(10, 180, 100, 20);
- panel1.setSize(150,300);
- panel1.add(labelTitle);
- //panel1.setLayout(new SpringLayout());
- panel1.add(labelCPUTemp);
- panel1.add(textFieldCPUTemp1);
- panel1.add(labelCPUGHz);
- panel1.add(textFieldCPUGHz);
+ textboxCPUFrequenz1.setEditable(false);
+ textboxCPUFrequenz1.setBounds(120, 180, 50, 20);
- panel1.setVisible(true);
- return panel1;
+ labelPI1.setFont(new Font("Dialog", Font.BOLD, 20));
+ labelPI1.setBounds(100, 70, 100, 30);
- }
+ labelCPUTemp2.setBounds(300,150,100,20);
+
+ textboxCPUTemp2.setEditable(false);
+ textboxCPUTemp2.setBounds(410,150,50,20);
+
+ labelCPUFrequenz2.setBounds(300,180,100,20);
+
+ labelPI2.setFont(new Font("Dialog", Font.BOLD, 20));
+ labelPI2.setBounds(390,70,100,20);
+
+ textboxCPUFrequenz2.setEditable(false);
+ textboxCPUFrequenz2.setBounds(410,180,50,20);
+
+ frame.add(textboxCPUFrequenz1);
+ frame.add(labelCPUFrequenz1);
+ frame.add(textboxCPUTemp1);
+ frame.add(labelCPUTemp1);
+ frame.add(labelPI1);
+ frame.add(labelCPUFrequenz2);
+ frame.add(textboxCPUFrequenz2);
+ frame.add(textboxCPUTemp2);
+ frame.add(labelCPUTemp2);
+ frame.add(labelPI2);
+ frame.add(labelTEst);
- private JFrame MainFrameErzeugen(){
- JFrame frame = new JFrame();
- JPanel panel1 = generateAreaPIOneFrame();
- panel1.setBounds(20,20,150,300);
- frame.setSize(500,500);
- frame.setTitle("Monitoring :) ");
- frame.setVisible(true);
- frame.add(panel1);
return frame;
}
-}
+
+ public void doFill(String cpuTemp1, String cpuFrequenz1, String cpuTemp2, String cpuFrequenz2) {
+ textboxCPUTemp1.setText(cpuTemp1);
+ textboxCPUFrequenz1.setText(cpuFrequenz1);
+ textboxCPUTemp2.setText(cpuTemp2);
+ textboxCPUFrequenz2.setText(cpuFrequenz2);
+
+
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/main.java b/src/main/java/main.java
deleted file mode 100644
index f8d9d7d..0000000
--- a/src/main/java/main.java
+++ /dev/null
@@ -1,34 +0,0 @@
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-
-public class main {
- public static void main(String[] args){
-new MonitoringPanel();
-
- String url = "jdbc:mysql://34.159.157.247/datenbank";
- String user = "root";
- String pass = "OA6I2K76r7BzEIGC";
-
- try {
- Connection con = DriverManager.getConnection(url, user, pass);
- Statement stm = con.createStatement();
- ResultSet rs = stm.executeQuery("select * from entries;");
-
-
- while(rs.next()){
- System.out.println(rs.getString(1) + " " +
- rs.getString(2) + " " +
- rs.getString(3));
- }
-
- } catch (SQLException e) {
- System.out.println(e.getMessage());
- }
- }
-
-
-}
diff --git a/target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar b/target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar
index be13b68..ec07fe4 100644
Binary files a/target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar and b/target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar differ
diff --git a/target/classes/MonitoringPanel.class b/target/classes/MonitoringPanel.class
index aaa054c..a3a7c58 100644
Binary files a/target/classes/MonitoringPanel.class and b/target/classes/MonitoringPanel.class differ
diff --git a/target/classes/dataImport.class b/target/classes/dataImport.class
new file mode 100644
index 0000000..ceb2468
Binary files /dev/null and b/target/classes/dataImport.class differ
diff --git a/target/classes/main.class b/target/classes/main.class
index d16d8d5..65f1d99 100644
Binary files a/target/classes/main.class and b/target/classes/main.class differ
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
index 7d2dec5..be129f3 100644
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven
-#Wed Feb 23 11:51:12 CET 2022
+#Wed Mar 02 11:34:36 CET 2022
groupId=org.example
artifactId=BerufsschuleLernfeld8
version=1.0-SNAPSHOT
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 6dd4a8d..41ad677 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,2 +1,3 @@
+Main.class
MonitoringPanel.class
-main.class
+DataImport.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index a9ff4ca..f7c1560 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,2 +1,3 @@
-C:\Users\Student\IdeaProjects\PiMonitoringGUI\src\main\java\main.java
+C:\Users\Student\IdeaProjects\PiMonitoringGUI\src\main\java\DataImport.java
+C:\Users\Student\IdeaProjects\PiMonitoringGUI\src\main\java\Main.java
C:\Users\Student\IdeaProjects\PiMonitoringGUI\src\main\java\MonitoringPanel.java
diff --git a/target/surefire-reports/TEST-AClassWithOneUnitTest.xml b/target/surefire-reports/TEST-AClassWithOneUnitTest.xml
index 6f48a82..2cfbdfb 100644
--- a/target/surefire-reports/TEST-AClassWithOneUnitTest.xml
+++ b/target/surefire-reports/TEST-AClassWithOneUnitTest.xml
@@ -14,7 +14,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
@@ -49,7 +49,7 @@
-
+