Strolch
/
strolch-plc
mirror of https://github.com/strolch-li/strolch-plc.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] Fixed compile errors

This commit is contained in:
Robert von Burg 2021-12-15 14:57:49 +01:00
parent 735019673d
commit 7ead6d2270
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
strolch-plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcStateHandler.java
View File

@ -1,10 +1,7 @@
package li.strolch.plc.gw.server; package li.strolch.plc.gw.server;
import static li.strolch.agent.api.AgentVersion.*;
import static li.strolch.agent.api.ComponentVersion.COMPONENT_VERSION;
import static li.strolch.model.Resource.locatorFor; import static li.strolch.model.Resource.locatorFor;
import static li.strolch.model.Tags.Json.AGENT_VERSION; import static li.strolch.model.Tags.Json.*;
import static li.strolch.model.Tags.Json.APP_VERSION;
import static li.strolch.model.builder.BuilderHelper.buildParamName; import static li.strolch.model.builder.BuilderHelper.buildParamName;
import static li.strolch.plc.model.PlcConstants.*; import static li.strolch.plc.model.PlcConstants.*;
import static li.strolch.utils.helper.StringHelper.DASH; import static li.strolch.utils.helper.StringHelper.DASH;
@ -120,23 +117,23 @@ public class PlcStateHandler {
if (existingState != connectionState && this.container.hasComponent(OperationsLog.class)) { if (existingState != connectionState && this.container.hasComponent(OperationsLog.class)) {
OperationsLog operationsLog = this.container.getComponent(OperationsLog.class); OperationsLog operationsLog = this.container.getComponent(OperationsLog.class);
Locator msgLocator = locatorFor(TYPE_PLC, plcSession.plcId) Locator msgLocator = locatorFor(TYPE_PLC, plcSession.plcId).append(
.append(ConnectionState.class.getSimpleName()); ConnectionState.class.getSimpleName());
operationsLog.updateState(realm, msgLocator, LogMessageState.Inactive); operationsLog.updateState(realm, msgLocator, LogMessageState.Inactive);
if (connectionState == ConnectionState.Connected) { if (connectionState == ConnectionState.Connected) {
operationsLog.addMessage(new LogMessage(realm, plcSession.plcId, msgLocator, LogSeverity.Info, operationsLog.addMessage(new LogMessage(realm, plcSession.plcId, msgLocator, LogSeverity.Info,
LogMessageState.Information, PlcGwSrvI18n.bundle, "execution.plc.connected") LogMessageState.Information, PlcGwSrvI18n.bundle, "execution.plc.connected").value(
.value("plc", plcSession.plcId)); "plc", plcSession.plcId));
} else { } else {
operationsLog.addMessage(new LogMessage(realm, plcSession.plcId, msgLocator, LogSeverity.Error, operationsLog.addMessage(new LogMessage(realm, plcSession.plcId, msgLocator, LogSeverity.Error,
LogMessageState.Active, PlcGwSrvI18n.bundle, "execution.plc.connectionLost") LogMessageState.Active, PlcGwSrvI18n.bundle, "execution.plc.connectionLost").value(
.value("plc", plcSession.plcId)); "plc", plcSession.plcId));
} }
} }
// trigger execution handler that we are connected // trigger execution handler that we are connected
if (existingState != connectionState && connectionState == ConnectionState.Connected && this.container if (existingState != connectionState && connectionState == ConnectionState.Connected
.hasComponent(ExecutionHandler.class)) && this.container.hasComponent(ExecutionHandler.class))
this.container.getComponent(ExecutionHandler.class).triggerExecution(realm); this.container.getComponent(ExecutionHandler.class).triggerExecution(realm);
}); });
@ -182,11 +179,11 @@ public class PlcStateHandler {
tx.update(plc); tx.update(plc);
} }
if (versions.has(Tags.Json.COMPONENT_VERSIONS)) { if (versions.has(COMPONENT_VERSIONS)) {
JsonArray componentVersions = versions.get(Tags.Json.COMPONENT_VERSIONS).getAsJsonArray(); JsonArray componentVersions = versions.get(COMPONENT_VERSIONS).getAsJsonArray();
componentVersions.forEach(e -> { componentVersions.forEach(e -> {
JsonObject componentVersion = e.getAsJsonObject(); JsonObject componentVersion = e.getAsJsonObject();
String componentName = componentVersion.get(COMPONENT_VERSION).getAsString(); String componentName = componentVersion.get(COMPONENT_NAME).getAsString();
updateVersionParams(plc, componentName, "Component " + componentName, componentVersion); updateVersionParams(plc, componentName, "Component " + componentName, componentVersion);
tx.update(plc); tx.update(plc);
}); });