100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Added provisioning functions to ManagerSetup
Michael Rademaker39e20fd0f1a6
diff --git a/deployment/manager/provisioning/assets/windturbine.json b/deployment/manager/provisioning/assets/windturbine.jsonnew file mode 100644index 000000000..e6dfb7db3--- /dev/null+++ b/deployment/manager/provisioning/assets/windturbine.json@@ -0,0 +1,45 @@+{+ "name": "Wind Turbine",+ "accessPublicRead": false,+ "realm": "smartcity",+ "type": "ElectricityProducerWindAsset",+ "attributes": {+ "notes": {+ "name": "notes",+ "type": "text"+ },+ "windSpeedMin": {+ "name": "windSpeedMin",+ "type": "positiveNumber",+ "value": "10"+ },+ "windSpeedReference": {+ "name": "windSpeedReference",+ "type": "positiveNumber"+ },+ "powerExportMax": {+ "name": "powerExportMax",+ "type": "negativeNumber",+ "value": "45.5"+ },+ "energyExportTotal": {+ "name": "energyExportTotal",+ "type": "positiveNumber"+ },+ "power": {+ "name": "power",+ "type": "number"+ },+ "location": {+ "name": "location",+ "type": "geoJSONPoint",+ "value": {+ "type": "Point",+ "coordinates": [+ 4.488424,+ 51.906477+ ]+ }+ }+ }+}\ No newline at end of filediff --git a/deployment/manager/provisioning/consoleappconfig/smartcity.json b/deployment/manager/provisioning/consoleappconfig/smartcity.jsonnew file mode 100644index 000000000..9534d6c2f--- /dev/null+++ b/deployment/manager/provisioning/consoleappconfig/smartcity.json@@ -0,0 +1,16 @@+{+ "realm": "smartcity",+ "initialUrl": "https://demo.openremote.io/mobile/?realm=smartcity&consoleProviders=geofence push storage",+ "url": "https://demo.openremote.io/main/?realm=smartcity&consoleProviders=geofence push storage&consoleAutoEnable=true#!geofences",+ "menuEnabled": true,+ "menuPosition": "BOTTOM_RIGHT",+ "menuImage": null,+ "primaryColor": "#4D9D2A",+ "secondaryColor": "#AFAFAF",+ "links": [+ {+ "displayText": "Map",+ "pageLink": "https://demo.openremote.io/mobile/?realm=smartcity&consoleProviders=geofence push storage&consoleAutoEnable=true#!geofences"+ }+ ]+}\ No newline at end of filediff --git a/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java b/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.javadeleted file mode 100644index 18e7bfcb7..000000000--- a/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java+++ /dev/null@@ -1,792 +0,0 @@-/*- * Copyright 2016, OpenRemote Inc.- *- * See the CONTRIBUTORS.txt file in the distribution for a- * full listing of individual contributors.- *- * This program is free software: you can redistribute it and/or modify- * it under the terms of the GNU Affero General Public License as- * published by the Free Software Foundation, either version 3 of the- * License, or (at your option) any later version.- *- * This program is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the- * GNU Affero General Public License for more details.- *- * You should have received a copy of the GNU Affero General Public License- * along with this program. If not, see <http://www.gnu.org/licenses/>.- */-package org.openremote.manager.setup;--import org.openremote.agent.protocol.macro.MacroAction;-import org.openremote.agent.protocol.macro.MacroAgent;-import org.openremote.agent.protocol.timer.CronExpressionParser;-import org.openremote.agent.protocol.timer.TimerAgent;-import org.openremote.agent.protocol.timer.TimerValue;-import org.openremote.container.util.UniqueIdentifierGenerator;-import org.openremote.manager.asset.AssetProcessingService;-import org.openremote.manager.asset.AssetStorageService;-import org.openremote.manager.datapoint.AssetDatapointService;-import org.openremote.manager.persistence.ManagerPersistenceService;-import org.openremote.manager.datapoint.AssetPredictedDatapointService;-import org.openremote.manager.rules.RulesetStorageService;-import org.openremote.manager.security.ManagerIdentityService;-import org.openremote.model.Constants;-import org.openremote.model.Container;-import org.openremote.model.asset.Asset;-import org.openremote.model.asset.agent.Agent;-import org.openremote.model.asset.agent.AgentLink;-import org.openremote.model.asset.impl.*;-import org.openremote.model.attribute.*;-import org.openremote.model.geo.GeoJSONPoint;-import org.openremote.model.value.ValueFormat;-import org.openremote.model.value.ValueType;--import java.time.DayOfWeek;-import java.util.ArrayList;-import java.util.List;-import java.util.Locale;-import java.util.concurrent.ScheduledExecutorService;-import java.util.function.Function;-import java.util.function.Supplier;--import static org.openremote.model.Constants.*;-import static org.openremote.model.value.MetaItemType.*;-import static org.openremote.model.value.ValueType.*;--public abstract class AbstractManagerSetup implements Setup {-- final protected ScheduledExecutorService executorService;- final protected ManagerPersistenceService persistenceService;- final protected ManagerIdentityService identityService;- final protected AssetStorageService assetStorageService;- final protected AssetProcessingService assetProcessingService;- final protected AssetDatapointService assetDatapointService;- final protected AssetPredictedDatapointService assetPredictedDatapointService;- final protected RulesetStorageService rulesetStorageService;- final protected SetupService setupService;- final protected MetaItem<?>[] EMPTY_META = new MetaItem<?>[0];-- public AbstractManagerSetup(Container container) {- this.executorService = container.getExecutorService();- this.persistenceService = container.getService(ManagerPersistenceService.class);- this.identityService = container.getService(ManagerIdentityService.class);- this.assetStorageService = container.getService(AssetStorageService.class);- this.assetProcessingService = container.getService(AssetProcessingService.class);- this.assetDatapointService = container.getService(AssetDatapointService.class);- this.assetPredictedDatapointService = container.getService(AssetPredictedDatapointService.class);- this.rulesetStorageService = container.getService(RulesetStorageService.class);- this.setupService = container.getService(SetupService.class);- }-- // ################################ Demo apartment with complex scenes ###################################-- protected BuildingAsset createDemoApartment(Asset<?> parent, String name, GeoJSONPoint location) {- BuildingAsset apartment = new BuildingAsset(name);-- apartment.setParent(parent);- apartment.addOrReplaceAttributes(- new Attribute<>("alarmEnabled", BOOLEAN)- .addMeta(- new MetaItem<>(LABEL, "Alarm enabled"),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),- new MetaItem<>(RULE_STATE, true)- ),- new Attribute<>("presenceDetected", BOOLEAN)- .addMeta(- new MetaItem<>(LABEL, "Presence detected"),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(READ_ONLY, true),- new MetaItem<>(RULE_STATE, true),- new MetaItem<>(STORE_DATA_POINTS, true)- ),- new Attribute<>("vacationUntil", TIMESTAMP)- .addMeta(- new MetaItem<>(LABEL, "Vacation until"),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),- new MetaItem<>(RULE_STATE, true)- ),- new Attribute<>("lastExecutedScene", ValueType.TEXT)- .addMeta(- new MetaItem<>(LABEL, "Last executed scene"),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(READ_ONLY, true),- new MetaItem<>(RULE_STATE, true)- ),- new Attribute<>(Asset.LOCATION, location)- .addMeta(new MetaItem<>(ACCESS_RESTRICTED_READ, true))- /* TODO Unused, can be removed? Port schedule prediction from DRL...- new Attribute<>("autoSceneSchedule", ValueType.BOOLEAN)- .addMeta(- new MetaItem<>(LABEL, "Automatic scene schedule"),- new MetaItem<>(DESCRIPTION, "Predict presence and automatically adjust scene schedule"),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),- new MetaItem<>(RULE_STATE, true)- ),- new Attribute<>("lastDetectedScene", ValueType.STRING)- .addMeta(- new MetaItem<>(LABEL, "Last detected scene by rules"),- new MetaItem<>(READ_ONLY, true),- new MetaItem<>(RULE_STATE, true)- )- */- );- return apartment;- }-- protected RoomAsset createDemoApartmentRoom(Asset<?> apartment, String name) {- RoomAsset room = new RoomAsset(name);- room.setParent(apartment);- return room;- }-- protected void addDemoApartmentRoomMotionSensor(RoomAsset room, boolean shouldBeLinked, Supplier<AgentLink<?>> agentLinker) {- room.getAttributes().addOrReplace(- new Attribute<>("motionSensor", INTEGER)- .addMeta(- new MetaItem<>(LABEL, "Motion sensor"),- new MetaItem<>(READ_ONLY, true),- new MetaItem<>(RULE_STATE, true),- new MetaItem<>(STORE_DATA_POINTS)),- new Attribute<>("presenceDetected", BOOLEAN)- .addMeta(- new MetaItem<>(LABEL, "Presence detected"),- new MetaItem<>(RULE_STATE, true),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(READ_ONLY, true),- new MetaItem<>(STORE_DATA_POINTS, true)- ),- new Attribute<>("firstPresenceDetected", TIMESTAMP)- .addMeta(- new MetaItem<>(LABEL, "First time movement was detected"),- new MetaItem<>(READ_ONLY, true),- new MetaItem<>(RULE_STATE, true)- ),- new Attribute<>("lastPresenceDetected", TIMESTAMP)- .addMeta(- new MetaItem<>(LABEL, "Last time movement was detected"),- new MetaItem<>(READ_ONLY, true),- new MetaItem<>(RULE_STATE, true)- )- );-- if (shouldBeLinked) {- room.getAttribute("motionSensor").ifPresent(attr -> attr.addMeta(- new MetaItem<>(AGENT_LINK, agentLinker.get()))- );- room.getAttribute("presenceDetected").ifPresent(attr -> attr.addMeta(- new MetaItem<>(AGENT_LINK, agentLinker.get()))- );- }- }-- protected void addDemoApartmentRoomCO2Sensor(RoomAsset room, boolean shouldBeLinked, Supplier<AgentLink<?>> agentLinker) {- room.getAttributes().addOrReplace(- new Attribute<>("co2Level", POSITIVE_INTEGER)- .addMeta(- new MetaItem<>(UNITS, Constants.units(UNITS_PART_PER_MILLION)),- new MetaItem<>(LABEL, "CO2 level"),- new MetaItem<>(RULE_STATE, true),- new MetaItem<>(RULE_EVENT, true),- new MetaItem<>(RULE_EVENT_EXPIRES, "PT45M"),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(READ_ONLY, true),- new MetaItem<>(STORE_DATA_POINTS)- ));-- if (shouldBeLinked) {- room.getAttribute("co2Level").ifPresent(attr -> attr.addMeta(- new MetaItem<>(AGENT_LINK, agentLinker.get()))- );- }- }-- protected void addDemoApartmentRoomHumiditySensor(RoomAsset room, boolean shouldBeLinked, Supplier<AgentLink<?>> agentLinker) {- room.getAttributes().addOrReplace(- new Attribute<>("humidity", POSITIVE_INTEGER)- .addMeta(- new MetaItem<>(LABEL, "Humidity"),- new MetaItem<>(RULE_STATE, true),- new MetaItem<>(RULE_EVENT, true),- new MetaItem<>(RULE_EVENT_EXPIRES, "PT45M"),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(READ_ONLY, true),- new MetaItem<>(UNITS, Constants.units(UNITS_PERCENTAGE)),- new MetaItem<>(STORE_DATA_POINTS)- ));-- if (shouldBeLinked) {- room.getAttribute("humidity").ifPresent(attr -> attr.addMeta(- new MetaItem<>(AGENT_LINK, agentLinker.get()))- );- }- }-- protected void addDemoApartmentRoomThermometer(RoomAsset room,- boolean shouldBeLinked,- Supplier<AgentLink<?>> agentLinker) {- room.getAttributes().addOrReplace(- new Attribute<>("currentTemperature", NUMBER)- .addMeta(- new MetaItem<>(LABEL, "Current temperature"),- new MetaItem<>(RULE_STATE, true),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(READ_ONLY, true),- new MetaItem<>(UNITS, Constants.units(UNITS_CELSIUS)),- new MetaItem<>(FORMAT, ValueFormat.NUMBER_1_DP()),- new MetaItem<>(STORE_DATA_POINTS)- ));-- if (shouldBeLinked) {- room.getAttribute("currentTemperature").ifPresent(attr -> attr.addMeta(- new MetaItem<>(AGENT_LINK, agentLinker.get()))- );- }- }-- protected void addDemoApartmentTemperatureControl(RoomAsset room,- boolean shouldBeLinked,- Supplier<AgentLink<?>> agentLinker) {- room.getAttributes().addOrReplace(- new Attribute<>("targetTemperature", NUMBER)- .addMeta(- new MetaItem<>(LABEL, "Target temperature"),- new MetaItem<>(RULE_STATE, true),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),- new MetaItem<>(UNITS, Constants.units(UNITS_CELSIUS)),- new MetaItem<>(FORMAT, ValueFormat.NUMBER_1_DP()),- new MetaItem<>(STORE_DATA_POINTS)- ));-- if (shouldBeLinked) {- room.getAttribute("targetTemperature").ifPresent(attr -> attr.addMeta(- new MetaItem<>(AGENT_LINK, agentLinker.get()))- );- }- }-- protected void addDemoApartmentSmartSwitch(RoomAsset room,- String switchName,- boolean shouldBeLinked,- // Integer represents attribute:- // 0 = Mode- // 1 = Time- // 2 = StartTime- // 3 = StopTime- // 4 = Enabled- Function<Integer, MetaItem[]> agentLinker) {-- room.getAttributes().addOrReplace(- // Mode- new Attribute<>("smartSwitchMode" + switchName, TEXT)- .addMeta(- new MetaItem<>(LABEL, "Smart Switch mode " + switchName),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),- new MetaItem<>(RULE_STATE, true),- new MetaItem<>(RULE_EVENT, true),- new MetaItem<>(RULE_EVENT_EXPIRES, "PT48H")),- // Time- new Attribute<>("smartSwitchBeginEnd" + switchName, TIMESTAMP)- .addMeta(- new MetaItem<>(LABEL, "Smart Switch begin/end cycle " + switchName),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),- new MetaItem<>(RULE_STATE, true)),- // StartTime- new Attribute<>("smartSwitchStartTime" + switchName, TIMESTAMP)- .addMeta(- new MetaItem<>(LABEL, "Smart Switch actuator earliest start time " + switchName),- new MetaItem<>(READ_ONLY, true),- new MetaItem<>(UNITS, Constants.units(UNITS_SECOND)),- new MetaItem<>(RULE_STATE, true)),- // StopTime- new Attribute<>("smartSwitchStopTime" + switchName, TIMESTAMP)- .addMeta(- new MetaItem<>(LABEL, "Smart Switch actuator latest stop time " + switchName),- new MetaItem<>(READ_ONLY, true),- new MetaItem<>(UNITS, Constants.units(UNITS_SECOND)),- new MetaItem<>(RULE_STATE, true)),- // Enabled- new Attribute<>("smartSwitchEnabled" + switchName, NUMBER)- .addMeta(- new MetaItem<>(LABEL, "Smart Switch actuator enabled " + switchName),- new MetaItem<>(READ_ONLY, true),- new MetaItem<>(RULE_STATE, true))- );-- if (shouldBeLinked) {- room.getAttribute("smartSwitchBeginEnd").ifPresent(attr -> attr.addMeta(- agentLinker.apply(0))- );- room.getAttribute("smartSwitchBeginEnd").ifPresent(attr -> attr.addMeta(- agentLinker.apply(1))- );- room.getAttribute("smartSwitchStartTime").ifPresent(attr -> attr.addMeta(- agentLinker.apply(2))- );- room.getAttribute("smartSwitchStopTime").ifPresent(attr -> attr.addMeta(- agentLinker.apply(3))- );- room.getAttribute("smartSwitchEnabled").ifPresent(attr -> attr.addMeta(- agentLinker.apply(4))- );- }- }-- protected void addDemoApartmentVentilation(BuildingAsset apartment,- boolean shouldBeLinked,- Supplier<AgentLink<?>> agentLinker) {- apartment.getAttributes().addOrReplace(- new Attribute<>("ventilationLevel", POSITIVE_INTEGER)- .addMeta(- new MetaItem<>(LABEL, "Ventilation level"),- new MetaItem<>(RULE_STATE, true),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),- new MetaItem<>(STORE_DATA_POINTS)),- new Attribute<>("ventilationAuto", BOOLEAN)- .addMeta(- new MetaItem<>(LABEL, "Ventilation auto"),- new MetaItem<>(RULE_STATE, true),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true)- )- );-- if (shouldBeLinked) {- apartment.getAttribute("ventilationLevel").ifPresent(attr -> attr.addMeta(- new MetaItem<>(AGENT_LINK, agentLinker.get()))- );- }- }-- public static class Scene {-- final String attributeName;- final String sceneName;- final String internalName;- final String startTime;- final boolean alarmEnabled;- final double targetTemperature;-- public Scene(String attributeName,- String sceneName,- String internalName,- String startTime,- boolean alarmEnabled,- double targetTemperature) {- this.attributeName = attributeName;- this.sceneName = sceneName;- this.internalName = internalName;- this.startTime = startTime;- this.alarmEnabled = alarmEnabled;- this.targetTemperature = targetTemperature;- }-- MacroAgent createSceneAgent(BuildingAsset apartment, RoomAsset... rooms) {- MacroAgent sceneAgent = new MacroAgent("Scene agent " + sceneName);- sceneAgent.setId(UniqueIdentifierGenerator.generateId());- sceneAgent.setParent(apartment);-- List<MacroAction> actions = new ArrayList<>();- actions.add(new MacroAction(new AttributeState(new AttributeRef(apartment.getId(), "alarmEnabled"), alarmEnabled)));-- for (RoomAsset room : rooms) {- if (room.hasAttribute("targetTemperature")) {- actions.add(- new MacroAction(new AttributeState(new AttributeRef(room.getId(), "targetTemperature"), targetTemperature))- );- }- }-- actions.add(- new MacroAction(new AttributeState(new AttributeRef(apartment.getId(), "lastExecutedScene"), internalName))- );-- sceneAgent.setMacroActions(actions.toArray(new MacroAction[0]));-- return sceneAgent;- }-- List<TimerAgent> createTimerAgents(String macroAgentId, BuildingAsset apartment) {- List<TimerAgent> agents = new ArrayList<>();-- for (DayOfWeek dayOfWeek : DayOfWeek.values()) {- // "MONDAY" => "Monday"- String dayOfWeekLabel = dayOfWeek.name().substring(0, 1) + dayOfWeek.name().substring(1).toLowerCase(Locale.ROOT);- // "0 0 7 ? *" => "0 0 7 ? * MON *"- String timePattern = startTime + " " + dayOfWeek.name().substring(0, 3).toUpperCase(Locale.ROOT) + " *";- TimerAgent timerAgent = new TimerAgent("Timer agent " + sceneName + " " + dayOfWeek.name());- timerAgent.setParent(apartment);- timerAgent.setId(UniqueIdentifierGenerator.generateId());- timerAgent.setTimerAction(- new AttributeState(apartment.getId(), attributeName, "REQUEST_START")- );- timerAgent.setTimerCronExpression(new CronExpressionParser(timePattern));- agents.add(timerAgent);- }- return agents;- }- }-- public static List<Agent<?,?,?>> createDemoApartmentScenes(AssetStorageService assetStorageService, BuildingAsset apartment, Scene[] scenes, RoomAsset... rooms) {-- List<Agent<?,?,?>> agents = new ArrayList<>();-- for (Scene scene : scenes) {- MacroAgent sceneAgent = scene.createSceneAgent(apartment, rooms);- agents.add(sceneAgent);- agents.addAll(scene.createTimerAgents(sceneAgent.getId(), apartment));- }-- addDemoApartmentSceneEnableDisableTimer(apartment, agents, scenes);- linkDemoApartmentWithSceneAgent(apartment, agents, scenes);- agents.forEach(assetStorageService::merge);- apartment = assetStorageService.merge(apartment);- return agents;- }-- protected static void addDemoApartmentSceneEnableDisableTimer(BuildingAsset apartment, List<Agent<?,?,?>> agents, Scene[] scenes) {-- MacroAgent enableSceneAgent = new MacroAgent("Scene agent enable");- MacroAgent disableSceneAgent = new MacroAgent("Scene agent disable");- List<MacroAction> enableActions = new ArrayList<>();- List<MacroAction> disableActions = new ArrayList<>();-- enableSceneAgent.setParent(apartment);- enableSceneAgent.setId(UniqueIdentifierGenerator.generateId());- disableSceneAgent.setParent(apartment);- disableSceneAgent.setId(UniqueIdentifierGenerator.generateId());-- for (Scene scene : scenes) {- for (DayOfWeek dayOfWeek : DayOfWeek.values()) {- String sceneAttributeName = scene.attributeName + "Enabled" + dayOfWeek;- enableActions.add(- new MacroAction(new AttributeState(new AttributeRef(apartment.getId(), sceneAttributeName), true))- );- disableActions.add(- new MacroAction(new AttributeState(new AttributeRef(apartment.getId(), sceneAttributeName), false))- );- }- }- enableActions.add(- new MacroAction(new AttributeState(new AttributeRef(apartment.getId(), "sceneTimerEnabled"), true))- );- disableActions.add(- new MacroAction(new AttributeState(new AttributeRef(apartment.getId(), "sceneTimerEnabled"), false))- );- enableSceneAgent.setMacroActions(enableActions.toArray(new MacroAction[0]));- disableSceneAgent.setMacroActions(disableActions.toArray(new MacroAction[0]));-- agents.add(enableSceneAgent);- agents.add(disableSceneAgent);- }-- protected static void linkDemoApartmentWithSceneAgent(Asset<?> apartment, List<Agent<?,?,?>> agents, Scene[] scenes) {-- MacroAgent enableSceneAgent = (MacroAgent) agents.get(agents.size()-2);- MacroAgent disableSceneAgent = (MacroAgent) agents.get(agents.size()-1);- int i=0;- for (Scene scene : scenes) {- MacroAgent sceneAgent = (MacroAgent) agents.get(i);-- apartment.getAttributes().addOrReplace(- new Attribute<>(scene.attributeName, EXECUTION_STATUS, AttributeExecuteStatus.READY)- .addMeta(- new MetaItem<>(LABEL, scene.sceneName),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(AGENT_LINK, new MacroAgent.MacroAgentLink(sceneAgent.getId()))- ),- new Attribute<>(scene.attributeName + "AlarmEnabled", BOOLEAN)- .addMeta(- new MetaItem<>(LABEL, scene.sceneName + " alarm enabled"),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(AGENT_LINK, new MacroAgent.MacroAgentLink(sceneAgent.getId()).setActionIndex(0))- ),- new Attribute<>(scene.attributeName + "TargetTemperature", ValueType.NUMBER)- .addMeta(- new MetaItem<>(LABEL, scene.sceneName + " target temperature"),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(AGENT_LINK, new MacroAgent.MacroAgentLink(sceneAgent.getId()).setActionIndex(1))- )- );- int j = 1;- for (DayOfWeek dayOfWeek : DayOfWeek.values()) {- // "MONDAY" => "Monday"- String dayOfWeekLabel = dayOfWeek.name().substring(0, 1) + dayOfWeek.name().substring(1).toLowerCase(Locale.ROOT);- apartment.getAttributes().addOrReplace(- new Attribute<>(scene.attributeName + "Time" + dayOfWeek.name(), ValueType.TEXT)- .addMeta(- new MetaItem<>(LABEL, scene.sceneName + " time " + dayOfWeekLabel),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),- new MetaItem<>(RULE_STATE, true),- new MetaItem<>(AGENT_LINK, new TimerAgent.TimerAgentLink(agents.get(i+j).getId()).setTimerValue(TimerValue.TIME))- ),- new Attribute<>(scene.attributeName + "Enabled" + dayOfWeek.name(), BOOLEAN)- .addMeta(- new MetaItem<>(LABEL, scene.sceneName + " enabled " + dayOfWeekLabel),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),- new MetaItem<>(AGENT_LINK, new TimerAgent.TimerAgentLink(agents.get(i+j).getId()).setTimerValue(TimerValue.ACTIVE))- )- );- j++;- }- i = i+8; // 1 scene agent + 7 timer agents- }- apartment.getAttributes().addOrReplace(- new Attribute<>("sceneTimerEnabled", BOOLEAN, true) // The scene timer is enabled when the timer protocol starts- .addMeta(- new MetaItem<>(LABEL, "Scene timer enabled"),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(READ_ONLY, true)- ),- new Attribute<>("enableSceneTimer", EXECUTION_STATUS)- .addMeta(- new MetaItem<>(LABEL, "Enable scene timer"),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),- new MetaItem<>(AGENT_LINK, new MacroAgent.MacroAgentLink(enableSceneAgent.getId()))- ),- new Attribute<>("disableSceneTimer", EXECUTION_STATUS)- .addMeta(- new MetaItem<>(LABEL, "Disable scene timer"),- new MetaItem<>(ACCESS_RESTRICTED_READ, true),- new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),- new MetaItem<>(AGENT_LINK, new MacroAgent.MacroAgentLink(disableSceneAgent.getId()))- )- );- }-- protected PeopleCounterAsset createDemoPeopleCounterAsset(String name, Asset<?> area, GeoJSONPoint location, Supplier<AgentLink<?>> agentLinker) {- PeopleCounterAsset peopleCounterAsset = new PeopleCounterAsset(name);- peopleCounterAsset.setParent(area);- peopleCounterAsset.getAttributes().addOrReplace(- new Attribute<>(Asset.LOCATION, location)- );- peopleCounterAsset.getAttribute("peopleCountIn").ifPresent(assetAttribute -> {- assetAttribute.addMeta(- new MetaItem<>(RULE_STATE),- new MetaItem<>(STORE_DATA_POINTS)- );- if (agentLinker != null) {- assetAttribute.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));- }- });- peopleCounterAsset.getAttribute("peopleCountOut").ifPresent(assetAttribute -> {- assetAttribute.addMeta(- new MetaItem<>(RULE_STATE),- new MetaItem<>(STORE_DATA_POINTS)- );- if (agentLinker != null) {- assetAttribute.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));- }- });- peopleCounterAsset.getAttribute("peopleCountInMinute").ifPresent(assetAttribute -> {- assetAttribute.addMeta(- new MetaItem<>(RULE_STATE),- new MetaItem<>(STORE_DATA_POINTS)- );- if (agentLinker != null) {- assetAttribute.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));- }- });- peopleCounterAsset.getAttribute("peopleCountOutMinute").ifPresent(assetAttribute -> {- assetAttribute.addMeta(- new MetaItem<>(RULE_STATE),- new MetaItem<>(STORE_DATA_POINTS)- );- if (agentLinker != null) {- assetAttribute.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));- }- });- peopleCounterAsset.getAttribute("peopleCountTotal").ifPresent(assetAttribute -> {- assetAttribute.addMeta(- new MetaItem<>(RULE_STATE),- new MetaItem<>(STORE_DATA_POINTS)- );- if (agentLinker != null) {- assetAttribute.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));- }- });-- return peopleCounterAsset;- }-- protected MicrophoneAsset createDemoMicrophoneAsset(String name, Asset<?> area, GeoJSONPoint location, Supplier<AgentLink<?>> agentLinker) {- MicrophoneAsset microphoneAsset = new MicrophoneAsset(name);- microphoneAsset.setParent(area);- microphoneAsset.getAttributes().addOrReplace(- new Attribute<>(Asset.LOCATION, location)- );- microphoneAsset.getAttribute(MicrophoneAsset.SOUND_LEVEL).ifPresent(assetAttribute -> {- assetAttribute.addMeta(- new MetaItem<>(RULE_STATE),- new MetaItem<>(READ_ONLY),- new MetaItem<>(STORE_DATA_POINTS)- );- if (agentLinker != null) {- assetAttribute.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));- }- });--- return microphoneAsset;- }-- protected EnvironmentSensorAsset createDemoEnvironmentAsset(String name, Asset<?> area, GeoJSONPoint location, Supplier<AgentLink<?>> agentLinker) {- EnvironmentSensorAsset environmentAsset = new EnvironmentSensorAsset(name);- environmentAsset.setParent(area);- environmentAsset.getAttributes().addOrReplace(- new Attribute<>(Asset.LOCATION, location)- );- environmentAsset.getAttributes().getOrCreate(EnvironmentSensorAsset.TEMPERATURE)- .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));- environmentAsset.getAttributes().getOrCreate(EnvironmentSensorAsset.NO2)- .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));- environmentAsset.getAttributes().getOrCreate(EnvironmentSensorAsset.RELATIVE_HUMIDITY)- .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));- environmentAsset.getAttributes().getOrCreate(EnvironmentSensorAsset.PM1)- .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));- environmentAsset.getAttributes().getOrCreate(EnvironmentSensorAsset.PM2_5)- .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));- environmentAsset.getAttributes().getOrCreate(EnvironmentSensorAsset.PM10)- .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));-- return environmentAsset;- }-- protected LightAsset createDemoLightAsset(String name, Asset<?> area, GeoJSONPoint location) {- LightAsset lightAsset = new LightAsset(name);- lightAsset.setParent(area);- lightAsset.getAttributes().addOrReplace(- new Attribute<>(Asset.LOCATION, location)- );- lightAsset.getAttributes().getOrCreate(LightAsset.ON_OFF).addMeta(- new MetaItem<>(RULE_STATE),- new MetaItem<>(STORE_DATA_POINTS)- );- lightAsset.getAttributes().getOrCreate(LightAsset.BRIGHTNESS).addMeta(- new MetaItem<>(RULE_STATE),- new MetaItem<>(STORE_DATA_POINTS)- );- lightAsset.getAttributes().getOrCreate(LightAsset.COLOUR_RGB).addMeta(- new MetaItem<>(RULE_STATE),- new MetaItem<>(STORE_DATA_POINTS)- );- lightAsset.getAttributes().getOrCreate("groupNumber", POSITIVE_INTEGER).addMeta(- new MetaItem<>(RULE_STATE),- new MetaItem<>(STORE_DATA_POINTS)- );- lightAsset.getAttributes().getOrCreate("scenario", TEXT).addMeta(- new MetaItem<>(RULE_STATE)- );-- return lightAsset;- }-- protected LightAsset createDemoLightControllerAsset(String name, Asset<?> area, GeoJSONPoint location) {- LightAsset lightAsset = new LightAsset(name);- lightAsset.setParent(area);- lightAsset.getAttributes().addOrReplace(- new Attribute<>(Asset.LOCATION, location)- );- lightAsset.getAttributes().getOrCreate(LightAsset.ON_OFF).addMeta(- new MetaItem<>(RULE_STATE),- new MetaItem<>(STORE_DATA_POINTS)- );- lightAsset.getAttributes().getOrCreate(LightAsset.BRIGHTNESS).addMeta(- new MetaItem<>(RULE_STATE),- new MetaItem<>(STORE_DATA_POINTS)- );- lightAsset.getAttributes().getOrCreate(LightAsset.COLOUR_RGB).addMeta(- new MetaItem<>(RULE_STATE),- new MetaItem<>(STORE_DATA_POINTS)- );- lightAsset.getAttributes().getOrCreate("scenario", TEXT).addMeta(- new MetaItem<>(RULE_STATE)- );-- return lightAsset;- }-- protected ElectricityStorageAsset createDemoElectricityStorageAsset(String name, Asset<?> area, GeoJSONPoint location) {- ElectricityStorageAsset electricityStorageAsset = new ElectricityBatteryAsset(name);- electricityStorageAsset.setParent(area);- electricityStorageAsset.getAttributes().addOrReplace(- new Attribute<>(Asset.LOCATION, location)- );-- return electricityStorageAsset;- }-- protected ElectricityProducerSolarAsset createDemoElectricitySolarProducerAsset(String name, Asset<?> area, GeoJSONPoint location) {- ElectricityProducerSolarAsset electricityProducerAsset = new ElectricityProducerSolarAsset(name);- electricityProducerAsset.setParent(area);- electricityProducerAsset.getAttributes().addOrReplace(- new Attribute<>(Asset.LOCATION, location)- );-- return electricityProducerAsset;- }-- protected ElectricityConsumerAsset createDemoElectricityConsumerAsset(String name, Asset<?> area, GeoJSONPoint location) {- ElectricityConsumerAsset electricityConsumerAsset = new ElectricityConsumerAsset(name);- electricityConsumerAsset.setParent(area);- electricityConsumerAsset.getAttributes().addOrReplace(- new Attribute<>(Asset.LOCATION, location)- );-- return electricityConsumerAsset;- }-- protected ElectricityChargerAsset createDemoElectricityChargerAsset(String name, Asset<?> area, GeoJSONPoint location) {- ElectricityChargerAsset electricityChargerAsset = new ElectricityChargerAsset(name);- electricityChargerAsset.setParent(area);- electricityChargerAsset.getAttributes().addOrReplace(- new Attribute<>(Asset.LOCATION, location)- );-- return electricityChargerAsset;- }-- protected GroundwaterSensorAsset createDemoGroundwaterAsset(String name, Asset<?> area, GeoJSONPoint location) {- GroundwaterSensorAsset groundwaterAsset = new GroundwaterSensorAsset(name);- groundwaterAsset.setParent(area);- groundwaterAsset.getAttributes().addOrReplace(- new Attribute<>(Asset.LOCATION, location)- );-- return groundwaterAsset;- }-- protected ParkingAsset createDemoParkingAsset(String name, Asset<?> area, GeoJSONPoint location) {- ParkingAsset parkingAsset = new ParkingAsset(name);- parkingAsset.setParent(area);- parkingAsset.getAttributes().addOrReplace(- new Attribute<>(Asset.LOCATION, location)- );-- return parkingAsset;- }-- protected ShipAsset createDemoShipAsset(String name, Asset<?> area, GeoJSONPoint location) {- ShipAsset shipAsset = new ShipAsset(name);- shipAsset.setParent(area);- shipAsset.getAttributes().addOrReplace(- new Attribute<>(Asset.LOCATION, location)- );-- return shipAsset;- }-}diff --git a/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java b/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.javanew file mode 100644index 000000000..91ca49da7--- /dev/null+++ b/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java@@ -0,0 +1,674 @@+/*+ * Copyright 2016, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.manager.setup;++import org.openremote.agent.protocol.macro.MacroAction;+import org.openremote.agent.protocol.macro.MacroAgent;+import org.openremote.agent.protocol.timer.CronExpressionParser;+import org.openremote.agent.protocol.timer.TimerAgent;+import org.openremote.agent.protocol.timer.TimerValue;+import org.openremote.container.util.UniqueIdentifierGenerator;+import org.openremote.manager.asset.AssetProcessingService;+import org.openremote.manager.asset.AssetStorageService;+import org.openremote.manager.datapoint.AssetDatapointService;+import org.openremote.manager.persistence.ManagerPersistenceService;+import org.openremote.manager.datapoint.AssetPredictedDatapointService;+import org.openremote.manager.rules.RulesetStorageService;+import org.openremote.manager.security.ManagerIdentityService;+import org.openremote.model.Constants;+import org.openremote.model.Container;+import org.openremote.model.apps.ConsoleAppConfig;+import org.openremote.model.asset.Asset;+import org.openremote.model.asset.agent.Agent;+import org.openremote.model.asset.agent.AgentLink;+import org.openremote.model.asset.impl.*;+import org.openremote.model.attribute.*;+import org.openremote.model.geo.GeoJSONPoint;+import org.openremote.model.value.ValueFormat;+import org.openremote.model.value.ValueType;+import org.openremote.model.value.Values;++import jline.internal.Log;++import java.io.IOException;+import java.nio.file.Files;+import java.nio.file.Path;+import java.nio.file.Paths;+import java.time.DayOfWeek;+import java.util.ArrayList;+import java.util.List;+import java.util.Locale;+import java.util.concurrent.ScheduledExecutorService;+import java.util.function.Function;+import java.util.function.Supplier;++import static org.openremote.model.Constants.*;+import static org.openremote.model.value.MetaItemType.*;+import static org.openremote.model.value.ValueType.*;+import static org.openremote.container.util.MapAccess.getString;++public class ManagerSetup implements Setup {++ public static final String PROVISION_DOCROOT = "PROVISION_DOCROOT";+ public static final String PROVISION_DOCROOT_DEFAULT = "deployment/manager/provisioning";++ protected Path provisionDocRoot;++ final protected ScheduledExecutorService executorService;+ final protected ManagerPersistenceService persistenceService;+ final protected ManagerIdentityService identityService;+ final protected AssetStorageService assetStorageService;+ final protected AssetProcessingService assetProcessingService;+ final protected AssetDatapointService assetDatapointService;+ final protected AssetPredictedDatapointService assetPredictedDatapointService;+ final protected RulesetStorageService rulesetStorageService;+ final protected SetupService setupService;+ final protected MetaItem<?>[] EMPTY_META = new MetaItem<?>[0];++ public ManagerSetup(Container container) {+ this.executorService = container.getExecutorService();+ this.persistenceService = container.getService(ManagerPersistenceService.class);+ this.identityService = container.getService(ManagerIdentityService.class);+ this.assetStorageService = container.getService(AssetStorageService.class);+ this.assetProcessingService = container.getService(AssetProcessingService.class);+ this.assetDatapointService = container.getService(AssetDatapointService.class);+ this.assetPredictedDatapointService = container.getService(AssetPredictedDatapointService.class);+ this.rulesetStorageService = container.getService(RulesetStorageService.class);+ this.setupService = container.getService(SetupService.class);++ provisionDocRoot = Paths.get(getString(container.getConfig(), PROVISION_DOCROOT, PROVISION_DOCROOT_DEFAULT));+ }++ @Override+ public void onStart() throws Exception {+ provisionConsoleAppConfig();+ provisionAssets();+ }++ @Override+ public void onInit() throws Exception {+ }++ // ################################ Demo apartment with complex scenes+ // ###################################++ protected BuildingAsset createDemoApartment(Asset<?> parent, String name, GeoJSONPoint location) {+ BuildingAsset apartment = new BuildingAsset(name);++ apartment.setParent(parent);+ apartment.addOrReplaceAttributes(+ new Attribute<>("alarmEnabled", BOOLEAN).addMeta(new MetaItem<>(LABEL, "Alarm enabled"),+ new MetaItem<>(ACCESS_RESTRICTED_READ, true), new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),+ new MetaItem<>(RULE_STATE, true)),+ new Attribute<>("presenceDetected", BOOLEAN).addMeta(new MetaItem<>(LABEL, "Presence detected"),+ new MetaItem<>(ACCESS_RESTRICTED_READ, true), new MetaItem<>(READ_ONLY, true),+ new MetaItem<>(RULE_STATE, true), new MetaItem<>(STORE_DATA_POINTS, true)),+ new Attribute<>("vacationUntil", TIMESTAMP).addMeta(new MetaItem<>(LABEL, "Vacation until"),+ new MetaItem<>(ACCESS_RESTRICTED_READ, true), new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),+ new MetaItem<>(RULE_STATE, true)),+ new Attribute<>("lastExecutedScene", ValueType.TEXT).addMeta(+ new MetaItem<>(LABEL, "Last executed scene"), new MetaItem<>(ACCESS_RESTRICTED_READ, true),+ new MetaItem<>(READ_ONLY, true), new MetaItem<>(RULE_STATE, true)),+ new Attribute<>(Asset.LOCATION, location).addMeta(new MetaItem<>(ACCESS_RESTRICTED_READ, true))+ /*+ * TODO Unused, can be removed? Port schedule prediction from DRL... new+ * Attribute<>("autoSceneSchedule", ValueType.BOOLEAN) .addMeta( new+ * MetaItem<>(LABEL, "Automatic scene schedule"), new MetaItem<>(DESCRIPTION,+ * "Predict presence and automatically adjust scene schedule"), new+ * MetaItem<>(ACCESS_RESTRICTED_READ, true), new+ * MetaItem<>(ACCESS_RESTRICTED_WRITE, true), new MetaItem<>(RULE_STATE, true)+ * ), new Attribute<>("lastDetectedScene", ValueType.STRING) .addMeta( new+ * MetaItem<>(LABEL, "Last detected scene by rules"), new MetaItem<>(READ_ONLY,+ * true), new MetaItem<>(RULE_STATE, true) )+ */+ );+ return apartment;+ }++ protected RoomAsset createDemoApartmentRoom(Asset<?> apartment, String name) {+ RoomAsset room = new RoomAsset(name);+ room.setParent(apartment);+ return room;+ }++ protected void addDemoApartmentRoomMotionSensor(RoomAsset room, boolean shouldBeLinked,+ Supplier<AgentLink<?>> agentLinker) {+ room.getAttributes().addOrReplace(+ new Attribute<>("motionSensor", INTEGER).addMeta(new MetaItem<>(LABEL, "Motion sensor"),+ new MetaItem<>(READ_ONLY, true), new MetaItem<>(RULE_STATE, true),+ new MetaItem<>(STORE_DATA_POINTS)),+ new Attribute<>("presenceDetected", BOOLEAN).addMeta(new MetaItem<>(LABEL, "Presence detected"),+ new MetaItem<>(RULE_STATE, true), new MetaItem<>(ACCESS_RESTRICTED_READ, true),+ new MetaItem<>(READ_ONLY, true), new MetaItem<>(STORE_DATA_POINTS, true)),+ new Attribute<>("firstPresenceDetected", TIMESTAMP).addMeta(+ new MetaItem<>(LABEL, "First time movement was detected"), new MetaItem<>(READ_ONLY, true),+ new MetaItem<>(RULE_STATE, true)),+ new Attribute<>("lastPresenceDetected", TIMESTAMP).addMeta(+ new MetaItem<>(LABEL, "Last time movement was detected"), new MetaItem<>(READ_ONLY, true),+ new MetaItem<>(RULE_STATE, true)));++ if (shouldBeLinked) {+ room.getAttribute("motionSensor")+ .ifPresent(attr -> attr.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get())));+ room.getAttribute("presenceDetected")+ .ifPresent(attr -> attr.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get())));+ }+ }++ protected void addDemoApartmentRoomCO2Sensor(RoomAsset room, boolean shouldBeLinked,+ Supplier<AgentLink<?>> agentLinker) {+ room.getAttributes().addOrReplace(new Attribute<>("co2Level", POSITIVE_INTEGER).addMeta(+ new MetaItem<>(UNITS, Constants.units(UNITS_PART_PER_MILLION)), new MetaItem<>(LABEL, "CO2 level"),+ new MetaItem<>(RULE_STATE, true), new MetaItem<>(RULE_EVENT, true),+ new MetaItem<>(RULE_EVENT_EXPIRES, "PT45M"), new MetaItem<>(ACCESS_RESTRICTED_READ, true),+ new MetaItem<>(READ_ONLY, true), new MetaItem<>(STORE_DATA_POINTS)));++ if (shouldBeLinked) {+ room.getAttribute("co2Level")+ .ifPresent(attr -> attr.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get())));+ }+ }++ protected void addDemoApartmentRoomHumiditySensor(RoomAsset room, boolean shouldBeLinked,+ Supplier<AgentLink<?>> agentLinker) {+ room.getAttributes()+ .addOrReplace(new Attribute<>("humidity", POSITIVE_INTEGER).addMeta(new MetaItem<>(LABEL, "Humidity"),+ new MetaItem<>(RULE_STATE, true), new MetaItem<>(RULE_EVENT, true),+ new MetaItem<>(RULE_EVENT_EXPIRES, "PT45M"), new MetaItem<>(ACCESS_RESTRICTED_READ, true),+ new MetaItem<>(READ_ONLY, true), new MetaItem<>(UNITS, Constants.units(UNITS_PERCENTAGE)),+ new MetaItem<>(STORE_DATA_POINTS)));++ if (shouldBeLinked) {+ room.getAttribute("humidity")+ .ifPresent(attr -> attr.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get())));+ }+ }++ protected void addDemoApartmentRoomThermometer(RoomAsset room, boolean shouldBeLinked,+ Supplier<AgentLink<?>> agentLinker) {+ room.getAttributes()+ .addOrReplace(new Attribute<>("currentTemperature", NUMBER).addMeta(+ new MetaItem<>(LABEL, "Current temperature"), new MetaItem<>(RULE_STATE, true),+ new MetaItem<>(ACCESS_RESTRICTED_READ, true), new MetaItem<>(READ_ONLY, true),+ new MetaItem<>(UNITS, Constants.units(UNITS_CELSIUS)),+ new MetaItem<>(FORMAT, ValueFormat.NUMBER_1_DP()), new MetaItem<>(STORE_DATA_POINTS)));++ if (shouldBeLinked) {+ room.getAttribute("currentTemperature")+ .ifPresent(attr -> attr.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get())));+ }+ }++ protected void addDemoApartmentTemperatureControl(RoomAsset room, boolean shouldBeLinked,+ Supplier<AgentLink<?>> agentLinker) {+ room.getAttributes()+ .addOrReplace(new Attribute<>("targetTemperature", NUMBER).addMeta(+ new MetaItem<>(LABEL, "Target temperature"), new MetaItem<>(RULE_STATE, true),+ new MetaItem<>(ACCESS_RESTRICTED_READ, true), new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),+ new MetaItem<>(UNITS, Constants.units(UNITS_CELSIUS)),+ new MetaItem<>(FORMAT, ValueFormat.NUMBER_1_DP()), new MetaItem<>(STORE_DATA_POINTS)));++ if (shouldBeLinked) {+ room.getAttribute("targetTemperature")+ .ifPresent(attr -> attr.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get())));+ }+ }++ protected void addDemoApartmentSmartSwitch(RoomAsset room, String switchName, boolean shouldBeLinked,+ // Integer represents attribute:+ // 0 = Mode+ // 1 = Time+ // 2 = StartTime+ // 3 = StopTime+ // 4 = Enabled+ Function<Integer, MetaItem[]> agentLinker) {++ room.getAttributes().addOrReplace(+ // Mode+ new Attribute<>("smartSwitchMode" + switchName, TEXT).addMeta(+ new MetaItem<>(LABEL, "Smart Switch mode " + switchName),+ new MetaItem<>(ACCESS_RESTRICTED_READ, true), new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),+ new MetaItem<>(RULE_STATE, true), new MetaItem<>(RULE_EVENT, true),+ new MetaItem<>(RULE_EVENT_EXPIRES, "PT48H")),+ // Time+ new Attribute<>("smartSwitchBeginEnd" + switchName, TIMESTAMP).addMeta(+ new MetaItem<>(LABEL, "Smart Switch begin/end cycle " + switchName),+ new MetaItem<>(ACCESS_RESTRICTED_READ, true), new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),+ new MetaItem<>(RULE_STATE, true)),+ // StartTime+ new Attribute<>("smartSwitchStartTime" + switchName, TIMESTAMP).addMeta(+ new MetaItem<>(LABEL, "Smart Switch actuator earliest start time " + switchName),+ new MetaItem<>(READ_ONLY, true), new MetaItem<>(UNITS, Constants.units(UNITS_SECOND)),+ new MetaItem<>(RULE_STATE, true)),+ // StopTime+ new Attribute<>("smartSwitchStopTime" + switchName, TIMESTAMP).addMeta(+ new MetaItem<>(LABEL, "Smart Switch actuator latest stop time " + switchName),+ new MetaItem<>(READ_ONLY, true), new MetaItem<>(UNITS, Constants.units(UNITS_SECOND)),+ new MetaItem<>(RULE_STATE, true)),+ // Enabled+ new Attribute<>("smartSwitchEnabled" + switchName, NUMBER).addMeta(+ new MetaItem<>(LABEL, "Smart Switch actuator enabled " + switchName),+ new MetaItem<>(READ_ONLY, true), new MetaItem<>(RULE_STATE, true)));++ if (shouldBeLinked) {+ room.getAttribute("smartSwitchBeginEnd").ifPresent(attr -> attr.addMeta(agentLinker.apply(0)));+ room.getAttribute("smartSwitchBeginEnd").ifPresent(attr -> attr.addMeta(agentLinker.apply(1)));+ room.getAttribute("smartSwitchStartTime").ifPresent(attr -> attr.addMeta(agentLinker.apply(2)));+ room.getAttribute("smartSwitchStopTime").ifPresent(attr -> attr.addMeta(agentLinker.apply(3)));+ room.getAttribute("smartSwitchEnabled").ifPresent(attr -> attr.addMeta(agentLinker.apply(4)));+ }+ }++ protected void addDemoApartmentVentilation(BuildingAsset apartment, boolean shouldBeLinked,+ Supplier<AgentLink<?>> agentLinker) {+ apartment.getAttributes().addOrReplace(+ new Attribute<>("ventilationLevel", POSITIVE_INTEGER).addMeta(+ new MetaItem<>(LABEL, "Ventilation level"), new MetaItem<>(RULE_STATE, true),+ new MetaItem<>(ACCESS_RESTRICTED_READ, true), new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),+ new MetaItem<>(STORE_DATA_POINTS)),+ new Attribute<>("ventilationAuto", BOOLEAN).addMeta(new MetaItem<>(LABEL, "Ventilation auto"),+ new MetaItem<>(RULE_STATE, true), new MetaItem<>(ACCESS_RESTRICTED_READ, true),+ new MetaItem<>(ACCESS_RESTRICTED_WRITE, true)));++ if (shouldBeLinked) {+ apartment.getAttribute("ventilationLevel")+ .ifPresent(attr -> attr.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get())));+ }+ }++ public static class Scene {++ final String attributeName;+ final String sceneName;+ final String internalName;+ final String startTime;+ final boolean alarmEnabled;+ final double targetTemperature;++ public Scene(String attributeName, String sceneName, String internalName, String startTime,+ boolean alarmEnabled, double targetTemperature) {+ this.attributeName = attributeName;+ this.sceneName = sceneName;+ this.internalName = internalName;+ this.startTime = startTime;+ this.alarmEnabled = alarmEnabled;+ this.targetTemperature = targetTemperature;+ }++ MacroAgent createSceneAgent(BuildingAsset apartment, RoomAsset... rooms) {+ MacroAgent sceneAgent = new MacroAgent("Scene agent " + sceneName);+ sceneAgent.setId(UniqueIdentifierGenerator.generateId());+ sceneAgent.setParent(apartment);++ List<MacroAction> actions = new ArrayList<>();+ actions.add(new MacroAction(+ new AttributeState(new AttributeRef(apartment.getId(), "alarmEnabled"), alarmEnabled)));++ for (RoomAsset room : rooms) {+ if (room.hasAttribute("targetTemperature")) {+ actions.add(new MacroAction(new AttributeState(new AttributeRef(room.getId(), "targetTemperature"),+ targetTemperature)));+ }+ }++ actions.add(new MacroAction(+ new AttributeState(new AttributeRef(apartment.getId(), "lastExecutedScene"), internalName)));++ sceneAgent.setMacroActions(actions.toArray(new MacroAction[0]));++ return sceneAgent;+ }++ List<TimerAgent> createTimerAgents(String macroAgentId, BuildingAsset apartment) {+ List<TimerAgent> agents = new ArrayList<>();++ for (DayOfWeek dayOfWeek : DayOfWeek.values()) {+ // "MONDAY" => "Monday"+ String dayOfWeekLabel = dayOfWeek.name().substring(0, 1)+ + dayOfWeek.name().substring(1).toLowerCase(Locale.ROOT);+ // "0 0 7 ? *" => "0 0 7 ? * MON *"+ String timePattern = startTime + " " + dayOfWeek.name().substring(0, 3).toUpperCase(Locale.ROOT) + " *";+ TimerAgent timerAgent = new TimerAgent("Timer agent " + sceneName + " " + dayOfWeek.name());+ timerAgent.setParent(apartment);+ timerAgent.setId(UniqueIdentifierGenerator.generateId());+ timerAgent.setTimerAction(new AttributeState(apartment.getId(), attributeName, "REQUEST_START"));+ timerAgent.setTimerCronExpression(new CronExpressionParser(timePattern));+ agents.add(timerAgent);+ }+ return agents;+ }+ }++ public static List<Agent<?, ?, ?>> createDemoApartmentScenes(AssetStorageService assetStorageService,+ BuildingAsset apartment, Scene[] scenes, RoomAsset... rooms) {++ List<Agent<?, ?, ?>> agents = new ArrayList<>();++ for (Scene scene : scenes) {+ MacroAgent sceneAgent = scene.createSceneAgent(apartment, rooms);+ agents.add(sceneAgent);+ agents.addAll(scene.createTimerAgents(sceneAgent.getId(), apartment));+ }++ addDemoApartmentSceneEnableDisableTimer(apartment, agents, scenes);+ linkDemoApartmentWithSceneAgent(apartment, agents, scenes);+ agents.forEach(assetStorageService::merge);+ apartment = assetStorageService.merge(apartment);+ return agents;+ }++ protected static void addDemoApartmentSceneEnableDisableTimer(BuildingAsset apartment, List<Agent<?, ?, ?>> agents,+ Scene[] scenes) {++ MacroAgent enableSceneAgent = new MacroAgent("Scene agent enable");+ MacroAgent disableSceneAgent = new MacroAgent("Scene agent disable");+ List<MacroAction> enableActions = new ArrayList<>();+ List<MacroAction> disableActions = new ArrayList<>();++ enableSceneAgent.setParent(apartment);+ enableSceneAgent.setId(UniqueIdentifierGenerator.generateId());+ disableSceneAgent.setParent(apartment);+ disableSceneAgent.setId(UniqueIdentifierGenerator.generateId());++ for (Scene scene : scenes) {+ for (DayOfWeek dayOfWeek : DayOfWeek.values()) {+ String sceneAttributeName = scene.attributeName + "Enabled" + dayOfWeek;+ enableActions.add(new MacroAction(+ new AttributeState(new AttributeRef(apartment.getId(), sceneAttributeName), true)));+ disableActions.add(new MacroAction(+ new AttributeState(new AttributeRef(apartment.getId(), sceneAttributeName), false)));+ }+ }+ enableActions.add(+ new MacroAction(new AttributeState(new AttributeRef(apartment.getId(), "sceneTimerEnabled"), true)));+ disableActions.add(+ new MacroAction(new AttributeState(new AttributeRef(apartment.getId(), "sceneTimerEnabled"), false)));+ enableSceneAgent.setMacroActions(enableActions.toArray(new MacroAction[0]));+ disableSceneAgent.setMacroActions(disableActions.toArray(new MacroAction[0]));++ agents.add(enableSceneAgent);+ agents.add(disableSceneAgent);+ }++ protected static void linkDemoApartmentWithSceneAgent(Asset<?> apartment, List<Agent<?, ?, ?>> agents,+ Scene[] scenes) {++ MacroAgent enableSceneAgent = (MacroAgent) agents.get(agents.size() - 2);+ MacroAgent disableSceneAgent = (MacroAgent) agents.get(agents.size() - 1);+ int i = 0;+ for (Scene scene : scenes) {+ MacroAgent sceneAgent = (MacroAgent) agents.get(i);++ apartment.getAttributes().addOrReplace(+ new Attribute<>(scene.attributeName, EXECUTION_STATUS, AttributeExecuteStatus.READY).addMeta(+ new MetaItem<>(LABEL, scene.sceneName), new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),+ new MetaItem<>(ACCESS_RESTRICTED_READ, true),+ new MetaItem<>(AGENT_LINK, new MacroAgent.MacroAgentLink(sceneAgent.getId()))),+ new Attribute<>(scene.attributeName + "AlarmEnabled", BOOLEAN).addMeta(+ new MetaItem<>(LABEL, scene.sceneName + " alarm enabled"),+ new MetaItem<>(ACCESS_RESTRICTED_WRITE, true), new MetaItem<>(ACCESS_RESTRICTED_READ, true),+ new MetaItem<>(AGENT_LINK,+ new MacroAgent.MacroAgentLink(sceneAgent.getId()).setActionIndex(0))),+ new Attribute<>(scene.attributeName + "TargetTemperature", ValueType.NUMBER).addMeta(+ new MetaItem<>(LABEL, scene.sceneName + " target temperature"),+ new MetaItem<>(ACCESS_RESTRICTED_WRITE, true), new MetaItem<>(ACCESS_RESTRICTED_READ, true),+ new MetaItem<>(AGENT_LINK,+ new MacroAgent.MacroAgentLink(sceneAgent.getId()).setActionIndex(1))));+ int j = 1;+ for (DayOfWeek dayOfWeek : DayOfWeek.values()) {+ // "MONDAY" => "Monday"+ String dayOfWeekLabel = dayOfWeek.name().substring(0, 1)+ + dayOfWeek.name().substring(1).toLowerCase(Locale.ROOT);+ apartment.getAttributes().addOrReplace(+ new Attribute<>(scene.attributeName + "Time" + dayOfWeek.name(), ValueType.TEXT).addMeta(+ new MetaItem<>(LABEL, scene.sceneName + " time " + dayOfWeekLabel),+ new MetaItem<>(ACCESS_RESTRICTED_READ, true),+ new MetaItem<>(ACCESS_RESTRICTED_WRITE, true), new MetaItem<>(RULE_STATE, true),+ new MetaItem<>(AGENT_LINK,+ new TimerAgent.TimerAgentLink(agents.get(i + j).getId())+ .setTimerValue(TimerValue.TIME))),+ new Attribute<>(scene.attributeName + "Enabled" + dayOfWeek.name(), BOOLEAN).addMeta(+ new MetaItem<>(LABEL, scene.sceneName + " enabled " + dayOfWeekLabel),+ new MetaItem<>(ACCESS_RESTRICTED_READ, true),+ new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),+ new MetaItem<>(AGENT_LINK, new TimerAgent.TimerAgentLink(agents.get(i + j).getId())+ .setTimerValue(TimerValue.ACTIVE))));+ j++;+ }+ i = i + 8; // 1 scene agent + 7 timer agents+ }+ apartment.getAttributes().addOrReplace(new Attribute<>("sceneTimerEnabled", BOOLEAN, true) // The scene timer is+ // enabled when the+ // timer protocol+ // starts+ .addMeta(new MetaItem<>(LABEL, "Scene timer enabled"), new MetaItem<>(ACCESS_RESTRICTED_READ, true),+ new MetaItem<>(READ_ONLY, true)),+ new Attribute<>("enableSceneTimer", EXECUTION_STATUS).addMeta(+ new MetaItem<>(LABEL, "Enable scene timer"), new MetaItem<>(ACCESS_RESTRICTED_READ, true),+ new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),+ new MetaItem<>(AGENT_LINK, new MacroAgent.MacroAgentLink(enableSceneAgent.getId()))),+ new Attribute<>("disableSceneTimer", EXECUTION_STATUS).addMeta(+ new MetaItem<>(LABEL, "Disable scene timer"), new MetaItem<>(ACCESS_RESTRICTED_READ, true),+ new MetaItem<>(ACCESS_RESTRICTED_WRITE, true),+ new MetaItem<>(AGENT_LINK, new MacroAgent.MacroAgentLink(disableSceneAgent.getId()))));+ }++ protected PeopleCounterAsset createDemoPeopleCounterAsset(String name, Asset<?> area, GeoJSONPoint location,+ Supplier<AgentLink<?>> agentLinker) {+ PeopleCounterAsset peopleCounterAsset = new PeopleCounterAsset(name);+ peopleCounterAsset.setParent(area);+ peopleCounterAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));+ peopleCounterAsset.getAttribute("peopleCountIn").ifPresent(assetAttribute -> {+ assetAttribute.addMeta(new MetaItem<>(RULE_STATE), new MetaItem<>(STORE_DATA_POINTS));+ if (agentLinker != null) {+ assetAttribute.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));+ }+ });+ peopleCounterAsset.getAttribute("peopleCountOut").ifPresent(assetAttribute -> {+ assetAttribute.addMeta(new MetaItem<>(RULE_STATE), new MetaItem<>(STORE_DATA_POINTS));+ if (agentLinker != null) {+ assetAttribute.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));+ }+ });+ peopleCounterAsset.getAttribute("peopleCountInMinute").ifPresent(assetAttribute -> {+ assetAttribute.addMeta(new MetaItem<>(RULE_STATE), new MetaItem<>(STORE_DATA_POINTS));+ if (agentLinker != null) {+ assetAttribute.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));+ }+ });+ peopleCounterAsset.getAttribute("peopleCountOutMinute").ifPresent(assetAttribute -> {+ assetAttribute.addMeta(new MetaItem<>(RULE_STATE), new MetaItem<>(STORE_DATA_POINTS));+ if (agentLinker != null) {+ assetAttribute.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));+ }+ });+ peopleCounterAsset.getAttribute("peopleCountTotal").ifPresent(assetAttribute -> {+ assetAttribute.addMeta(new MetaItem<>(RULE_STATE), new MetaItem<>(STORE_DATA_POINTS));+ if (agentLinker != null) {+ assetAttribute.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));+ }+ });++ return peopleCounterAsset;+ }++ protected MicrophoneAsset createDemoMicrophoneAsset(String name, Asset<?> area, GeoJSONPoint location,+ Supplier<AgentLink<?>> agentLinker) {+ MicrophoneAsset microphoneAsset = new MicrophoneAsset(name);+ microphoneAsset.setParent(area);+ microphoneAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));+ microphoneAsset.getAttribute(MicrophoneAsset.SOUND_LEVEL).ifPresent(assetAttribute -> {+ assetAttribute.addMeta(new MetaItem<>(RULE_STATE), new MetaItem<>(READ_ONLY),+ new MetaItem<>(STORE_DATA_POINTS));+ if (agentLinker != null) {+ assetAttribute.addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));+ }+ });++ return microphoneAsset;+ }++ protected EnvironmentSensorAsset createDemoEnvironmentAsset(String name, Asset<?> area, GeoJSONPoint location,+ Supplier<AgentLink<?>> agentLinker) {+ EnvironmentSensorAsset environmentAsset = new EnvironmentSensorAsset(name);+ environmentAsset.setParent(area);+ environmentAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));+ environmentAsset.getAttributes().getOrCreate(EnvironmentSensorAsset.TEMPERATURE)+ .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));+ environmentAsset.getAttributes().getOrCreate(EnvironmentSensorAsset.NO2)+ .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));+ environmentAsset.getAttributes().getOrCreate(EnvironmentSensorAsset.RELATIVE_HUMIDITY)+ .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));+ environmentAsset.getAttributes().getOrCreate(EnvironmentSensorAsset.PM1)+ .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));+ environmentAsset.getAttributes().getOrCreate(EnvironmentSensorAsset.PM2_5)+ .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));+ environmentAsset.getAttributes().getOrCreate(EnvironmentSensorAsset.PM10)+ .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()));++ return environmentAsset;+ }++ protected LightAsset createDemoLightAsset(String name, Asset<?> area, GeoJSONPoint location) {+ LightAsset lightAsset = new LightAsset(name);+ lightAsset.setParent(area);+ lightAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));+ lightAsset.getAttributes().getOrCreate(LightAsset.ON_OFF).addMeta(new MetaItem<>(RULE_STATE),+ new MetaItem<>(STORE_DATA_POINTS));+ lightAsset.getAttributes().getOrCreate(LightAsset.BRIGHTNESS).addMeta(new MetaItem<>(RULE_STATE),+ new MetaItem<>(STORE_DATA_POINTS));+ lightAsset.getAttributes().getOrCreate(LightAsset.COLOUR_RGB).addMeta(new MetaItem<>(RULE_STATE),+ new MetaItem<>(STORE_DATA_POINTS));+ lightAsset.getAttributes().getOrCreate("groupNumber", POSITIVE_INTEGER).addMeta(new MetaItem<>(RULE_STATE),+ new MetaItem<>(STORE_DATA_POINTS));+ lightAsset.getAttributes().getOrCreate("scenario", TEXT).addMeta(new MetaItem<>(RULE_STATE));++ return lightAsset;+ }++ protected LightAsset createDemoLightControllerAsset(String name, Asset<?> area, GeoJSONPoint location) {+ LightAsset lightAsset = new LightAsset(name);+ lightAsset.setParent(area);+ lightAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));+ lightAsset.getAttributes().getOrCreate(LightAsset.ON_OFF).addMeta(new MetaItem<>(RULE_STATE),+ new MetaItem<>(STORE_DATA_POINTS));+ lightAsset.getAttributes().getOrCreate(LightAsset.BRIGHTNESS).addMeta(new MetaItem<>(RULE_STATE),+ new MetaItem<>(STORE_DATA_POINTS));+ lightAsset.getAttributes().getOrCreate(LightAsset.COLOUR_RGB).addMeta(new MetaItem<>(RULE_STATE),+ new MetaItem<>(STORE_DATA_POINTS));+ lightAsset.getAttributes().getOrCreate("scenario", TEXT).addMeta(new MetaItem<>(RULE_STATE));++ return lightAsset;+ }++ protected ElectricityStorageAsset createDemoElectricityStorageAsset(String name, Asset<?> area,+ GeoJSONPoint location) {+ ElectricityStorageAsset electricityStorageAsset = new ElectricityBatteryAsset(name);+ electricityStorageAsset.setParent(area);+ electricityStorageAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));++ return electricityStorageAsset;+ }++ protected ElectricityProducerSolarAsset createDemoElectricitySolarProducerAsset(String name, Asset<?> area,+ GeoJSONPoint location) {+ ElectricityProducerSolarAsset electricityProducerAsset = new ElectricityProducerSolarAsset(name);+ electricityProducerAsset.setParent(area);+ electricityProducerAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));++ return electricityProducerAsset;+ }++ protected ElectricityConsumerAsset createDemoElectricityConsumerAsset(String name, Asset<?> area,+ GeoJSONPoint location) {+ ElectricityConsumerAsset electricityConsumerAsset = new ElectricityConsumerAsset(name);+ electricityConsumerAsset.setParent(area);+ electricityConsumerAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));++ return electricityConsumerAsset;+ }++ protected ElectricityChargerAsset createDemoElectricityChargerAsset(String name, Asset<?> area,+ GeoJSONPoint location) {+ ElectricityChargerAsset electricityChargerAsset = new ElectricityChargerAsset(name);+ electricityChargerAsset.setParent(area);+ electricityChargerAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));++ return electricityChargerAsset;+ }++ protected GroundwaterSensorAsset createDemoGroundwaterAsset(String name, Asset<?> area, GeoJSONPoint location) {+ GroundwaterSensorAsset groundwaterAsset = new GroundwaterSensorAsset(name);+ groundwaterAsset.setParent(area);+ groundwaterAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));++ return groundwaterAsset;+ }++ protected ParkingAsset createDemoParkingAsset(String name, Asset<?> area, GeoJSONPoint location) {+ ParkingAsset parkingAsset = new ParkingAsset(name);+ parkingAsset.setParent(area);+ parkingAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));++ return parkingAsset;+ }++ protected ShipAsset createDemoShipAsset(String name, Asset<?> area, GeoJSONPoint location) {+ ShipAsset shipAsset = new ShipAsset(name);+ shipAsset.setParent(area);+ shipAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));++ return shipAsset;+ }++ protected void provisionConsoleAppConfig() throws IOException {+ Log.info("Provisioning console app configs");++ Files.list(Paths.get(provisionDocRoot.toString(), "consoleappconfig")).filter(Files::isRegularFile)+ .forEach(file -> {+ try {+ ConsoleAppConfig config = Values.JSON.readValue(file.toFile(), ConsoleAppConfig.class);+ persistenceService.doTransaction(entityManager -> entityManager.merge(config));++ Log.info("Console app config added for realm: " + config.getRealm());+ } catch (IOException e) {+ Log.warn("Processing of file " + file.getFileName() + " went wrong", e);+ }+ });++ }++ protected void provisionAssets() throws IOException {+ Log.info("Provisioning assets");++ Files.list(Paths.get(provisionDocRoot.toString(), "assets")).filter(Files::isRegularFile)+ .forEach(file -> {+ try {+ Asset<?> asset = Values.JSON.readValue(file.toFile(), Asset.class);+ asset = assetStorageService.merge(asset);++ Log.info("Asset merged: " + asset.toString());+ } catch (IOException e) {+ Log.warn("Processing of file " + file.getFileName() + " went wrong", e);+ }+ });++ }+}diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoAgentSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoAgentSetup.javaindex a4279de46..c1756ab7a 100644--- a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoAgentSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoAgentSetup.java@@ -21,7 +21,7 @@ package org.openremote.manager.setup.builtin;import org.openremote.agent.protocol.knx.KNXAgent;import org.openremote.agent.protocol.velbus.VelbusTcpAgent;-import org.openremote.manager.setup.AbstractManagerSetup;+import org.openremote.manager.setup.ManagerSetup;import org.openremote.model.Container;import org.openremote.model.security.Tenant;@@ -29,7 +29,7 @@ import java.util.logging.Logger;import static org.openremote.container.util.MapAccess.*;-public class ManagerDemoAgentSetup extends AbstractManagerSetup {+public class ManagerDemoAgentSetup extends ManagerSetup {private static final Logger LOG = Logger.getLogger(ManagerDemoAgentSetup.class.getName());@@ -65,6 +65,7 @@ public class ManagerDemoAgentSetup extends AbstractManagerSetup {@Overridepublic void onStart() throws Exception {+ super.onStart();KeycloakDemoSetup keycloakDemoSetup = setupService.getTaskOfType(KeycloakDemoSetup.class);Tenant masterTenant = keycloakDemoSetup.masterTenant;diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.javaindex 361f64eda..9c4c8c5e4 100644--- a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java@@ -22,10 +22,9 @@ package org.openremote.manager.setup.builtin;import org.openremote.agent.protocol.http.HttpClientAgent;import org.openremote.agent.protocol.simulator.SimulatorAgent;import org.openremote.container.util.UniqueIdentifierGenerator;-import org.openremote.manager.setup.AbstractManagerSetup;+import org.openremote.manager.setup.ManagerSetup;import org.openremote.model.Constants;import org.openremote.model.Container;-import org.openremote.model.apps.ConsoleAppConfig;import org.openremote.model.asset.Asset;import org.openremote.model.asset.impl.*;import org.openremote.model.attribute.Attribute;@@ -49,7 +48,7 @@ import static org.openremote.model.value.MetaItemType.ATTRIBUTE_LINKS;import static org.openremote.model.value.MetaItemType.*;import static org.openremote.model.value.ValueType.*;-public class ManagerDemoSetup extends AbstractManagerSetup {+public class ManagerDemoSetup extends ManagerSetup {public static GeoJSONPoint STATIONSPLEIN_LOCATION = new GeoJSONPoint(4.470175, 51.923464);public String masterRealm;@@ -75,6 +74,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {@Overridepublic void onStart() throws Exception {+ super.onStart();KeycloakDemoSetup keycloakDemoSetup = setupService.getTaskOfType(KeycloakDemoSetup.class);Tenant masterTenant = keycloakDemoSetup.masterTenant;@@ -1557,23 +1557,6 @@ public class ManagerDemoSetup extends AbstractManagerSetup {});ship1Asset.setId(UniqueIdentifierGenerator.generateId(ship1Asset.getName()));ship1Asset = assetStorageService.merge(ship1Asset);-- // ### Mobile app config ###-- persistenceService.doTransaction(entityManager ->- entityManager.merge(new ConsoleAppConfig(- realmCityTenant,- "https://demo.openremote.io/mobile/?realm=smartcity&consoleProviders=geofence push storage",- "https://demo.openremote.io/main/?realm=smartcity&consoleProviders=geofence push storage&consoleAutoEnable=true#!geofences",- false,- ConsoleAppConfig.MenuPosition.BOTTOM_LEFT,- null,- "#4D9D2A",- "#AFAFAF",- new ConsoleAppConfig.AppLink[]{- new ConsoleAppConfig.AppLink("Map", "https://demo.openremote.io/mobile/?realm=smartcity&consoleProviders=geofence push storage&consoleAutoEnable=true#!geofences")- }))- );}@SuppressWarnings("OptionalGetWithoutIsPresent")diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerTestAgentSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerTestAgentSetup.javaindex 3e4d87da7..5ffc0b14a 100644--- a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerTestAgentSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerTestAgentSetup.java@@ -21,7 +21,7 @@ package org.openremote.manager.setup.builtin;import org.openremote.agent.protocol.knx.KNXAgent;import org.openremote.agent.protocol.velbus.VelbusTcpAgent;-import org.openremote.manager.setup.AbstractManagerSetup;+import org.openremote.manager.setup.ManagerSetup;import org.openremote.model.Container;import org.openremote.model.security.Tenant;@@ -29,7 +29,7 @@ import java.util.logging.Logger;import static org.openremote.container.util.MapAccess.*;-public class ManagerTestAgentSetup extends AbstractManagerSetup {+public class ManagerTestAgentSetup extends ManagerSetup {private static final Logger LOG = Logger.getLogger(ManagerDemoAgentSetup.class.getName());diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerTestSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerTestSetup.javaindex 84a606edc..8d9d72b1a 100644--- a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerTestSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerTestSetup.java@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;import org.openremote.agent.protocol.simulator.SimulatorAgent;import org.openremote.container.util.UniqueIdentifierGenerator;import org.openremote.manager.security.UserConfiguration;-import org.openremote.manager.setup.AbstractManagerSetup;+import org.openremote.manager.setup.ManagerSetup;import org.openremote.model.Constants;import org.openremote.model.Container;import org.openremote.model.apps.ConsoleAppConfig;@@ -48,7 +48,7 @@ import static org.openremote.model.Constants.*;import static org.openremote.model.value.MetaItemType.*;import static org.openremote.model.value.ValueType.*;-public class ManagerTestSetup extends AbstractManagerSetup {+public class ManagerTestSetup extends ManagerSetup {// Update these numbers whenever you change a RULE_STATE flag in test datapublic static final int DEMO_RULE_STATES_APARTMENT_1 = 44;@@ -108,6 +108,7 @@ public class ManagerTestSetup extends AbstractManagerSetup {@Overridepublic void onStart() throws Exception {+ super.onStart();KeycloakTestSetup keycloakTestSetup = setupService.getTaskOfType(KeycloakTestSetup.class);Tenant masterTenant = keycloakTestSetup.masterTenant;@@ -608,21 +609,5 @@ public class ManagerTestSetup extends AbstractManagerSetup {LightAsset lightController_3Asset = createDemoLightControllerAsset("LightController 3", assetArea3, new GeoJSONPoint(5.487478, 51.446979));lightController_3Asset = assetStorageService.merge(lightController_3Asset);-- persistenceService.doTransaction(entityManager -> {- entityManager.merge(new ConsoleAppConfig(- realmCityTenant,- "https://demo.openremote.io/mobile/?realm=smartcity&consoleProviders=geofence push storage",- "https://demo.openremote.io/main/?realm=smartcity&consoleProviders=geofence push storage",- true,- ConsoleAppConfig.MenuPosition.BOTTOM_LEFT,- null,- "#4D9D2A",- "#AFAFAF",- new ConsoleAppConfig.AppLink[] {- new ConsoleAppConfig.AppLink("Map", "https://demo.openremote.io/main/#!geofences?realm=smartcity&consoleProviders=geofence push storage")- }- ));- });}}diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.javaindex 9f127fd7b..1c0ff3c8e 100644--- a/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.java@@ -20,7 +20,7 @@package org.openremote.manager.setup.builtin;import org.apache.commons.io.IOUtils;-import org.openremote.manager.setup.AbstractManagerSetup;+import org.openremote.manager.setup.ManagerSetup;import org.openremote.model.Container;import org.openremote.model.attribute.MetaItem;import org.openremote.model.rules.Ruleset;@@ -33,7 +33,7 @@ import java.util.logging.Logger;import static org.openremote.model.rules.Ruleset.Lang.SHOW_ON_LIST;import static org.openremote.model.value.MetaItemType.SHOW_ON_DASHBOARD;-public class RulesDemoSetup extends AbstractManagerSetup {+public class RulesDemoSetup extends ManagerSetup {private static final Logger LOG = Logger.getLogger(RulesDemoSetup.class.getName());diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/RulesTestSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/RulesTestSetup.javaindex dbb6915bb..d72f2a991 100644--- a/manager/src/main/java/org/openremote/manager/setup/builtin/RulesTestSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/RulesTestSetup.java@@ -20,7 +20,7 @@package org.openremote.manager.setup.builtin;import org.apache.commons.io.IOUtils;-import org.openremote.manager.setup.AbstractManagerSetup;+import org.openremote.manager.setup.ManagerSetup;import org.openremote.model.Container;import org.openremote.model.attribute.MetaItem;import org.openremote.model.rules.AssetRuleset;@@ -35,7 +35,7 @@ import static org.openremote.model.rules.Ruleset.Lang.GROOVY;import static org.openremote.model.rules.Ruleset.Lang.SHOW_ON_LIST;import static org.openremote.model.value.MetaItemType.SHOW_ON_DASHBOARD;-public class RulesTestSetup extends AbstractManagerSetup {+public class RulesTestSetup extends ManagerSetup {private static final Logger LOG = Logger.getLogger(RulesTestSetup.class.getName());diff --git a/model/src/main/java/org/openremote/model/apps/ConsoleAppConfig.java b/model/src/main/java/org/openremote/model/apps/ConsoleAppConfig.javaindex 118f4974e..e4c356e8a 100644--- a/model/src/main/java/org/openremote/model/apps/ConsoleAppConfig.java+++ b/model/src/main/java/org/openremote/model/apps/ConsoleAppConfig.java@@ -85,4 +85,8 @@ public class ConsoleAppConfig {@Column(name = "LINKS", columnDefinition = "jsonb")@org.hibernate.annotations.Type(type = PERSISTENCE_JSON_VALUE_TYPE)protected AppLink[] links;++ public String getRealm() {+ return realm;+ }}