Bsl 10 java gui PR

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);
+
+
+    }
+}

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();
+
+        }
+}

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);
+
+
+    }
+}

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

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,2 +1,3 @@
+Main.class
 MonitoringPanel.class
-main.class
+DataImport.class

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

target/surefire-reports/TEST-AClassWithOneUnitTest.xml

@@ -14,7 +14,7 @@
     <property name="sun.java.launcher" value="SUN_STANDARD"/>
     <property name="user.country" value="DE"/>
     <property name="sun.boot.library.path" value="C:\Users\Student\.jdks\openjdk-17.0.2\bin"/>
-    <property name="sun.java.command" value="C:\Users\Student\AppData\Local\Temp\surefire9612946115327550556\surefirebooter17361162344249526961.jar C:\Users\Student\AppData\Local\Temp\surefire9612946115327550556 2022-02-24T11-47-36_643-jvmRun1 surefire3008013959731816690tmp surefire_016620186306127234819tmp"/>
+    <property name="sun.java.command" value="C:\Users\Student\AppData\Local\Temp\surefire14187283504041610244\surefirebooter942049465884221427.jar C:\Users\Student\AppData\Local\Temp\surefire14187283504041610244 2022-03-03T12-39-57_243-jvmRun1 surefire9648913277114994304tmp surefire_013940205482898999060tmp"/>
     <property name="jdk.debug" value="release"/>
     <property name="surefire.test.class.path" value="C:\Users\Student\IdeaProjects\PiMonitoringGUI\target\test-classes;C:\Users\Student\IdeaProjects\PiMonitoringGUI\target\classes;C:\Users\Student\.m2\repository\mysql\mysql-connector-java\8.0.25\mysql-connector-java-8.0.25.jar;C:\Users\Student\.m2\repository\com\google\protobuf\protobuf-java\3.11.4\protobuf-java-3.11.4.jar;C:\Users\Student\.m2\repository\org\junit\jupiter\junit-jupiter-api\5.7.0\junit-jupiter-api-5.7.0.jar;C:\Users\Student\.m2\repository\org\apiguardian\apiguardian-api\1.1.0\apiguardian-api-1.1.0.jar;C:\Users\Student\.m2\repository\org\opentest4j\opentest4j\1.2.0\opentest4j-1.2.0.jar;C:\Users\Student\.m2\repository\org\junit\platform\junit-platform-commons\1.7.0\junit-platform-commons-1.7.0.jar;"/>
     <property name="sun.cpu.endian" value="little"/>
@@ -29,7 +29,7 @@
     <property name="line.separator" value="&#10;"/>
     <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
     <property name="java.specification.name" value="Java Platform API Specification"/>
-    <property name="surefire.real.class.path" value="C:\Users\Student\AppData\Local\Temp\surefire9612946115327550556\surefirebooter17361162344249526961.jar"/>
+    <property name="surefire.real.class.path" value="C:\Users\Student\AppData\Local\Temp\surefire14187283504041610244\surefirebooter942049465884221427.jar"/>
     <property name="user.script" value=""/>
     <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
     <property name="java.runtime.version" value="17.0.2+8-86"/>
@@ -49,7 +49,7 @@
     <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
     <property name="sun.os.patch.level" value=""/>
     <property name="native.encoding" value="Cp1252"/>
-    <property name="java.library.path" value="C:\Users\Student\.jdks\openjdk-17.0.2\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\ProgramData\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Users\Student\AppData\Local\Microsoft\WindowsApps;C:\Users\Student\AppData\Local\Programs\Git\cmd;."/>
+    <property name="java.library.path" value="C:\Users\Student\.jdks\openjdk-17.0.2\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\ProgramData\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Users\Student\AppData\Local\Microsoft\WindowsApps;C:\Users\Student\AppData\Local\Programs\Git\cmd;C:\Users\Student\AppData\Local\atom\bin;."/>
     <property name="java.vm.info" value="mixed mode, sharing"/>
     <property name="java.vendor" value="Oracle Corporation"/>
     <property name="java.vm.version" value="17.0.2+8-86"/>