Berack/upo-senior-assistant-pi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Musich

Browse Source 
- fixed database
- added music class
This commit is contained in:
20015091
2018-09-11 15:57:32 +02:00
parent a4c6c095c6
commit 40fb445262
5 changed files with 110 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/support/database/LocalDB.java
View File

@@ -54,17 +54,35 @@ public class LocalDB implements Database {
@Override
public boolean updateHeart(long dateMilliSec, double heartRate) {
return query("INSERT INTO heart (day, rate) VALUES ( ' " + new Timestamp(dateMilliSec) + " ', '" + heartRate + "')");
Timestamp time = new Timestamp(dateMilliSec);
return query("IF NOT EXISTS (" +
"SELECT * " +
"FROM heart " +
"WHERE day = '" + time + "') " +
"BEGIN INSERT INTO heart (day, rate) VALUES ( ' " + time + " ', '" + heartRate + "') " +
"END;");
}
@Override
public boolean updateSleep(long dateStartSleep, long duration) {
return query("INSERT INTO sleep (sleep_start, duration) VALUES ( ' " + new Timestamp(dateStartSleep) + " ', '" + duration + "')");
Timestamp time = new Timestamp(dateStartSleep);
return query("IF NOT EXISTS (" +
"SELECT * " +
"FROM sleep " +
"WHERE sleep_start = '" + time + "') " +
"BEGIN INSERT INTO sleep (sleep_start, duration) VALUES ( ' " + time + " ', '" + duration + "') " +
"END;");
}
@Override
public boolean updateSteps(long dateMilliSec, long steps) {
return query("INSERT INTO steps (day, steps) VALUES ( ' " + new Timestamp(dateMilliSec) + " ', '" + steps + "')");
Timestamp time = new Timestamp(dateMilliSec);
return query("IF NOT EXISTS (" +
"SELECT * " +
"FROM steps " +
"WHERE day = '" + time + "') " +
"INSERT INTO steps (day, steps) VALUES ( ' " + time + " ', '" + steps + "') " +
"END;");
}
@Override
@@ -75,7 +93,7 @@ public class LocalDB implements Database {
// calendar.setTimeInMillis(System.currentTimeMillis());
// calendar.add(Calendar.DATE, -dayToSubtract);
// long time = calendar.getTimeInMillis();
long time = System.currentTimeMillis() - (dayToSubtract * 24 * 60 * 1000); // meno 24 giorni per 60 secondi per 100 millisec
long time = System.currentTimeMillis() - (dayToSubtract * 24 * 60 * 1000); // meno 24 ore per 60 secondi per 100 millisec
ResultSet result = conn.createStatement().executeQuery("SELECT * FROM heart WHERE day>='" + new Timestamp(time) + "'");
List<HeartRate> list = new LinkedList<>();