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

Add support for adding and removing zwave nodes via software. Support secondary z-wave controllers.

Browse Source
This commit is contained in:
MarkBryanMilligan
2021-10-28 21:45:56 -05:00
parent 88933a2286
commit f5066c541f
28 changed files with 346 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
currentmonitor/lantern-currentmonitor/src/test/java/com/lanternsoftware/currentmonitor/CreateConfig.java
View File

@@ -1,15 +1,28 @@
package com.lanternsoftware.currentmonitor;
import com.lanternsoftware.datamodel.currentmonitor.Breaker;
import com.lanternsoftware.util.CollectionUtils;
import com.lanternsoftware.util.LanternFiles;
import com.lanternsoftware.util.ResourceLoader;
import com.lanternsoftware.util.dao.DaoSerializer;
public class CreateConfig {
public static void main(String[] args) {
// MonitorConfig c = new MonitorConfig(0, "https://mark.lanternsoftware.com/currentmonitor");
MonitorConfig c = new MonitorConfig(1, "https://mark.lanternsoftware.com/currentmonitor");
c.setDebug(true);
ResourceLoader.writeFile(LanternFiles.OPS_PATH + "hub1.json", DaoSerializer.toJson(c));
MonitorConfig c = new MonitorConfig(1, "https://lanternsoftware.com/currentmonitor");
c.setHost("");
c.setDebug(false);
c.setMqttBrokerUrl("http://192.168.1.80:1883");
c.setMqttFrequency(60);
c.setMqttPortCalibrationFactor(1.0);
c.setMqttVoltageCalibrationFactor(1.0);
Breaker b1 = new Breaker();
b1.setPanel(0);
b1.setSpace(1);
b1.setHub(0);
b1.setPort(1);
b1.setSizeAmps(20);
c.setMqttBreakers(CollectionUtils.asArrayList(b1));
ResourceLoader.writeFile(LanternFiles.OPS_PATH + "mqtt1.json", DaoSerializer.toJson(c));
}
}

3
currentmonitor/lantern-service-currentmonitor/src/main/java/com/lanternsoftware/currentmonitor/servlet/SignupServlet.java
View File

@@ -12,13 +12,14 @@ import com.lanternsoftware.util.servlet.LanternServlet;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Locale;
@WebServlet("/signup")
public class SignupServlet extends LanternServlet {
@Override
protected void doGet(HttpServletRequest _req, HttpServletResponse _rep) {
BasicAuth auth = new BasicAuth(_req);
Account acct = Globals.dao.getAccountByUsername(auth.getUsername());
Account acct = Globals.dao.getAccountByUsername(auth.getUsername().toLowerCase().trim());
if (acct != null) {
jsonResponse(_rep, SignupResponse.error("An account for " + auth.getUsername() + " already exists"));
return;