will/LanternPowerMonitor
1
0
Fork 0
mirror of https://github.com/zyphlar/LanternPowerMonitor.git synced 2024-03-08 14:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow exporting all data in bson, json, or csv formats.

Browse Source
This commit is contained in:
MarkBryanMilligan
2022-01-29 18:25:19 -06:00
parent eeec6cc697
commit eaf1e4504f
117 changed files with 41205 additions and 10527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zwave/lantern-service-thermometer/src/main/java/com/lanternsoftware/thermometer/context/Globals.java
View File

@@ -6,7 +6,7 @@ import com.lanternsoftware.thermometer.ICO2Sensor;
import com.lanternsoftware.thermometer.IThermometer;
import com.lanternsoftware.thermometer.MHZ19BCO2Sensor;
import com.lanternsoftware.thermometer.config.EnvironmentConfig;
import com.lanternsoftware.util.LanternFiles;
import com.lanternsoftware.util.external.LanternFiles;
import com.lanternsoftware.util.NullUtils;
import com.lanternsoftware.util.ResourceLoader;
import com.lanternsoftware.util.dao.DaoSerializer;
@@ -23,7 +23,7 @@ public class Globals implements ServletContextListener {
@Override
public void contextInitialized(ServletContextEvent sce) {
config = DaoSerializer.parse(ResourceLoader.loadFile(LanternFiles.OPS_PATH + "environment.json"), EnvironmentConfig.class);
config = DaoSerializer.parse(ResourceLoader.loadFile(LanternFiles.CONFIG_PATH + "environment.json"), EnvironmentConfig.class);
IThermometer t = new HidThermometer();
if (t.isConnected())
thermometers.add(t);

4
zwave/lantern-service-thermometer/src/test/java/com/lanternsoftware/thermometer/GenerateEnvironmentSerializers.java
View File

@@ -1,10 +1,10 @@
package com.lanternsoftware.thermometer;
import com.lanternsoftware.util.LanternFiles;
import com.lanternsoftware.util.external.LanternFiles;
import com.lanternsoftware.util.dao.generator.DaoSerializerGenerator;
public class GenerateEnvironmentSerializers {
public static void main(String[] args) {
DaoSerializerGenerator.generateSerializers(LanternFiles.SOURCE_PATH, true, null);
DaoSerializerGenerator.generateSerializers(LanternFiles.SOURCE_CODE_PATH, true, null);
}
}

8
zwave/lantern-service-zwave/src/main/java/com/lanternsoftware/zwave/context/ZWaveApp.java
View File

@@ -10,7 +10,7 @@ import com.lanternsoftware.datamodel.zwave.ThermostatMode;
import com.lanternsoftware.datamodel.zwave.ZWaveConfig;
import com.lanternsoftware.util.CollectionUtils;
import com.lanternsoftware.util.DateUtils;
import com.lanternsoftware.util.LanternFiles;
import com.lanternsoftware.util.external.LanternFiles;
import com.lanternsoftware.util.NullUtils;
import com.lanternsoftware.util.ResourceLoader;
import com.lanternsoftware.util.concurrency.ConcurrencyUtils;
@@ -79,9 +79,9 @@ public class ZWaveApp {
public void start() {
try {
pool = new HttpPool(100, 20, 5000, 5000, 5000);
config = DaoSerializer.parse(ResourceLoader.loadFile(LanternFiles.OPS_PATH + "config.json"), ZWaveConfig.class);
config = DaoSerializer.parse(ResourceLoader.loadFile(LanternFiles.CONFIG_PATH + "config.json"), ZWaveConfig.class);
if (config == null) {
dao = new MongoZWaveDao(MongoConfig.fromDisk(LanternFiles.OPS_PATH + "mongo.cfg"));
dao = new MongoZWaveDao(MongoConfig.fromDisk(LanternFiles.CONFIG_PATH + "mongo.cfg"));
config = dao.getConfig(1);
}
if (NullUtils.isNotEmpty(config.getCommPort())) {
@@ -391,7 +391,7 @@ public class ZWaveApp {
if (dao != null)
dao.putConfig(config);
else
ResourceLoader.writeFile(LanternFiles.OPS_PATH + "config.json", DaoSerializer.toJson(config));
ResourceLoader.writeFile(LanternFiles.CONFIG_PATH + "config.json", DaoSerializer.toJson(config));
}
}
}

4
zwave/lantern-service-zwave/src/test/java/com/lanternsoftware/zwave/GenerateSerializers.java
View File

@@ -1,11 +1,11 @@
package com.lanternsoftware.zwave;
import com.lanternsoftware.util.LanternFiles;
import com.lanternsoftware.util.external.LanternFiles;
import com.lanternsoftware.util.dao.generator.DaoSerializerGenerator;
public class GenerateSerializers {
public static void main(String[] args) {
DaoSerializerGenerator.generateSerializers(LanternFiles.SOURCE_PATH, true, null);
DaoSerializerGenerator.generateSerializers(LanternFiles.SOURCE_CODE_PATH, true, null);
}
}