mirror of
https://github.com/zyphlar/LanternPowerMonitor.git
synced 2024-03-08 14:07:47 +00:00
Implement 3-phase voltage logic.
This commit is contained in:
@@ -18,9 +18,12 @@ import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.TimerTask;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
public class Globals implements ServletContextListener {
|
||||
public static CurrentMonitorDao dao;
|
||||
public static ExecutorService opsExecutor;
|
||||
private static final Map<Integer, Map<Integer, List<HubCommand>>> commands = new HashMap<>();
|
||||
|
||||
@Override
|
||||
@@ -28,10 +31,12 @@ public class Globals implements ServletContextListener {
|
||||
dao = new MongoCurrentMonitorDao(MongoConfig.fromDisk(LanternFiles.CONFIG_PATH + "mongo.cfg"));
|
||||
RulesEngine.instance().start();
|
||||
RulesEngine.instance().schedule(new CommandTask(), 0);
|
||||
opsExecutor = Executors.newFixedThreadPool(7);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void contextDestroyed(ServletContextEvent sce) {
|
||||
opsExecutor.shutdown();
|
||||
dao.shutdown();
|
||||
HttpFactory.shutdown();
|
||||
RulesEngine.shutdown();
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.lanternsoftware.currentmonitor.context.Globals;
|
||||
import com.lanternsoftware.datamodel.currentmonitor.BreakerConfig;
|
||||
import com.lanternsoftware.datamodel.currentmonitor.HubCommand;
|
||||
import com.lanternsoftware.datamodel.currentmonitor.HubConfigCharacteristic;
|
||||
import com.lanternsoftware.rules.RulesEngine;
|
||||
import com.lanternsoftware.util.dao.auth.AuthCode;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -40,6 +41,8 @@ public class ConfigServlet extends SecureServiceServlet {
|
||||
if ((oldConfig == null) || !oldConfig.isIdentical(config))
|
||||
Globals.dao.putHubCommand(new HubCommand(config.getAccountId(), HubConfigCharacteristic.ReloadConfig, null));
|
||||
Globals.dao.putConfig(config);
|
||||
zipBsonResponse(_rep, Globals.dao.getMergedConfig(_authCode));
|
||||
config = Globals.dao.getMergedConfig(_authCode);
|
||||
RulesEngine.instance().sendFcmMessage(config.getAccountId(), config);
|
||||
zipBsonResponse(_rep, config);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,13 +17,14 @@ public class RebuildSummariesServlet extends SecureServiceServlet {
|
||||
if (_authCode.getAccountId() == 100) {
|
||||
String[] path = path(_req);
|
||||
if (path.length > 0) {
|
||||
Globals.dao.rebuildSummariesAsync(DaoSerializer.toInteger(CollectionUtils.get(path, 0)));
|
||||
Globals.opsExecutor.submit(() -> Globals.dao.rebuildSummaries(DaoSerializer.toInteger(CollectionUtils.get(path, 0))));
|
||||
}
|
||||
else {
|
||||
for (String sId : Globals.dao.getProxy().queryForField(Account.class, null, "_id")) {
|
||||
int id = DaoSerializer.toInteger(sId);
|
||||
if (id != 0)
|
||||
Globals.dao.rebuildSummariesAsync(id);
|
||||
if (id != 0) {
|
||||
Globals.opsExecutor.submit(() -> Globals.dao.rebuildSummaries(id));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package com.lanternsoftware.currentmonitor.servlet;
|
||||
|
||||
import com.lanternsoftware.currentmonitor.context.Globals;
|
||||
import com.lanternsoftware.datamodel.currentmonitor.hub.HubSample;
|
||||
import com.lanternsoftware.util.dao.auth.AuthCode;
|
||||
|
||||
import javax.servlet.annotation.WebServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
@WebServlet("/sample")
|
||||
public class SampleServlet extends SecureServiceServlet {
|
||||
@Override
|
||||
protected void post(AuthCode _authCode, HttpServletRequest _req, HttpServletResponse _rep) {
|
||||
HubSample sample = getRequestPayload(_req, HubSample.class);
|
||||
if (sample == null)
|
||||
return;
|
||||
sample.setAccountId(_authCode.getAccountId());
|
||||
Globals.dao.putHubSample(sample);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user