nmelone/POC-Java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

converted from Maven to Gradle

Browse Source
This commit is contained in:
Patrick McDonagh
2017-02-06 18:48:49 -06:00
parent 02b28ca1e6
commit 1699b82067
31 changed files with 454 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/henrypump/poc/Database.java
View File

@@ -82,18 +82,18 @@ public class Database {
}
public long newMeasurement(Measurement inpMeasurement){
String df = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss").format(new Date());
MongoCollection<Document> collection = database.getCollection("wellData");
Document doc = new Document("tagname", inpMeasurement.getTagName())
.append("currentValue", inpMeasurement.getCurrentValue())
.append("maxDailyValue", inpMeasurement.getDailyMax())
.append("minDailyValue", inpMeasurement.getDailyMin())
.append("dailyAverage", inpMeasurement.getAverage())
.append("dailyTotal", inpMeasurement.getTotal())
.append("timestamp", df);
collection.insertOne(doc);
return collection.count();
// String df = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss").format(new Date());
// MongoCollection<Document> collection = database.getCollection("wellData");
// Document doc = new Document("tagname", inpMeasurement.getTagName())
//// .append("currentValue", inpMeasurement.getCurrentValue())
//// .append("maxDailyValue", inpMeasurement.getDailyMax())
//// .append("minDailyValue", inpMeasurement.getDailyMin())
//// .append("dailyAverage", inpMeasurement.getAverage())
//// .append("dailyTotal", inpMeasurement.getTotal())
// .append("timestamp", df);
// collection.insertOne(doc);
// return collection.count();
return 1;
}
public long newDailyTotal(Measurement inpMeasurement){

2
src/main/java/com/henrypump/poc/Measurement.java
View File

@@ -99,7 +99,7 @@ public class Measurement {
if(storeInDatabase){
if(abs(currentValue - lastSentValue) > sendDelta ||
currentTimestamp - lastSentTimestamp > (sendTimeDelta * 1000)){
db.newMeasurement(this);
long l = db.newMeasurement(this);
lastSentValue = currentValue;
}
}