From c8ba1c314d89103f644ac4cfb01c0bd6c03dc927 Mon Sep 17 00:00:00 2001 From: Tom Kunde Date: Mon, 28 Feb 2022 11:38:41 +0100 Subject: [PATCH 1/8] ANsatz ist da funktionoren so lala --- src/main/java/MonitoringPanel.java | 63 +++++++----------- src/main/java/dataImport.java | 27 ++++++++ src/main/java/main.java | 4 +- target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar | Bin 4115 -> 5171 bytes target/classes/MonitoringPanel.class | Bin 1670 -> 1486 bytes target/classes/main.class | Bin 2055 -> 2055 bytes .../compile/default-compile/createdFiles.lst | 1 + .../AClassWithOneUnitTest.txt | 2 +- .../TEST-AClassWithOneUnitTest.xml | 6 +- 9 files changed, 58 insertions(+), 45 deletions(-) create mode 100644 src/main/java/dataImport.java diff --git a/src/main/java/MonitoringPanel.java b/src/main/java/MonitoringPanel.java index 7268514..beec745 100644 --- a/src/main/java/MonitoringPanel.java +++ b/src/main/java/MonitoringPanel.java @@ -2,53 +2,38 @@ import java.awt.*; public class MonitoringPanel extends JFrame { -private String CpuTemp1 = "10" ; -private String CpuGhz1 ="1.2"; + private JLabel labelCPUTemp = new JLabel("CPU Temperatur:"); + private JLabel labelCPUFrequenz = new JLabel("CPU GHz:"); + private TextField textboxCPUTemp1 = new TextField(); + private TextField CPUFrwquenz1 = new TextField(); - 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 :)"); + JPanel panel1 = generateSubPanel1(); + frame.add(panel1); + panel1.setBounds(0,50,150,400); - private JPanel generateAreaPIOneFrame(){ - JPanel panel1 = new JPanel(); - Label labelTitle = new Label("Rasperry Pi 1 "); - - Label labelCPUTemp = new Label("CPU"); - labelCPUTemp.setBounds(20,10,20,10); - TextField textFieldCPUTemp1 = new TextField(); - textFieldCPUTemp1.setText(CpuTemp1); - textFieldCPUTemp1.setBounds(60,10,20,10); - - Label labelCPUGHz = new Label("GHz"); - labelCPUGHz.setBounds(20,30,20,10); - TextField textFieldCPUGHz = new TextField(); - textFieldCPUGHz.setText(CpuGhz1); - textFieldCPUGHz.setBounds(60,30,20,10); - + return frame; + } + private JPanel generateSubPanel1(){ + JPanel panel1= new JPanel(); - panel1.setSize(150,300); - panel1.add(labelTitle); - //panel1.setLayout(new SpringLayout()); + textboxCPUTemp1.setEditable(false); + textboxCPUTemp1.setBounds(60,50, 50,10); + labelCPUTemp.setBounds(10,50,50,10); panel1.add(labelCPUTemp); - panel1.add(textFieldCPUTemp1); - panel1.add(labelCPUGHz); - panel1.add(textFieldCPUGHz); + panel1.add(textboxCPUTemp1); + labelCPUFrequenz.setBounds(10,70,50,10); + panel1.add(labelCPUFrequenz); - panel1.setVisible(true); return panel1; - - } - - 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; } } diff --git a/src/main/java/dataImport.java b/src/main/java/dataImport.java new file mode 100644 index 0000000..dd05673 --- /dev/null +++ b/src/main/java/dataImport.java @@ -0,0 +1,27 @@ +import java.sql.*; + +public class dataImport{ + + public dataImport(){ + String url = "jdbc:mysql://34.159.157.247/datenbank"; + String user = "root"; + String pass = "OA6I2K76r7BzEIGC"; +String cpuFrequenz1 =""; +String cpuTemperatur1 = ""; + 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/src/main/java/main.java b/src/main/java/main.java index f8d9d7d..9d5467f 100644 --- a/src/main/java/main.java +++ b/src/main/java/main.java @@ -5,10 +5,10 @@ import java.sql.SQLException; + public class main { public static void main(String[] args){ -new MonitoringPanel(); - + new MonitoringPanel(); String url = "jdbc:mysql://34.159.157.247/datenbank"; String user = "root"; String pass = "OA6I2K76r7BzEIGC"; diff --git a/target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar b/target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar index be13b68ccd4a1bf00000a789085b84ad55409404..1a0baaab87e517ee0094baf5ce90e2ca3d033c96 100644 GIT binary patch delta 3489 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 diff --git a/target/classes/main.class b/target/classes/main.class index d16d8d56dad267add3572a3f734551faf31b3a60..2059321dad74a6b989cafdf19d962a5744e77286 100644 GIT binary patch delta 19 acmZn{XcyQ}z{bcqxsYuwBll!^_7?y++6BV^ delta 19 acmZn{XcyQ}z{bcixsYuwBiCek_7?y+$_2py 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..5a913eb 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 @@ MonitoringPanel.class +dataImport.class main.class diff --git a/target/surefire-reports/AClassWithOneUnitTest.txt b/target/surefire-reports/AClassWithOneUnitTest.txt index ea5b7e6..822e7b6 100644 --- a/target/surefire-reports/AClassWithOneUnitTest.txt +++ b/target/surefire-reports/AClassWithOneUnitTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: AClassWithOneUnitTest ------------------------------------------------------------------------------- -Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.015 s - in AClassWithOneUnitTest +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 s - in AClassWithOneUnitTest diff --git a/target/surefire-reports/TEST-AClassWithOneUnitTest.xml b/target/surefire-reports/TEST-AClassWithOneUnitTest.xml index 6f48a82..840a93f 100644 --- a/target/surefire-reports/TEST-AClassWithOneUnitTest.xml +++ b/target/surefire-reports/TEST-AClassWithOneUnitTest.xml @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ - + @@ -29,7 +29,7 @@ - + From 209809b79c80d444ceb627a73280716bb9708e97 Mon Sep 17 00:00:00 2001 From: Tom Kunde Date: Mon, 28 Feb 2022 13:08:39 +0100 Subject: [PATCH 2/8] Auslesen --- src/main/java/dataImport.java | 42 ++++++++++++------- src/main/java/main.java | 22 ++-------- .../compile/default-compile/inputFiles.lst | 1 + 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/src/main/java/dataImport.java b/src/main/java/dataImport.java index dd05673..7731ccc 100644 --- a/src/main/java/dataImport.java +++ b/src/main/java/dataImport.java @@ -1,27 +1,41 @@ import java.sql.*; +import static java.lang.Thread.sleep; + public class dataImport{ - public dataImport(){ - String url = "jdbc:mysql://34.159.157.247/datenbank"; + public dataImport() throws InterruptedException { + String url = "jdbc:mysql://34.159.157.247/monitoringDatenbank"; String user = "root"; String pass = "OA6I2K76r7BzEIGC"; -String cpuFrequenz1 =""; -String cpuTemperatur1 = ""; - try { - Connection con = DriverManager.getConnection(url, user, pass); - Statement stm = con.createStatement(); - ResultSet rs = stm.executeQuery("select * from entries;"); - + String cpuFrequenz1 = ""; + String cpuTemperatur1 = ""; + while (true == true) { + sleep (10); + try { + Connection con = DriverManager.getConnection(url, user, pass); + Statement stm = con.createStatement(); + ResultSet rs = stm.executeQuery("SELECT * FROM entries ORDER BY entryID DESC LIMIT 1;"); - while(rs.next()){ - System.out.println(rs.getString(1) + " " + - rs.getString(2) + " " + - rs.getString(3)); + while (rs.next()) { + // System.out.println(rs.getString(1) + " " + + // rs.getString(2) + " " + + // rs.getString(3)); + cpuTemperatur1 = rs.getString(1); + cpuFrequenz1 = rs.getString(2); + } + doWrite(cpuTemperatur1, cpuFrequenz1); } - } catch (SQLException e) { + catch(SQLException e){ System.out.println(e.getMessage()); } } + } + private void doWrite(String cpuTemp, String cpuFrequenz){ + + System.out.println(cpuTemp); + System.out.println(cpuFrequenz); + + } } diff --git a/src/main/java/main.java b/src/main/java/main.java index 9d5467f..d9158a9 100644 --- a/src/main/java/main.java +++ b/src/main/java/main.java @@ -7,28 +7,12 @@ public class main { - public static void main(String[] args){ - new MonitoringPanel(); + public static void main(String[] args) throws InterruptedException { + // new MonitoringPanel(); String url = "jdbc:mysql://34.159.157.247/datenbank"; String user = "root"; String pass = "OA6I2K76r7BzEIGC"; + new dataImport(); - 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/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index a9ff4ca..05fdfc5 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\dataImport.java C:\Users\Student\IdeaProjects\PiMonitoringGUI\src\main\java\main.java C:\Users\Student\IdeaProjects\PiMonitoringGUI\src\main\java\MonitoringPanel.java From c10a19a31aaeb76fdb95a08b91eddd994f7e1934 Mon Sep 17 00:00:00 2001 From: Tom Kunde Date: Tue, 1 Mar 2022 11:39:25 +0100 Subject: [PATCH 3/8] Auslesen --- src/main/java/MonitoringPanel.java | 12 ++++- src/main/java/dataImport.java | 51 +++++++++++------- target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar | Bin 5171 -> 4932 bytes target/classes/dataImport.class | Bin 0 -> 2876 bytes target/classes/main.class | Bin 2055 -> 607 bytes .../AClassWithOneUnitTest.txt | 6 ++- .../TEST-AClassWithOneUnitTest.xml | 12 +++-- 7 files changed, 56 insertions(+), 25 deletions(-) create mode 100644 target/classes/dataImport.class diff --git a/src/main/java/MonitoringPanel.java b/src/main/java/MonitoringPanel.java index beec745..d5052db 100644 --- a/src/main/java/MonitoringPanel.java +++ b/src/main/java/MonitoringPanel.java @@ -5,7 +5,9 @@ public class MonitoringPanel extends JFrame { private JLabel labelCPUTemp = new JLabel("CPU Temperatur:"); private JLabel labelCPUFrequenz = new JLabel("CPU GHz:"); private TextField textboxCPUTemp1 = new TextField(); - private TextField CPUFrwquenz1 = new TextField(); + private TextField textboxCPUFrequenz1 = new TextField(); + private TextField textboxCPUTemp2 = new TextField(); + private TextField textboxCPUFrequenz2 = new TextField(); public MonitoringPanel() throws HeadlessException { @@ -36,4 +38,10 @@ private JPanel generateSubPanel1(){ return panel1; } -} + private void doFill(String cpuTemp1, String cpuTemp2, String cpuFrequenz1, String cpuFrequenz2 ){ +textboxCPUTemp1.setText(cpuTemp1); + + + + } +} \ No newline at end of file diff --git a/src/main/java/dataImport.java b/src/main/java/dataImport.java index 7731ccc..071a6ef 100644 --- a/src/main/java/dataImport.java +++ b/src/main/java/dataImport.java @@ -5,37 +5,52 @@ public class dataImport{ 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); + sleep(10); try { Connection con = DriverManager.getConnection(url, user, pass); - Statement stm = con.createStatement(); - ResultSet rs = stm.executeQuery("SELECT * FROM entries ORDER BY entryID DESC LIMIT 1;"); - - while (rs.next()) { - // System.out.println(rs.getString(1) + " " + - // rs.getString(2) + " " + - // rs.getString(3)); - cpuTemperatur1 = rs.getString(1); - cpuFrequenz1 = rs.getString(2); + + 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()) { + + cpuTemperatur1 = rs1.getString(1); + cpuFrequenz1 = rs1.getString(2); + + cpuTemperatur2 = rs2.getString(2); + cpuFrequenz2 = rs2.getString(1); + } - doWrite(cpuTemperatur1, cpuFrequenz1); + doWrite(cpuTemperatur1, cpuFrequenz1,cpuTemperatur2,cpuFrequenz2); + } catch (SQLException e) { + System.out.println(e.getMessage()); } - - catch(SQLException e){ - System.out.println(e.getMessage()); } } - } - private void doWrite(String cpuTemp, String cpuFrequenz){ - System.out.println(cpuTemp); - System.out.println(cpuFrequenz); + private void doWrite(String cpuTemp1, String cpuFrequenz1,String cpuTemp2, String cpuFrequenz2){ + + System.out.println("TEmp1"+cpuTemp1); + System.out.println("GHZ1"+cpuFrequenz1); + System.out.println("TEmp2"+cpuTemp2); + System.out.println("Ghz2"+cpuFrequenz2); + } } diff --git a/target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar b/target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar index 1a0baaab87e517ee0094baf5ce90e2ca3d033c96..d0e7b40684c738682600f8b87b58b73cbf1aff17 100644 GIT binary patch delta 2283 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 OAd)zgm&=6rpzB|5{1HF^ delta 2600 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 literal 0 HcmV?d00001 diff --git a/target/classes/main.class b/target/classes/main.class index 2059321dad74a6b989cafdf19d962a5744e77286..12e7d849449d904135956d74b93736b61d67ff64 100644 GIT binary patch delta 358 zcmX|6%Syvg6r4PoG_j8~YJ5~%tGg}?xJWl{R9Xo>K~Mw{LmMQeO-f8f+_>zzlR5}^0I#B+zEC{A<~A*raO6X`C!kvq3~`>E@Xk{}8nRBQ;S^}R>W z9(dus?S_dT$Kz4r_x_h?b`g!^uHOj;z5s3L1>trkK?4Rvz7EU+a!{Df^jxuC=E-Fp zpkaZzFvB@4!kTdvEKy?;_gQ6D(^QX5?Zlir{Xp^h4dts>vLZ4ki{6=s#GfcA(X)&S pBXe&4sj-X|b`mG6s5W_>LctoUw9pvqL=tLTkvXgLG>AoP{sR1JHtGNX literal 2055 zcmb7F-BuG<7~Ll%83=<7&?jl1 zz-xP<#je!{=xtx7SG9YR5R%GrwVCA1%=hi{{qFPSkH6pj4&XNI2mA$-BdTCP#UO?RhHEj=Wa7SK>`N!7Sz1v#0zF0PWo*l0n1*c$<)ug4 zmvC9Z7b@bIXtmvhuoad(VC3xYvo2i0RRvQjrjcl)L;lcZibUB}Vu$J_Gwj4F%j~h( zQY+V-T~{%K8vg0xEFe|6l^_7nt^il2~4It`uT**^hysXA%VT6W<;mldCZ5!}H& z74yglM3{a~x-OY2FnG*~)@T$gu=HikpsQfU-XX3xYglr*S}sUuLo1k+M6%R`5i@b~_(y z=bMGj+f_%Gi-upWF25qvzHwsbIbdAR(JDFV?b5gY@yHu@weA={a+&HYrQ{b&ds}JCG>&a=D z$Y`dSH$2IyvMUf0W4t&bmN*KXjLG^*S3$`i$IWTp=Da;>1*E~~$DuykYANC(?(;9h z{{%qa2y+0asrQbm1XawGO}%9@S(EcuWa5i)9*8D6@Wp^7Jjb zwxW@2RLw=tEMK`g^(*>P!C3GJ!vd*LEEGL=gwX&};aKxGS z?XM$GEwjc3p49y6*rZKCuP^Wop8~b`p7N;!&xp8;;CmWT6g*e(?eTX+!3BkL9)BS* fui%bK^mjxD@ICE-u?T4V6=Co#!lyl$^cwpIJM;_m diff --git a/target/surefire-reports/AClassWithOneUnitTest.txt b/target/surefire-reports/AClassWithOneUnitTest.txt index 822e7b6..2a1a0c5 100644 --- a/target/surefire-reports/AClassWithOneUnitTest.txt +++ b/target/surefire-reports/AClassWithOneUnitTest.txt @@ -1,4 +1,8 @@ ------------------------------------------------------------------------------- Test set: AClassWithOneUnitTest ------------------------------------------------------------------------------- -Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 s - in AClassWithOneUnitTest +Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.015 s <<< FAILURE! - in AClassWithOneUnitTest +test_JUit Time elapsed: 0.015 s <<< FAILURE! +org.opentest4j.AssertionFailedError: expected: <1> but was: + at AClassWithOneUnitTest.test_JUit(Test.java:16) + diff --git a/target/surefire-reports/TEST-AClassWithOneUnitTest.xml b/target/surefire-reports/TEST-AClassWithOneUnitTest.xml index 840a93f..19bb54a 100644 --- a/target/surefire-reports/TEST-AClassWithOneUnitTest.xml +++ b/target/surefire-reports/TEST-AClassWithOneUnitTest.xml @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -56,6 +56,10 @@ - + + but was: + at AClassWithOneUnitTest.test_JUit(Test.java:16) +]]> + \ No newline at end of file From 18e377c5b5a69c7f2af44237fe1a55c4d3a95c35 Mon Sep 17 00:00:00 2001 From: Tom Kunde Date: Tue, 1 Mar 2022 11:39:46 +0100 Subject: [PATCH 4/8] Auslesen --- target/classes/MonitoringPanel.class | Bin 1486 -> 1888 bytes .../test-classes/AClassWithOneUnitTest.class | Bin 705 -> 712 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/target/classes/MonitoringPanel.class b/target/classes/MonitoringPanel.class index eae67bc157d68258832bfe3babc2c3a3f1881911..beb3df204f8cc5e16168166ce00f8f051aae5ec7 100644 GIT binary patch literal 1888 zcma)6Yf~F#6n-`Vl57`9QV1`aU ze(*;)cE*Monehksd-}QKbKcEmfI8z4_C4o4x98m6f8PG}H-JU#>+r!JK#zf5^l6Cx zVE$wtrRy*4>VA4HUo#IZ4SkDt)pqY`@W&Iy0D|Y$3TDZw1fgpf%xyfI*s=}|t(xgJ zY7067FvNAghT(WYoTn=$U2nQIM#v_LAq*lMK*T^4m+4^LVJJt08)nt2XfP_`oqolw zh9TvogHVOe1~IH5D6t=|950B=5d&AmU$||ZuUS7ftm<(9qb>Mp^QD{KvX0!mZB@!T zuEH;t;|8wbI+3^(m7Jqi>cKWsBP zOL#&oH3Bb2O0u(%iXk(*}&fT>T04WvW$TbF{eSN ztZ3KmQibB4_->*Y#7B(ME&s$qLJU4O@QHLUNP{igtylsoYjAWv)evce+H90myI7?Q zz?47%TQcw&KIa&j<+6rkYaXNxIp^TesajPx>t&^i+`ZJ1!-D{p4dn6g{PeZvBt(Gs zokq1>XXeb;%Qy$Wbau_aBT4%bm6pr4Ycg-Se;@;$Nk=B_(-8!MlX97eEDe4I&^KPS`T1H!>HN? z$$iB#%N46$?E|+Ud8tyBz^vqFzsKn$VE8kU>`d63*P5 zK&ZLh>-M*Iy1hrSQc}I=Eu2G0Ai&!7ZvSydX%{S<$AYYCxsjrU5-!R;tq`nW(T__O zmar^8YnfC9x`}aIu~0=;AV`Jk!*2in10^z!MH7CtRZx^O`j%LgFZFx!h2aWAzBMKz zI@l*h*h8Ij?!h1iO7e$MXnB}w9};P}&ixdHfFKz@gju0*5&_J^LJ=X{;Hx#PMgvWv zoBWjCEh;c2-sq~2pf_pqW)yKLvVOb<1}QQQ0rueu6*xYkye33cJ=kWd@)2Lxw8_&>rlj?n2O rM~K2+VsxjuvWT&pN&d+=Bbve%LsB6+!?ym-u{P*laFPwaYS{b@d{SoI diff --git a/target/test-classes/AClassWithOneUnitTest.class b/target/test-classes/AClassWithOneUnitTest.class index 8b3dde47754eb593f7680594b04961e2b610b51d..9f8c96258f8189ffdb4dfdf3c88c2892523ca199 100644 GIT binary patch delta 299 zcmYk0IS#@w5JjH@VKHmMzONM&2vI^!#g%|F06Pf{2_0b=e%I1^KiXPsW<~AiHhy7x h!i$i3yLLgeNE**#tDl&V8Y4-cfpGu%ilGo4MsIn{6_x-1 delta 275 zcmZvXy%NDd6otPe*3U{L65{{2RVt}fT90EqLq_8@bQy&iol&d3hR(Pf28CkJ-m~}I zbI+dDN$Jbua0KRz6TQ}&B7sYlFxkzlT5`Qd5w`Tfk)z0CQQzLIcoPdZ%wR*%&1yxH zmN00`yG>oHsdS7^PdxuN$lTga3Nw9=us482K;|Fx`S eDSg3!lKjHtir;Hqxf}}g8Hn-k0*j$2ZAMSUITW`5 From 003a104f8bf6b5d8b2e97b176f3baaa1742adc5d Mon Sep 17 00:00:00 2001 From: Tom Kunde Date: Wed, 2 Mar 2022 11:53:47 +0100 Subject: [PATCH 5/8] klappt alles so lala --- .../java/{dataImport.java => DataImport.java} | 25 ++++---- src/main/java/{main.java => Main.java} | 14 +---- src/main/java/MonitoringPanel.java | 58 +++++++++++------- target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar | Bin 4932 -> 5287 bytes target/classes/MonitoringPanel.class | Bin 1888 -> 2149 bytes target/classes/dataImport.class | Bin 2876 -> 2997 bytes target/classes/main.class | Bin 607 -> 614 bytes target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/createdFiles.lst | 4 +- .../compile/default-compile/inputFiles.lst | 4 +- .../AClassWithOneUnitTest.txt | 6 +- .../TEST-AClassWithOneUnitTest.xml | 14 ++--- .../test-classes/AClassWithOneUnitTest.class | Bin 712 -> 705 bytes 13 files changed, 64 insertions(+), 63 deletions(-) rename src/main/java/{dataImport.java => DataImport.java} (60%) rename src/main/java/{main.java => Main.java} (50%) diff --git a/src/main/java/dataImport.java b/src/main/java/DataImport.java similarity index 60% rename from src/main/java/dataImport.java rename to src/main/java/DataImport.java index 071a6ef..16b84da 100644 --- a/src/main/java/dataImport.java +++ b/src/main/java/DataImport.java @@ -2,9 +2,10 @@ import static java.lang.Thread.sleep; -public class dataImport{ +public class DataImport { + MonitoringPanel test = new MonitoringPanel(); - public dataImport() throws InterruptedException { + public DataImport() throws InterruptedException { dataImport1(); } @@ -14,8 +15,8 @@ private void dataImport1() throws InterruptedException { String pass = "OA6I2K76r7BzEIGC"; String cpuFrequenz1 = ""; String cpuTemperatur1 = ""; - String cpuFrequenz2= ""; - String cpuTemperatur2= ""; + String cpuFrequenz2 = ""; + String cpuTemperatur2 = ""; while (true == true) { sleep(10); @@ -26,7 +27,7 @@ private void dataImport1() throws InterruptedException { 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;"); + ResultSet rs2 = stm2.executeQuery("SELECT * FROM entries2 ORDER BY entryID DESC LIMIT 1;"); while (rs1.next() && rs2.next()) { @@ -37,19 +38,21 @@ private void dataImport1() throws InterruptedException { cpuFrequenz2 = rs2.getString(1); } - doWrite(cpuTemperatur1, cpuFrequenz1,cpuTemperatur2,cpuFrequenz2); + doWrite(cpuTemperatur1, cpuFrequenz1, cpuTemperatur2, cpuFrequenz2); } catch (SQLException e) { System.out.println(e.getMessage()); } } } - private void doWrite(String cpuTemp1, String cpuFrequenz1,String cpuTemp2, String cpuFrequenz2){ + private void doWrite(String cpuTemp1, String cpuFrequenz1, String cpuTemp2, String cpuFrequenz2) { - System.out.println("TEmp1"+cpuTemp1); - System.out.println("GHZ1"+cpuFrequenz1); - System.out.println("TEmp2"+cpuTemp2); - System.out.println("Ghz2"+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 similarity index 50% rename from src/main/java/main.java rename to src/main/java/Main.java index d9158a9..eaf0dd5 100644 --- a/src/main/java/main.java +++ b/src/main/java/Main.java @@ -1,18 +1,10 @@ -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.Statement; -import java.sql.ResultSet; -import java.sql.SQLException; - - - -public class main { +public class Main { public static void main(String[] args) throws InterruptedException { - // new MonitoringPanel(); + String url = "jdbc:mysql://34.159.157.247/datenbank"; String user = "root"; String pass = "OA6I2K76r7BzEIGC"; - new dataImport(); + new DataImport(); } } diff --git a/src/main/java/MonitoringPanel.java b/src/main/java/MonitoringPanel.java index d5052db..d750a64 100644 --- a/src/main/java/MonitoringPanel.java +++ b/src/main/java/MonitoringPanel.java @@ -2,45 +2,59 @@ import java.awt.*; public class MonitoringPanel extends JFrame { - private JLabel labelCPUTemp = new JLabel("CPU Temperatur:"); - private JLabel labelCPUFrequenz = new JLabel("CPU GHz:"); + 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 getLabelCPUFrequenz2 = 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 { generateFrame(); } - private JFrame generateFrame(){ + + private JFrame generateFrame() { JFrame frame = new JFrame(); - frame.setSize(500,500); + frame.setSize(500, 500); frame.setVisible(true); frame.setTitle("Monitoring :)"); - JPanel panel1 = generateSubPanel1(); - frame.add(panel1); - panel1.setBounds(0,50,150,400); - - return frame; - } - private JPanel generateSubPanel1(){ - JPanel panel1= new JPanel(); + labelCPUTemp1.setBounds(10, 150, 100, 20); textboxCPUTemp1.setEditable(false); - textboxCPUTemp1.setBounds(60,50, 50,10); - labelCPUTemp.setBounds(10,50,50,10); - panel1.add(labelCPUTemp); - panel1.add(textboxCPUTemp1); - labelCPUFrequenz.setBounds(10,70,50,10); - panel1.add(labelCPUFrequenz); - - return panel1; + textboxCPUTemp1.setBounds(120, 150, 50, 20); + + + labelCPUFrequenz1.setBounds(10, 180, 100, 20); + + textboxCPUFrequenz1.setEditable(false); + textboxCPUFrequenz1.setBounds(120, 180, 50, 20); + + labelPI1.setFont(new Font("Dialog", Font.BOLD, 20)); + labelPI1.setBounds(100, 70, 100, 30); + + frame.add(textboxCPUFrequenz1); + frame.add(labelCPUFrequenz1); + frame.add(textboxCPUTemp1); + frame.add(labelCPUTemp1); + frame.add(labelPI1); + frame.add(labelTEst); + + return frame; } - private void doFill(String cpuTemp1, String cpuTemp2, String cpuFrequenz1, String cpuFrequenz2 ){ -textboxCPUTemp1.setText(cpuTemp1); + public void doFill(String cpuTemp1, String cpuFrequenz1, String cpuTemp2, String cpuFrequenz2) { + textboxCPUTemp1.setText(cpuTemp1); + textboxCPUFrequenz1.setText(cpuFrequenz1); +//textboxCPUTemp2.setText(cpuTemp2); +//textboxCPUFrequenz2.setText(cpuFrequenz2); } diff --git a/target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar b/target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar index d0e7b40684c738682600f8b87b58b73cbf1aff17..9c85a8f5e080668870f0e456584db6cdd512ed4c 100644 GIT binary patch delta 3844 zcmZu!2T+sC7LFlw0-;9fO{9a;1!*ExKp>PL9i$k7RO$R81OXAm&>+J%W_Rc8p6{HUJv005*T$2_2fe3703iciG;0f+SSUAv)%hfz z2AEseAna;z`a(n?P&GLS1UvUovG%mqK)XJ2_Y}5uw)XJA8LfNJ8q%Gazp@{->*cy< zW&N_NS5on|R%Qw(S)d|&=Fk`?`@H148Yk>*+4}-Iw(#w1jcn34kAtt+r|pJB8|8}y z?O}nqZ?&maPVBt4)3ZBi86U)$97lL zZT&c+Sj*{}wwbI3sqkCi+2r6c#V_jO3@ps7nreKtdn3`5&_gN;HL8qVh*WD z`H4h%UoZ8I8qLLmJI@>fnVz)Fdc_T(Owu)>W&=I1?vL9ux4IGX(L1H(uTS(vX}2Z6 zMB1B{(7*Q;3wotG8upAVjEj)N z6%3{;A(vlqc|3nk;y3Z81bWDio75@CvP(_*k5z9RcTX|o z=RfvEsS^@dBtD#kzr|G;x>hz2bDHu^ZzV5@e62}!u0gO?ExoA_e>=4APN`;B&Mh>{ zcOUm{-`so9Un7?Q6rwhC>8)2SNx=i7lX-4MhL zci0=7?O^^ryRh#0$+fpWPj@PrHELds8(VF1Pw#pJZ&Jl2Jr!BMSv#!nS1h=)3}4{^ zd(+OOrjDtl$6V5^WMJ{}9%A1KC)TS>n)vh^toCeiHEOI=q1ThaE#;*@4|C052TB&WC zU-0orqPmAK#S{mfNjVeCm2e8u9tKz9-%9`z)F;3d4I%00nMgaA{?xm+VvQZOa>zhd z2)r!13X{ET2s3i8ifp2;qJcqC1?B03&!CebFYxU=2m8<)p}f|UPdRJ;@^$W%*l6~u z8vQP88nYm~(MGjoE?qkMovZ9R2HY|iqVe#`!PxWXqI#V8)64Bwdp=hAGc!Ek7YZ#{ zycYtn8*43O_ut4(z5}Yod#AKJc4(XNtlG|eu?hjeUa6o+Jl^!Mpi< zA`%3Dtn!iZlL+`6%_&%=$Al*Q)D{Tm!|R7Pss)Ga-`)E)5vtslC`q$z>+VuCXBW4% zzh$)n51kZB0T>)is&O7ZL{^`>wo_Uw$xnbS89aHzN=9pvRKCPFq7^cEPlRWs%g-O6 z8QnhrA2sSeHGf~g-d(HP@Uhm*?DuF)Z`#X#lhXFr!iM;0a@x-jB zL)mPL28YR-TVer98`S{l59yGAE@&pa+ZJ4W2?VkSgFqKlq;2iw0{qP|XgzaXS|z$$ zqvkc6rh>wzCrhm{5Ffm%3S)2*ZN^! zf$hDOB-ur{?LrNTR;`+P4g`^<6gOtBPS^3wvzmr_^)1Mk7yGE=X^500$ku+gl!R#A z%}C4k)srh2ZafbZ~s*Oj2oE-U~70zDuBf#^Y4OKLcPLkt?+H>CT;N~%o)S66<*kfVLSfHafP z2GDRE*VlJ6Xj2YB6v=mmG&1fv?&-r=IzNzmE!KIhYpOBYw++WHMx8}5eTx3#yN%iD zeIeE@yE?Ov^B6oGcy~Am1pT6KmX?QRk~V@)$oi!-IgSy)+eehfl6@mmBcW6mxO4ox2zcKt9;f3%B)1E zYxZm%t1qg(vWut3_mbEx_3?1K)DVDM@g!R*&AP04`z~6hu99pO0xwvsc(8~Z=S9DW zJbZu&=0cAA<$H&NBYm>adX*BBOK|xhpJ_sBW5L&UbRb2w9HvYoAJLfaO4?dHlZ)z} zD*j~buwZ4Ps;o*sLNoH2MCRVw1B^gtj%VbDT-Q?to9_7}B9ez@3t`L!?J~f|iCsIT z+cz(a)D91yiG=3I(uICaZ_Z@do42oAsU*crCyl}KFMm&acgNMk#_wh_{0j?)?=FgD zI8jPqML*UB_)G5wTidOzk))SDO!UE90)1Ui2(O4fn!0m4*TrZ7EoW6=*6_ek3q$6; z$hsx0(I+4mXKwm6LolhPk=soJ=p)*pl=_@4jf&r3XLZ|qlm1yDj zU7|1ZNsF4DS!62h`VgNIqV^iLL@)Ovd;PALCTf>|xYKmn#(h0@CKHv&0i0q}dpqjU zrf)Ps>x_Pfnn^bfl!x;X-$5I5k<)vVZqRGqgaRlA-{ftU*2%N`8Y`c7mcJEx^JS?~ zGt!;1T@i2Dh!{&*%5<}9x;E(R-i#&H z-Q$$KvDqz<-mulpL^(jL4X|2F@su>p=RpH*)e)dw;lb^Wy_BYwuV*D}qK7vb^O&;- zC3Iv}1DaM(f(8j0yW3fEEUfY~qs7OJnbr)Yb|kKeikYb^Uk5D%7Yr;OejCE{4i|nM_s2 zD$-}L`51HY^M6NTq$99z+*%UX6z0tDR~t4nFM0eilcbRp{;`~KF6-7(k+qJUkHN%f zMS30!eC9EM)L#p#klNYi>TMhA>-BglEZ!UCW0`O{e)&wC%Ya6|b>u1UZv72}@$s6b zzj?QG50(E?zw|8yK%-vAE!}T8M1DX|LHI9ko&?Ayf#F!OE-4 zb9YTr8_@b^@-bf$aYGyh;fxjvj$={Ll^gHM^dJ}rN1?lUJd-rD>`P2s8gyyYbGSN> zqqFq*E`y8#om%#B-3cpSGVIv9!sm`VQOTUUBo}7*z3EbW;fGDu&7(QD@5J}CE>VE# z2>wxMSOb{&g+#+f!W6jvpGLb-au+QpxZ`|O!EV5qjQ=0W{&xE9$3grz<^IjM=L!Ft z?{9Mc_apuXbrJs?)`FVb{QSxg|62utsQxivptG|a=y~ir2qhs69aRyu_2UOFBL7S9 z`~Lq0X8IR+7>fNu&G)-F_A-?%#j@oHOUn%$fJznR#d4om&L$;0GD%ko^J#T(+BL=wuKtnZN}| zipqq(t?U( zu8ow2?~ss^-+mdo!>#?=%-ua|0YciVo00i)BChI?5VYM^Klw@3M`V1}GRWmd$<9!b z>OMRz*qMnMTJ9^;i(ji4RGt2O{N)&nm%^S^ohUs4A1OvFjuN&oE>G^Ybt%{nM}Mb% z$ge1&A}~TEJ&!5L^feHComgo@%l$-)Sq-E&qMRXN&66XBk_BZ8KHmUjF>5SIeq3og z!Br%&#cMr2R%|#<++|%}TVad-E|O>IH-=}Gutw{%eGdeP00XNX>qy-4#K731gs#V3 zlnIk$?Q-z>B6|`yvs*Bo7q$#v%4{NtXv!SIgCN(jD_UA=VJYCeTYWtiD?fK93hZhk z#Sd<}?Dwr$`g9D40+lcsUGZhi(t}iTPMQ2+gO-J%4!lNc`gJ4oxz59td}ijaTR}4D z8wUjWm$RI7&=1DDwg?rQ7!KDmDfi;ei8qL7Sb0rSphvxetO-5Ky1Rc;WYx56GF&=)lVYsCDt5pvYYrRvBW<1;6Kvhi z83~b=^yDjrxIOLoGNvRHcSsHr*v=!BvA20!K{OOUgY8;{#m5Qidv61uU1iFb8_DCW zn2cu8GL3g-XrC|^5cGQ zD24X#W=+n2E<-MFRcrKfC&_Cn3FKSD8I58Sl%E8WwUwO3c$FMnL!(8Lg+gN0ab^NWQ&ZR$Y2Uj3?O=?8>W(t1oTbZSs@q>#>_^j9>9&X(h4rBA z32#25NUE$IxW$Swbihx}oz7@=F1v%l&n~Gh1raw0^F@^UhE zdnAA`4zG3gl;P+bXk#4X2_O!a*o=)MEueUWrKd?f**h0?(-u@A;hP2`Nswn#`!HK9 z`Ke3rWLa#GprYwsy5-CQFf33pD-X9_713dpjw|VJSnGXO&EfRMo;3wvqWSxlBm(*Y zp64Awsn+o0I2b(ZhFqTBVmF%hv%6CFUxRnu=(=#|? z;3#`w@D9O_Az9+=WjfVuot$8o9byQOXN?&Cws(IU`gQlTTd4_dkn`Z+@fW2aEUzy< zLh^XxiI6Qpc^p)^9JmwcUv^sGLij1xd>wT6`dB&d3{I5tqXn@tPV*xoDz8{q@*P?= zmV8nThwbcMl#c&o#ah@GpvKYba}#NIaE_}!OM4rI^==d5}Cklbu3R;|#!;C*HS{2T$ne=mrg zdlrMK#$>IrQjeAOiHYY^pjAVL=LZCUbMM9!upNhQ8s9CO_VN=Yt3|15BR$f7%qUuD zDRWI~3=$~s?mqQjJQBDv{UZO=V`H>nBmfoYPpLCnvochSuMr)s4awGsOS7u&|H!_x z>4oHJh-t94K=HLZt#d3{E;gTC{bx$^na+zn$N+$W3$kavNU5G@3Ntkr>u!QJVM9Vx z#HjU9>9~$0Z5ojR%L;0yHZxw55>4aRI&pf}+*;gwDu`e|iO*E+M?8CRu=ZhAHYbNd zSnKq>bN53zl2pmw#^a6V$D0a=Q-^0imj>kk>E-sEp)Twa;M=u%NoNDUwCVG_bz#@WA&Ab^SUnL|zxF@LhwprGiZgBG+UCnia8c1Kdsk04~kW@Y$DJmdNOk!Ar zv%&eGzxH=D7>oUyWrO*#*)XXTJOA@Z@UQ|^tV|G#sr6UaYZCZ z=JLx`4vB!9HFcOzi*92bQ5h!U0cQS69{HW~sEq=o!3<9x{=S^eTV8ZqM>ls+D7B27 z3x>;gx z4c4&}{!c6wHU_Yj4H=(?@8LgRxnsvMpPp9>oz2(_AC2*0P2V?reVuqw9$ZT}BpW|e z^mY@nhTX^9R_agR@EIVL&-VOD)^9DVuZlknA!dFsV<2(&^;=D#=6hBiz=XXU6*{royZl>k>h06*y>bR)qC##?H3k%uz|)p+{GkYAL}wES=AkWsY6S$~BL99ZI%R znU6?o!TK;Mn07-zC{=Q*&7IR*7ZpqTh zZ_bED)_vnFf*x>&HAX1x*etZ(NSZd8Y8y}0ukSgqc<#F`yg)p9%rQndr}^_?Ui`;N z&Cn_3AVIQ=k9o>BknAN^T%~IvrE z{+nSg0{$o7zq#mt3)kOvFH_o>cx^7O%=FK-OQip6!T>lwSEIcsb(*GXA_#pgF?Y0| zqlehv0sas~|1f6zhp`83iXr5B$~`dc9|`gRvym2EE=i>{g9S+sE{Aer0q$;pd!z#V dnYiE!Pazi__LoP%#ZfWz7dA!|8kbTF@GtEDB(MMg diff --git a/target/classes/MonitoringPanel.class b/target/classes/MonitoringPanel.class index beb3df204f8cc5e16168166ce00f8f051aae5ec7..2e047be1130fc06611a00144e7105e4c53f157ea 100644 GIT binary patch literal 2149 zcma)7TT@$A6#h;KB!o>!xVB(vYHiJhHV|v81gn;kLYpEM8l+nFKo0cOkVBJ`g6KHD z`=Gu!zWVBujx@}Oqfd@A{uy6~((UBj{m6o~zG0P2w^AAx&F2)(h-Rk_Kn0PH z`Ei!UqJC?7TkD-ucwY3v4ZTdsdQ!29+hgM81%(U8yre|(qC!+8y=#`MQ>D{}Y08Iq z9lE5s=_VJfEjMFZg?s=pw21X3h091XbC;rJXRDE41BJt8X)zg7NQp^L)1(nkr+P)< zFv7E?mDNJL=K!CEGUAC7C6nmo&VmUwVFiNvSBI7YJ zxT`QL4d$o8g6$S8>AE?Ew{efD^74jLDdx+J#u&9IF)S$Dmna>SPvvdbWEcT|&WCpx zM0cuGCgT)cKOV62Z`x+TSqoqh?@32LG%#>NN7wxO@PWdIFl#RqAFOs=yWy41FWIjs z&Kc`4bhDLj&=3y#u51ZvXB(_2^8E?Tpd^<}HH zAWviXtg~Vka%RaEzJBR-AK3&ZoNa=t$1Y9yr?ytC4cB&xWgj*S4DLfRZJGIkRW9!< zuzIVt^>AcDYXv8Ec_(8RILvoWKK^n~Ic27L7i+M)b)wp-(OZeRBNu$wAg9r&FJt zLVa@L^vRjx*#hE-Hu|;6{RJ<1;OqDYY{2fP-zdcN}6=5bm%&|+r z&qdOXDFkp23J=lA4h^DA_&!4jU!WIXp${L?Qq>-a0@leD`IRR-1c2*=6k#wXH6Xwr zd+;!4Bbx{tfAdqtjfA&~OrraC71{U>hC+cbz6s?+y;ZzLex#*}c{xK{a-Wj>9Qlao z?KJg9>w2T2x6{-M?qPAMd&wIj(C=39K23wP%J4hP2nq6|RV*(G5or)34PvN41RF$J z6F=~g9te1|y5^?{*J<|CAO(xp(Fq$F?{TcpG`jE_l4HMhxm@X5bKINH(x literal 1888 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 but was: - at AClassWithOneUnitTest.test_JUit(Test.java:16) - +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 s - in AClassWithOneUnitTest diff --git a/target/surefire-reports/TEST-AClassWithOneUnitTest.xml b/target/surefire-reports/TEST-AClassWithOneUnitTest.xml index 19bb54a..9e8f4b8 100644 --- a/target/surefire-reports/TEST-AClassWithOneUnitTest.xml +++ b/target/surefire-reports/TEST-AClassWithOneUnitTest.xml @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -49,17 +49,13 @@ - + - - but was: - at AClassWithOneUnitTest.test_JUit(Test.java:16) -]]> - + \ No newline at end of file diff --git a/target/test-classes/AClassWithOneUnitTest.class b/target/test-classes/AClassWithOneUnitTest.class index 9f8c96258f8189ffdb4dfdf3c88c2892523ca199..8b3dde47754eb593f7680594b04961e2b610b51d 100644 GIT binary patch delta 275 zcmZvXy%NDd6otPe*3U{L65{{2RVt}fT90EqLq_8@bQy&iol&d3hR(Pf28CkJ-m~}I zbI+dDN$Jbua0KRz6TQ}&B7sYlFxkzlT5`Qd5w`Tfk)z0CQQzLIcoPdZ%wR*%&1yxH zmN00`yG>oHsdS7^PdxuN$lTga3Nw9=us482K;|Fx`S eDSg3!lKjHtir;Hqxf}}g8Hn-k0*j$2ZAMSUITW`5 delta 299 zcmYk0IS#@w5JjH@VKHmMzONM&2vI^!#g%|F06Pf{2_0b=e%I1^KiXPsW<~AiHhy7x h!i$i3yLLgeNE**#tDl&V8Y4-cfpGu%ilGo4MsIn{6_x-1 From ba29d51560844b13d53e6f52e564d6212f04e374 Mon Sep 17 00:00:00 2001 From: it0-kuenfi Date: Wed, 2 Mar 2022 12:08:01 +0100 Subject: [PATCH 6/8] tEST --- .../TEST-AClassWithOneUnitTest.xml | 61 ------------------- 1 file changed, 61 deletions(-) delete mode 100644 target/surefire-reports/TEST-AClassWithOneUnitTest.xml diff --git a/target/surefire-reports/TEST-AClassWithOneUnitTest.xml b/target/surefire-reports/TEST-AClassWithOneUnitTest.xml deleted file mode 100644 index 9e8f4b8..0000000 --- a/target/surefire-reports/TEST-AClassWithOneUnitTest.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 750f9e90b540bc3db4a415e656eb4e01b34dd07a Mon Sep 17 00:00:00 2001 From: Tom Kunde Date: Wed, 2 Mar 2022 12:12:10 +0100 Subject: [PATCH 7/8] klappt alles so --- src/main/java/MonitoringPanel.java | 24 +++++++++++++++--- target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar | Bin 5287 -> 5397 bytes target/classes/MonitoringPanel.class | Bin 2149 -> 2387 bytes .../AClassWithOneUnitTest.txt | 2 +- .../TEST-AClassWithOneUnitTest.xml | 8 +++--- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/main/java/MonitoringPanel.java b/src/main/java/MonitoringPanel.java index d750a64..995fec9 100644 --- a/src/main/java/MonitoringPanel.java +++ b/src/main/java/MonitoringPanel.java @@ -7,7 +7,7 @@ public class MonitoringPanel extends JFrame { private JLabel labelCPUTemp1 = new JLabel("CPU Temperatur:"); private JLabel labelCPUFrequenz1 = new JLabel("CPU GHz:"); private JLabel labelCPUTemp2 = new JLabel("CPU Temperatur:"); - private JLabel getLabelCPUFrequenz2 = new JLabel("CPU GHz:"); + private JLabel labelCPUFrequenz2 = new JLabel("CPU GHz:"); private TextField textboxCPUTemp1 = new TextField(); private TextField textboxCPUFrequenz1 = new TextField(); @@ -40,11 +40,29 @@ private JFrame generateFrame() { 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); return frame; @@ -53,8 +71,8 @@ private JFrame generateFrame() { public void doFill(String cpuTemp1, String cpuFrequenz1, String cpuTemp2, String cpuFrequenz2) { textboxCPUTemp1.setText(cpuTemp1); textboxCPUFrequenz1.setText(cpuFrequenz1); -//textboxCPUTemp2.setText(cpuTemp2); -//textboxCPUFrequenz2.setText(cpuFrequenz2); + textboxCPUTemp2.setText(cpuTemp2); + textboxCPUFrequenz2.setText(cpuFrequenz2); } diff --git a/target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar b/target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar index 9c85a8f5e080668870f0e456584db6cdd512ed4c..84034ef9907197f65b0b5a9a71c8cb741a18f249 100644 GIT binary patch delta 1551 zcmZ9MdpOez7{})~g>q>>i-cirXD&(1gix-tgvTx0sL?_Wa!a?e*iN9gh$P5VOHzxHgE!}aB{5`56M<*2M z4KUmIk~|4sv(48m`Y^4?W_3TKbFP!d4~1CPy~MlojD&)RG)S!gHmCDxT5FBf(yIwh z`ddg8Nq*Qt6}*9JiDTN4@7{uEJ({XV7BgJuM(!|G6e8oU^jIY&yG>d)m(;4mv+m!o z)CXrRy<$seh`1vYuO<-I8C2T?WORp~_D4pBqlG8g!H7Ndx)i*)tY6fL!@%6V@#LvL zT8Q65iW_K`WQgrX3EJ_(W!w;`5}c9+(mRqo6quB}Ue5`B{prT462aJ(Go=xWi|>JN zabAxoVY<$|v>@SdO5%x#)af-&YBgRgl(5@YZlYjs_>nJ|{cct%g_w&MkILPy2_%-; z)Uw0VYyFh&dTE)0sdsu5KJ=?${X=H&*nV(qBhcI=9%Wdst2(K43C`LLX9M5c@oo3) z31G5oV6^Yu{Y>yv<%s=^R`M8^>@u9wKB+`UM`fbedy$@6u-;9iad$j*CgJ?V{M838 zzu5&-whdGq%t2FQ`lAg~YFck{ih_|bX;Wp~O3@m2J$K&hcyH!rB_pQ2xQ`mO)NHRw zdvmKsgPpB14n#^wm;4K>I6)@gV0P_tlKfOu>T~P6Rry27$079##UoM@U0uY--Ky&& zARMzdFlL_7;BOWJu4F#qH~E>zUw@+iZfd}+FX^BdAuJUYIPCOkz3LhBg49{io;Q~| zQ=uP`SFJu;fbj@Ro-yYl6WO@qX4#^>{=u)B@hu?L{3^v#L%9b#Fy-br<{we~SbOXny)N&>U9 z_HCD6d;~`QI_HNHB9!BD5>BL$#|ibE^rvk*H;YeTPx1-KLbf!-K2g^oL(}UjE8sQb zGq3U$Bi+H*I??)=fdP-!(qzw2FdjWu_$bz_n>Boc*W>jhFe8-R6*xwwJ`6M>8_t`+ zIbcFz4tuGE#xK|R>i18szD8e+9LPnzIBwy7IL}s#?SiTxBr}wcW#w(n=oh(vE%{*q zu6N2{Sej%v!H`%)B6gnPo1^m&urnK;N!5wBCx*=J;PK^Ee zLUg6jBaIGnG0!)2SlBGcQqftu#9|x2g*B8Cykya#0PFA^uQa}GN4S9g*tJ+L1@NfP z+CKKo!7u5|kyg)lUkU;j(^$PV-NcPP=D$j&HKM(XZn>0n4LYK8U*C?BDm4eDJn73QNPILSocZ*oc5o(-;FF^)C!vBHw_hrrR%1+9VFH#%Yr>eO6RII8N faCG%z1@Tl(fUZ@GgY=N*fE{AR`mNmvuD1UK2RW*Y delta 1451 zcmZ9MdpHvc7{+I=!)8pz*bpU_+#3-R(=3-}V&pPWJ7;c7l1nXVDo=>HmP^B7N(qT5 zlQpXYnO=l$!Kp;M|Y?SdB;kpyfH*(X(c7tqfq z)hG|>?NiAkiET->t~gH!;_c&46s`+Mh!p_<0wtJWkP4mH>+0nu{~ZN#lz<qUoh$q$>Cjs~06RZGr_z{{qp0;foW zdxDb^R|6Sw8YJFil%2YI{+qkxSqP&GuwUM*D-pCFEwUm#R zP&vcpuiZ~i_<3M$use8iytfi&F7ts5bVu>o#AhX88&>|D@oX`PpHECAsFbytEzs8k z+90$q5ey7}x3-6g!;6ZEZimR7IpzlrD=Afj7$eyOP`2XN+$VNn;r`JFa^UZg4DF*- ziM}ih`U4>~gg$x9P_^~oA}{;qHxB}E5zXzqB&wtzI&62iB;@!+u!UdQiKl^Xc!p%; z6l!rFj*GTP_xAi)us8d0qb3c?UB&qE{WV4OeXX*u<}Zg?EV~f;Tj4p37mOu05Zlrdhy(~h0 zBL;Iv$XRvem2@|0P*C+8F(ZAou1+(DmKp!9HL@zhw~;t-Ynnw1XwvG9I@8PqISY20 z8-C`X^Petqlp#Ihjwrg%@b3Ffj|8 zhFZ$tW!x1$Kr*GT9TaTOShZ{cA5+5{)4Ei%P`1!h_TI$W8(0U5EOs@=KBM z(R0F>$qB4T?O1col0Vs?eolrt7fC(uo2i&FvuUj1Do1GHUEcF+y&=(kZQdcqn`8P? zCT6`vUhhQ9kM4`N>^Ww&Z&G?z!wJ~C9EVVggCB7Q7A!xeyF;0Wd zxdp!Zm*1O_Y$&z(40{T+X+r6xCP8E4F@6utF$fM#J>zOp-g(Gl)uE{3vx?og4(!Cq zj`qBPtT8pc8j71mU^Gk5bBTnA%)udBM8Wf7!)ELC`?54-*f;Y)SPM zNS^Sv)sQpULK@Rk&Uy=G%v?E(Z5fu^|9_;RU?$$=Ez12#!oQcyzXl4}+$;tI0FHLV zL%KL8tX?qrTwsWv3tk8)FZ>TZe+(=C5bgsrAHuY^3yr{3gd~|2FjSh10&}mtju7cD fgJh=3>j1gXtvh6z41$>?E6LoHhl-WTZa?}1v^RS| diff --git a/target/classes/MonitoringPanel.class b/target/classes/MonitoringPanel.class index 2e047be1130fc06611a00144e7105e4c53f157ea..a3a7c58fb3fdb16e3d1161f5f3e5d89f66695d4c 100644 GIT binary patch delta 474 zcmYL`yGsK>5XQf`JhAaEgd<{O3V_W@KsEExe`_Qx z#1u*?xRZC~u#II-XdW9YA}Vw*3RzKDZu;Vv - + @@ -14,7 +14,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -56,6 +56,6 @@ - + \ No newline at end of file From 31ee29a9fa8f438e5de1fddd397b4303bff7e117 Mon Sep 17 00:00:00 2001 From: Tom Kunde Date: Thu, 3 Mar 2022 12:42:11 +0100 Subject: [PATCH 8/8] klappt alles baba --- src/main/java/DataImport.java | 39 +++++++++++++++--- target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar | Bin 5397 -> 5744 bytes .../TEST-AClassWithOneUnitTest.xml | 4 +- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/main/java/DataImport.java b/src/main/java/DataImport.java index 16b84da..48c939c 100644 --- a/src/main/java/DataImport.java +++ b/src/main/java/DataImport.java @@ -1,4 +1,6 @@ import java.sql.*; +import java.time.LocalDateTime; +import java.util.Locale; import static java.lang.Thread.sleep; @@ -30,15 +32,39 @@ private void dataImport1() throws InterruptedException { 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); - cpuTemperatur1 = rs1.getString(1); - cpuFrequenz1 = rs1.getString(2); - cpuTemperatur2 = rs2.getString(2); - cpuFrequenz2 = rs2.getString(1); + 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); } - doWrite(cpuTemperatur1, cpuFrequenz1, cpuTemperatur2, cpuFrequenz2); } catch (SQLException e) { System.out.println(e.getMessage()); } @@ -47,6 +73,9 @@ private void dataImport1() throws InterruptedException { private void doWrite(String cpuTemp1, String cpuFrequenz1, String cpuTemp2, String cpuFrequenz2) { + + + test.doFill(cpuTemp1, cpuFrequenz1, cpuTemp2, cpuFrequenz2); System.out.println("TEmp1" + cpuTemp1); diff --git a/target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar b/target/BerufsschuleLernfeld8-1.0-SNAPSHOT.jar index 84034ef9907197f65b0b5a9a71c8cb741a18f249..ec07fe41530b2d56268d0a6157517bdbe860e170 100644 GIT binary patch delta 2318 zcmaKuc{~&TAIE1y<`^@hO+(`AwqkBshvVmrZ?4GIGUg7EupxV2BWe93~XAkE}7UcX__8;$h{>R z|H);cWk6Us*j;o60D0OG#%2Uc7@J} ziSaq73gg6?o`!s`9oSL#VS1ndcvvwwJV+_nwn$HdI#^cr0I72jGmK;<8S*fuIj`D+ z`lG7kXDlhCMOY~8)1ZoDsN6l9F`F98$mG{@uZicw<>9^kkH@s?xLlk^Fsi%c-57gx ze1u)>F=Tq2dE;O;Rjg?!kA$1_6fla(o2|4Hjw)U@nT_0-N);_$5h}Ax=vM#!(NLyS zM#KRWTNm2V(_Mig*as6J;D=|v6g6B6b=RPS$Hq2$Gbns`El5D-*sfW`~T>Tjv zKKwR2UovNUs@aZ>Y*9+413l<#rp=-16G+rvgq?X$G?SSD$>MZd++?CHLV;?QB;m`H?vCJZ>+_mWRI#-rj(adS4MpLQeyAvYSMBhQZOlFom5SBW>1 z^7YPoSxDz=`fNEVF?x3R;=|Df?HdKnE8oWBPIbqw=B0Ro;y+Gj1L+Z(S#5c?^QbEo zUCdKd8$T_=7-b*xV67*^E$Xm#;SjVN;bi?+p4xH#e);|OeKcj7YiV6ft*^G2)e0@q zhbHwJ-)G|q@rqGC8|bWJlH?$QL?cm+X zi4v~Y+Q2cLQ5TX>ee+FCry+?61a7_>wL$SNf<*ukPS58o8+Wi>v#lnVKY;01Q!w=n z*+-o(`I1`ALmFwiD`iaD4PSNmQ?0eVE|lxIR=z%eGS^ILd2pb9+mB7DFZC(tvet>( z4{a&VHE>!s{PHNo8=@y*G^DQLL6OQiay()jGqidyF-z6u5}6CoHhlGTwIcDu>bWz8 zI(`bFxp@m7HnBtHsWtP5I9bzJ*jRnL*dxSyGO4{xT<=s+JXfLUw)H{f4`0T?3+YrC zBD|gWz1vo)`n?&xwa}RluV9sBA)3_~nF+!C%twM6Es`!TOR3PRzmGbe{l1gIvYQj-U-L-|6Z`%wxCUcf5YdnEw?hyoPZHiaM`!taeVh0 z^*r~G)L+enRLn+8hc~}*c2f_+fBv&09JBS&Uj+vj6X zBlnDi9t-to9i4pVGNZk(L!hc46_;ulP%FZ3Vx8%b-T7fP=4X7dR{{-fui6|?HivC! z%7^R&hgv5~lV?#M+H+hJyx=Wz*lM0E^)nk~9Tt*nuIdtCjWRPiXVh)TLv$G(cql&K z1$G-8Ep@@%)T^BgM9*eH>7;*Xpy$}^#%O3u1A_~(>t2+<7zVxscQp-%N^$s3zuVx* zn>+%nD+YnB4fo>`WA>$fAW6uok2 zKyyuZVs%gC%zgco7P`=OEBL!KdlUWi9+Gnv^$}+K2_IDtnz;1HzcWF0OO}~MXzogx zv*vVkYQ!PD%1C=uNI#t7GSb2&w#yr(J`zNKri9KE+LRK%Umo@H78H3qu&Eov-#9vB zW{xh;Ex&G+->{BqwvkAhlY3@;2RL#D%OFw(hOa7n?uQ>?ur7Zl-#JESrMX!0L7^g> zJSrI`zybM&V`0aT0hsUp>*(5cnVny{7wM)G8IXPpoAgM51VYZmx^ru4OJz!%TyUR8 zDZJ8vKks}D8T9(Poqn=9^oZY-1yE>H;4R4?A$#eiDDw(sEzN1`g_g-|L_S~!Snr*jBcr&53kpYX)h(*Js-3x8CHogkbrCM>ZuaAOx3k0jEtazuHt%xD zoZqty0MU+mV0!cI($CEltY)pk@Vs1Y^3%=3^4p+)`nLdJ$Fb`*_YCrYb{9Y}k`J`w z=ww-l>aS`8(cP`}mmxIJuMGup%&ymy-Nmv0WA@}K@q@cf$dlsIhH(M_fUOT9L=zX} z6A@u=%>$GG?dFAF_c_`cZ9ZA#1prQh0RZ@~6!Cj1PqY^#L%~vne+zyE49EXC0}%Ze zhyk{@gLlx@%<-s(rJXrC*eA+21pWWS(*GsCAxf@=sr-7^8<;e3XctkrqLO5F300uH c*l$9Sb9X3T{5K)V8Bjs;wuBge7;LxK-vRCynE(I) delta 1901 zcmZ9Ndpr|tAI4{!<-r^`dn$)HB%3D1oKgu-P9ew4>ER)n;gOLMmK-7?)@gG}iaBOB zQ*x-B4~ZP!Jx=LGRy1Y_6<+jt-#^~_kNdi=`*VGM_wT>&@{zk}=y@9uSQM~(G=2Zd zhN^+kJEEH>f%5&!*`J;7h=BkAbz<352(s$}QPu^v?UfTSA4}a#I})cD4IF6w~bYJY(3Pms>WmSj{5$}VBzL~q#|^n14CXDY`WP{d^r8k(4*g4R718r?l#yk z^v$2RpjE0D!a^O2byBfFe)oi%o~Y<4qJPel7okG)3HjT+n;=k`{P zSB~p92yJVURKeS0V(8QbsA@{S=#?_gEs2B?=xEI;T*p#ZhMD6X2s!)Dadz9pqelJI zlfX%8!m!DEOI@c<$3nPZQ934hgXsb6j({0*B?zHqwL`r(CFLh!7a z>3219RZLn+<05G?mOSdU_4uZl!I6Q!2A4-Nfgv{R_XjJ-D>u;)ZHTO(rdlmdev`&1^*~yH@ z-u_&RFvoV3IPuc)K^7~7UGb8}PD#t0MhO?A?PfkDt5?)plEKzIy3eyfY)|`1Sbw>} z{3Cc5HF3jK`E^K?ce}7B%ik-l zFlOUE6?fD)k2-tw6FWDU?X1X}eNwAiJs=2|u<&Q7VJ1-?`Kto2sJBi7uenSoeABEi zeL5&k$yMLJrhF9VS9Y-H!9`8Ye;}c^f*wXagOCH~wX;IT8DAaUjbsD*y`^8~DmNzA z!y9MVeJ_CHLCq^2EW<+;TAE(E^h?o7%Xu3?_-$u|Ylh;;EzdJ!e>MQVoWItaU3|&wTXFfb^q+^TN!OQ| z@?CqSmlr61?Z)z2^8f@Dy3!HLFUHxCR z*4o7oKJ;Z}kCa&wjB0u2<~HjaSiab@6M58UCM0<5Ibkg%*cMzjt-umfqt$)1{3&5{ zUs>Ayc5+?V<5Cr;x&Z}a^)OIYP|)3l0n@D$r0YyucY4|D4QyQxisqgVouF;&lwk4k zwu3+>_XU=WmHxTk3S*F7g!2!5lY7ojr@5ov7#F7qM$}}ol8fhDq+G*UH(R91EEy>% zp^Q=R_6C%bc#GSv{#5`yo}}T+xvs+gcXV(kcJXB-Yv`Mnd)9{&i*1s#UItHxzNyw6 zO9sB0O0){v|8+P$UE4v0yZL+jp`O>QtMYOe(U_#Nne&Or3pO8$-yAQY{sE}xM$y^> zJ8V7G=lv$$`=#U+4w4f!XK4>w$rnfop4X_cDTrzK z4_nPt6xT7e*&-oPaBgL5G|9B>zMjmIUwCN6l>Z%`fakM_NaA2?hBVE7th2u=RmH9lHwoD0(WwIf5DbV;wMI-*q zk#U3G>m`tie2y?Sk0Xr;mJfKZ#jf)qky8ThKE=&}Vx<|UHL5jFC-%%@9U1Un!iWHN zn8HjG859ET8ZXfU!k``IP+}y}ds-@~x2w!)$vn{B16fvgmqrw}?CJl*5d{R(KCw%v z)NVgur4RrR00aPjQEU%ofX4~S`v3r2Uwo*RU$8Hcc-}?`2m|dl_O_se!VUsgMJVYo z)xDn>J5ff0(hpPEi@cq9T7trmQJ`qR#gRKpIsY2_>pu3sAO+aoChZn=C^z6}VCSyY Xr+kKEfJV|g_6)^cP6`5-+3o)aqPT7a diff --git a/target/surefire-reports/TEST-AClassWithOneUnitTest.xml b/target/surefire-reports/TEST-AClassWithOneUnitTest.xml index dff5061..2cfbdfb 100644 --- a/target/surefire-reports/TEST-AClassWithOneUnitTest.xml +++ b/target/surefire-reports/TEST-AClassWithOneUnitTest.xml @@ -14,7 +14,7 @@ - + @@ -29,7 +29,7 @@ - +