From a3185f03172d4af055a53df4f38989d509fd6a82 Mon Sep 17 00:00:00 2001 From: David Paquette Date: Thu, 30 Apr 2015 21:36:53 -0400 Subject: [PATCH] Added ability to link a serial number to user Here you go amiee! --- bin/thermostat/ThermostatDevice.class | Bin 4676 -> 4538 bytes out/MAIN.jar | Bin 588643 -> 588585 bytes src/InputOutput/Database.java | 5 ++++- src/server/server.java | 5 ++++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/thermostat/ThermostatDevice.class b/bin/thermostat/ThermostatDevice.class index 7bef7be5909c7a4f142b43b6c722369f8099f47a..b93b34b590b562863554b23e93d9db1d24135842 100644 GIT binary patch delta 1740 zcmY+EX>?On5XXNnO?%UqSIX7^2U~%L2Gc@8mO@pm3Ko{LYv5TQ_7OamgKp;f_M z@wuU>$YMoADTS0$*%U<(SKN1S!3Fno{NUkO=f2h+{E(TsGk50ypShEF(7!t~cI2Pk zdx0VRX>uN`Om5@$Wc=Kb%$?k&xZ5O=RUYoq`d%&WGg;033fsiX1BwStQnY@^B$ZV< z_hBs_QLHiP!lPauW3A$GlP7r6#K$@veo9;G&6t=QybNZec5X67JZ)0PGm6dn@T_8s zhvyVqb^7z#^@3uXhkBC$+Z7F3?=T6nQ{RYdt5N%QY1}3+yJ^ZH5@Z}GOpI~-NKYjKSC47$t@EeYk8 zSLKc^8NGCNcu};xs?y?pY7H{%J+2J9tLpB#kOGTKD6og9-rgcUP<&|d5g*$#m2d1J zi%MKT3p5$i))yx_)2?@8+3F)D?*iXb0Qr`~TQYnimO& z=4k&P7MC-w!I!+)WgqjdGy-;w+11WBz4j@uX)m`n&G5_Gx;UQ;P_oA|G7K&f%f-ba zWqR%BQR0(9IWc)5(J;16%dniYfQeR;BZClGVy{S9XO!B#I}}bCFOeW_vgJ2{iBfH_ zV@(nZVoYX=QzOPyrb%v@oVtTm>uWr{q)L- z)4Pry#oKYWdE%JceYiVkicv3xbh%XeNLr~~liDqoE_3Y5D2I;jzN3(vz&wXoRy(mQ z%7u>3&eDr_1~Kg^CoC~N4~45lF+Z*Ci58Gd1q&sp*-nBI|#;uwdJuk}8aR7up5TZ`loTA@4`r?F)4a+Wohn;PSQw4fIyubDtu=YE}f zPHW_x;%0(n{o`c28_CIcXYWD|-G(LhaHnM?#u-r8aw0!TT)91x_DQuA1~Ncu2q(L~ zW0#np1+o+s;;V94jUz#VnC8r=YeEERXA?2R*R7wt=O{o-E~hsj3HM z;W|x*jBPq5NiMyAxy5`_QuEnV2_Ez{c=Xy+S{M~?}f=H}JhOvQ@7rA>pF zd~@0uO_#d*1=E`uS{7_%*tlRbd1cv+4ByEJVL2jBzNX=Fp0kxkjV!?i*{Y44#ilc! dHN6cynXcT-Edt@R34h)c_~X=RJq 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 bK(5>-OWw9VRiOs`zY_z630?4?C&>K|P7>BL delta 14972 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 D_+m7T diff --git a/src/InputOutput/Database.java b/src/InputOutput/Database.java index 3357796..6e8807c 100644 --- a/src/InputOutput/Database.java +++ b/src/InputOutput/Database.java @@ -58,7 +58,10 @@ public void setDesiredTempForSerialNumber(String serialnumber, String desiredtem public String getDevicesFromEmail(String email){ return this.getUserFromEmail(email).get("devices"); } - + + public void giveUserAccessToDeviceByEmailAndSerialNumber(String email, String serialNumber){ + this.updateTable("UserTable", email, "devices", serialNumber); + } @Override public void datastructureLogEvent(String query) { diff --git a/src/server/server.java b/src/server/server.java index ae2c4c2..2e6fd4e 100644 --- a/src/server/server.java +++ b/src/server/server.java @@ -41,9 +41,12 @@ public server() throws Exception { String adminPassword = "admin"; String ip = "127.0.0.1"; String email = "admin@uconn.edu"; - String serialNumber = "1.1"; + String serialNumber = "00000011TEST"; + dataStorage = new Database(this); dataStorage.createUser(email, adminPassword, ip, serialNumber); + dataStorage.giveUserAccessToDeviceByEmailAndSerialNumber(email, serialNumber); + System.out.println(dataStorage.getDevicesFromEmail("admin@uconn.edu")); this.startServerListenerThreadCurrentTemp(); dataStorage.printStruct(); instance = this;