Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Update demo rules and setup to use assets ids in JSON/FLOW rules

Don847f09156244
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.java
index 96f5a5184..93ba0fe23 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
@@ -134,6 +134,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
RULE_STATE,
READ_ONLY)
);
+ energyManagement.setId(UniqueIdentifierGenerator.generateId(energyManagement.getName()));
energyManagement = assetStorageService.merge(energyManagement);
energyManagementId = energyManagement.getId();
@@ -151,12 +152,15 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
RULE_STATE,
READ_ONLY)
);
+ building1Asset.setId(UniqueIdentifierGenerator.generateId(building1Asset.getName() + "building"));
building1Asset = assetStorageService.merge(building1Asset);
Asset storage1Asset = createDemoElectricityStorageAsset("Battery De Rotterdam", building1Asset, new GeoJSONPoint(4.488324, 51.906577));
+ storage1Asset.setId(UniqueIdentifierGenerator.generateId(storage1Asset.getName()));
storage1Asset = assetStorageService.merge(storage1Asset);
Asset consumption1Asset = createDemoElectricityConsumerAsset("Consumption De Rotterdam", building1Asset, new GeoJSONPoint(4.487519, 51.906544));
+ consumption1Asset.setId(UniqueIdentifierGenerator.generateId(consumption1Asset.getName()));
consumption1Asset = assetStorageService.merge(consumption1Asset);
Asset production1Asset = createDemoElectricityProducerAsset("Solar De Rotterdam", building1Asset, new GeoJSONPoint(4.488592, 51.907047));
@@ -168,6 +172,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
production1Asset.getAttribute("installedCapacity").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(16.52)));
production1Asset.getAttribute("systemEfficiency").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(93)));
production1Asset.getAttribute("panelOrientation").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(ElectricityProducerOrientationType.EAST_WEST.name())));
+ production1Asset.setId(UniqueIdentifierGenerator.generateId(production1Asset.getName()));
production1Asset = assetStorageService.merge(production1Asset);
// ### Stadhuis ###
@@ -179,12 +184,15 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
new AssetAttribute(AttributeType.GEO_CITY, Values.create("Rotterdam")),
new AssetAttribute(AttributeType.GEO_COUNTRY, Values.create("Netherlands"))
);
+ building2Asset.setId(UniqueIdentifierGenerator.generateId(building2Asset.getName() + "building"));
building2Asset = assetStorageService.merge(building2Asset);
Asset storage2Asset = createDemoElectricityStorageAsset("Battery Stadhuis", building2Asset, new GeoJSONPoint(4.47985, 51.92274));
+ storage2Asset.setId(UniqueIdentifierGenerator.generateId(storage2Asset.getName()));
storage2Asset = assetStorageService.merge(storage2Asset);
Asset consumption2Asset = createDemoElectricityConsumerAsset("Consumption Stadhuis", building2Asset, new GeoJSONPoint(4.47933, 51.92259));
+ consumption2Asset.setId(UniqueIdentifierGenerator.generateId(consumption2Asset.getName()));
consumption2Asset = assetStorageService.merge(consumption2Asset);
Asset production2Asset = createDemoElectricityProducerAsset("Solar Stadhuis", building2Asset, new GeoJSONPoint(4.47945, 51.92301));
@@ -196,6 +204,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
production2Asset.getAttribute("installedCapacity").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(15.70)));
production2Asset.getAttribute("systemEfficiency").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(79)));
production2Asset.getAttribute("panelOrientation").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(ElectricityProducerOrientationType.SOUTH.name())));
+ production2Asset.setId(UniqueIdentifierGenerator.generateId(production2Asset.getName()));
production2Asset = assetStorageService.merge(production2Asset);
// ### Markthal ###
@@ -212,6 +221,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
RULE_STATE,
READ_ONLY)
);
+ building3Asset.setId(UniqueIdentifierGenerator.generateId(building3Asset.getName() + "building"));
building3Asset = assetStorageService.merge(building3Asset);
Asset production3Asset = createDemoElectricityProducerAsset("Solar Markthal", building3Asset, new GeoJSONPoint(4.47945, 51.92301));
@@ -223,6 +233,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
production3Asset.getAttribute("installedCapacity").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(18.11)));
production3Asset.getAttribute("systemEfficiency").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(91)));
production3Asset.getAttribute("panelOrientation").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(ElectricityProducerOrientationType.SOUTH.name())));
+ production3Asset.setId(UniqueIdentifierGenerator.generateId(production3Asset.getName()));
production3Asset = assetStorageService.merge(production3Asset);
Asset charger1Asset = createDemoElectricityChargerAsset("Charger 1 Markthal", building3Asset, new GeoJSONPoint(4.486143, 51.920058));
@@ -267,6 +278,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
)
);
});
+ charger1Asset.setId(UniqueIdentifierGenerator.generateId(charger1Asset.getName()));
charger1Asset = assetStorageService.merge(charger1Asset);
Asset charger2Asset = createDemoElectricityChargerAsset("Charger 2 Markthal", building3Asset, new GeoJSONPoint(4.486188, 51.919957));
@@ -311,6 +323,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
)
);
});
+ charger2Asset.setId(UniqueIdentifierGenerator.generateId(charger2Asset.getName()));
charger2Asset = assetStorageService.merge(charger2Asset);
Asset charger3Asset = createDemoElectricityChargerAsset("Charger 3 Markthal", building3Asset, new GeoJSONPoint(4.486232, 51.919856));
@@ -355,6 +368,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
)
);
});
+ charger3Asset.setId(UniqueIdentifierGenerator.generateId(charger3Asset.getName()));
charger3Asset = assetStorageService.merge(charger3Asset);
Asset charger4Asset = createDemoElectricityChargerAsset("Charger 4 Markthal", building3Asset, new GeoJSONPoint(4.486286, 51.919733));
@@ -399,6 +413,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
)
);
});
+ charger4Asset.setId(UniqueIdentifierGenerator.generateId(charger4Asset.getName()));
charger4Asset = assetStorageService.merge(charger4Asset);
// ### Erasmianum ###
@@ -410,9 +425,11 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
new AssetAttribute(AttributeType.GEO_CITY, Values.create("Rotterdam")),
new AssetAttribute(AttributeType.GEO_COUNTRY, Values.create("Netherlands"))
);
+ building4Asset.setId(UniqueIdentifierGenerator.generateId(building4Asset.getName() + "building"));
building4Asset = assetStorageService.merge(building4Asset);
Asset consumption4Asset = createDemoElectricityConsumerAsset("Consumption Erasmianum", building4Asset, new GeoJSONPoint(4.468324, 51.912062));
+ consumption4Asset.setId(UniqueIdentifierGenerator.generateId(consumption4Asset.getName()));
consumption4Asset = assetStorageService.merge(consumption4Asset);
// ### Oostelijk zwembad ###
@@ -424,9 +441,11 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
new AssetAttribute(AttributeType.GEO_CITY, Values.create("Rotterdam")),
new AssetAttribute(AttributeType.GEO_COUNTRY, Values.create("Netherlands"))
);
+ building5Asset.setId(UniqueIdentifierGenerator.generateId(building5Asset.getName() + "building"));
building5Asset = assetStorageService.merge(building5Asset);
Asset consumption5Asset = createDemoElectricityConsumerAsset("Consumption Zwembad", building5Asset, new GeoJSONPoint(4.498048, 51.925770));
+ consumption5Asset.setId(UniqueIdentifierGenerator.generateId(consumption5Asset.getName()));
consumption5Asset = assetStorageService.merge(consumption5Asset);
Asset production5Asset = createDemoElectricityProducerAsset("Solar Zwembad", building5Asset, new GeoJSONPoint(4.498281, 51.925507));
@@ -438,6 +457,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
production5Asset.getAttribute("installedCapacity").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(12.79)));
production5Asset.getAttribute("systemEfficiency").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(86)));
production5Asset.getAttribute("panelOrientation").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(ElectricityProducerOrientationType.SOUTH.name())));
+ production5Asset.setId(UniqueIdentifierGenerator.generateId(production5Asset.getName()));
production5Asset = assetStorageService.merge(production5Asset);
// ### Weather ###
@@ -479,7 +499,6 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
));
new AssetAttribute(AttributeType.LOCATION, new GeoJSONPoint(4.463250, 51.918849).toValue())
.addMeta(SHOW_ON_DASHBOARD);
-
weather = assetStorageService.merge(weather);
// ################################ Realm smartcity - Environment monitor ###################################
@@ -488,30 +507,35 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
environmentMonitor.setRealm(this.realmCityTenant);
environmentMonitor.setName("Environment Monitor");
environmentMonitor.setType(THING);
+ environmentMonitor.setId(UniqueIdentifierGenerator.generateId(environmentMonitor.getName()));
environmentMonitor = assetStorageService.merge(environmentMonitor);
Asset environment1Asset = createDemoEnvironmentAsset("Oudehaven", environmentMonitor, new GeoJSONPoint(4.49313, 51.91885), () -> new MetaItem[]{
new MetaItem(AGENT_LINK, new AttributeRef(smartcitySimulatorAgentId, "replaySimulator").toArrayValue()),
new MetaItem(SimulatorProtocol.SIMULATOR_ELEMENT, Values.create(NumberSimulatorElement.ELEMENT_NAME))
});
+ environment1Asset.setId(UniqueIdentifierGenerator.generateId(environment1Asset.getName()));
environment1Asset = assetStorageService.merge(environment1Asset);
Asset environment2Asset = createDemoEnvironmentAsset("Kaappark", environmentMonitor, new GeoJSONPoint(4.480434, 51.899287), () -> new MetaItem[]{
new MetaItem(AGENT_LINK, new AttributeRef(smartcitySimulatorAgentId, "replaySimulator").toArrayValue()),
new MetaItem(SimulatorProtocol.SIMULATOR_ELEMENT, Values.create(NumberSimulatorElement.ELEMENT_NAME))
});
+ environment2Asset.setId(UniqueIdentifierGenerator.generateId(environment2Asset.getName()));
environment2Asset = assetStorageService.merge(environment2Asset);
Asset environment3Asset = createDemoEnvironmentAsset("Museumpark", environmentMonitor, new GeoJSONPoint(4.472457, 51.912047), () -> new MetaItem[]{
new MetaItem(AGENT_LINK, new AttributeRef(smartcitySimulatorAgentId, "replaySimulator").toArrayValue()),
new MetaItem(SimulatorProtocol.SIMULATOR_ELEMENT, Values.create(NumberSimulatorElement.ELEMENT_NAME))
});
+ environment3Asset.setId(UniqueIdentifierGenerator.generateId(environment3Asset.getName()));
environment3Asset = assetStorageService.merge(environment3Asset);
Asset environment4Asset = createDemoEnvironmentAsset("Eendrachtsplein", environmentMonitor, new GeoJSONPoint(4.473599, 51.916292), () -> new MetaItem[]{
new MetaItem(AGENT_LINK, new AttributeRef(smartcitySimulatorAgentId, "replaySimulator").toArrayValue()),
new MetaItem(SimulatorProtocol.SIMULATOR_ELEMENT, Values.create(NumberSimulatorElement.ELEMENT_NAME))
});
+ environment4Asset.setId(UniqueIdentifierGenerator.generateId(environment4Asset.getName()));
environment4Asset = assetStorageService.merge(environment4Asset);
Asset groundwater1Asset = createDemoGroundwaterAsset("Leuvehaven", environmentMonitor, new GeoJSONPoint(4.48413, 51.91431));
@@ -563,6 +587,9 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
groundwaterArray[i].getAttribute("waterLevel").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(3.51)));
}
+ groundwater1Asset.setId(UniqueIdentifierGenerator.generateId(groundwater1Asset.getName()));
+ groundwater2Asset.setId(UniqueIdentifierGenerator.generateId(groundwater2Asset.getName()));
+ groundwater3Asset.setId(UniqueIdentifierGenerator.generateId(groundwater3Asset.getName()));
groundwater1Asset = assetStorageService.merge(groundwater1Asset);
groundwater2Asset = assetStorageService.merge(groundwater2Asset);
groundwater3Asset = assetStorageService.merge(groundwater3Asset);
@@ -573,6 +600,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
mobilityAndSafety.setRealm(this.realmCityTenant);
mobilityAndSafety.setName("Mobility and Safety");
mobilityAndSafety.setType(THING);
+ mobilityAndSafety.setId(UniqueIdentifierGenerator.generateId(mobilityAndSafety.getName()));
mobilityAndSafety = assetStorageService.merge(mobilityAndSafety);
// ### Parking ###
@@ -586,6 +614,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
RULE_STATE,
READ_ONLY,
STORE_DATA_POINTS));
+ parkingGroupAsset.setId(UniqueIdentifierGenerator.generateId(parkingGroupAsset.getName()));
parkingGroupAsset = assetStorageService.merge(parkingGroupAsset);
Asset parking1Asset = createDemoParkingAsset("Markthal", parkingGroupAsset, new GeoJSONPoint(4.48527, 51.91984));
@@ -631,6 +660,8 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
});
parking1Asset.getAttribute("priceHourly").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(3.75)));
parking1Asset.getAttribute("priceDaily").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(25.00)));
+ parking1Asset.getAttribute("totalSpaces").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(623)));
+ parking1Asset.setId(UniqueIdentifierGenerator.generateId(parking1Asset.getName()));
parking1Asset = assetStorageService.merge(parking1Asset);
Asset parking2Asset = createDemoParkingAsset("Lijnbaan", parkingGroupAsset, new GeoJSONPoint(4.47681, 51.91849));
@@ -676,6 +707,8 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
});
parking2Asset.getAttribute("priceHourly").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(3.50)));
parking2Asset.getAttribute("priceDaily").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(23.00)));
+ parking2Asset.getAttribute("totalSpaces").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(556)));
+ parking2Asset.setId(UniqueIdentifierGenerator.generateId(parking2Asset.getName()));
parking2Asset = assetStorageService.merge(parking2Asset);
Asset parking3Asset = createDemoParkingAsset("Erasmusbrug", parkingGroupAsset, new GeoJSONPoint(4.48207, 51.91127));
@@ -721,6 +754,8 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
});
parking3Asset.getAttribute("priceHourly").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(3.40)));
parking3Asset.getAttribute("priceDaily").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(20.00)));
+ parking3Asset.getAttribute("totalSpaces").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(502)));
+ parking3Asset.setId(UniqueIdentifierGenerator.generateId(parking3Asset.getName()));
parking3Asset = assetStorageService.merge(parking3Asset);
// ### Crowd control ###
@@ -732,6 +767,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
new AssetAttribute(AttributeType.GEO_CITY, Values.create("Rotterdam")),
new AssetAttribute(AttributeType.GEO_COUNTRY, Values.create("Netherlands"))
);
+ assetAreaStation.setId(UniqueIdentifierGenerator.generateId(assetAreaStation.getName()));
assetAreaStation = assetStorageService.merge(assetAreaStation);
area1Id = assetAreaStation.getId();
@@ -739,73 +775,87 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
new MetaItem(AGENT_LINK, new AttributeRef(smartcitySimulatorAgentId, "replaySimulator").toArrayValue()),
new MetaItem(SimulatorProtocol.SIMULATOR_ELEMENT, Values.create(NumberSimulatorElement.ELEMENT_NAME))
});
+ peopleCounter1Asset.setId(UniqueIdentifierGenerator.generateId(peopleCounter1Asset.getName()));
peopleCounter1Asset = assetStorageService.merge(peopleCounter1Asset);
Asset peopleCounter2Asset = createDemoPeopleCounterAsset("People Counter North", assetAreaStation, new GeoJSONPoint(4.469329, 51.923700), () -> new MetaItem[]{
new MetaItem(AGENT_LINK, new AttributeRef(smartcitySimulatorAgentId, "replaySimulator").toArrayValue()),
new MetaItem(SimulatorProtocol.SIMULATOR_ELEMENT, Values.create(NumberSimulatorElement.ELEMENT_NAME))
});
+ peopleCounter2Asset.setId(UniqueIdentifierGenerator.generateId(peopleCounter2Asset.getName()));
peopleCounter2Asset = assetStorageService.merge(peopleCounter2Asset);
- persistenceService.doTransaction(entityManager ->
- entityManager.merge(new ConsoleAppConfig(
- realmCityTenant,
- "https://demo.openremote.io/mobile/?realm=smartcity&consoleProviders=geofence push storage",
- true,
- ConsoleAppConfig.MenuPosition.BOTTOM_LEFT,
- null,
- "#FAFAFA",
- "#AFAFAF",
- Values.createArray().addAll(
- Values.createObject()
- .put("displayText", "Map")
- .put("pageLink", "https://demo.openremote.io/mobile/#!geofences?realm=smartcity&consoleProviders=geofence push storage")
- )))
- );
-
Asset microphone1Asset = createDemoMicrophoneAsset("Microphone South", assetAreaStation, new GeoJSONPoint(4.470362, 51.923201), () -> new MetaItem[]{
new MetaItem(AGENT_LINK, new AttributeRef(smartcitySimulatorAgentId, "replaySimulator").toArrayValue()),
new MetaItem(SimulatorProtocol.SIMULATOR_ELEMENT, Values.create(NumberSimulatorElement.ELEMENT_NAME))
});
+ microphone1Asset.setId(UniqueIdentifierGenerator.generateId(microphone1Asset.getName()));
microphone1Asset = assetStorageService.merge(microphone1Asset);
Asset microphone2Asset = createDemoMicrophoneAsset("Microphone North", assetAreaStation, new GeoJSONPoint(4.469190, 51.923786), () -> new MetaItem[]{
new MetaItem(AGENT_LINK, new AttributeRef(smartcitySimulatorAgentId, "replaySimulator").toArrayValue()),
new MetaItem(SimulatorProtocol.SIMULATOR_ELEMENT, Values.create(NumberSimulatorElement.ELEMENT_NAME))
});
+ microphone2Asset.setId(UniqueIdentifierGenerator.generateId(microphone2Asset.getName()));
microphone2Asset = assetStorageService.merge(microphone2Asset);
Asset lightStation1Asset = createDemoLightAsset("Station Light NW", assetAreaStation, new GeoJSONPoint(4.468874, 51.923881));
+ lightStation1Asset.setId(UniqueIdentifierGenerator.generateId(lightStation1Asset.getName()));
lightStation1Asset = assetStorageService.merge(lightStation1Asset);
Asset lightStation2Asset = createDemoLightAsset("Station Light NE", assetAreaStation, new GeoJSONPoint(4.470539, 51.923991));
+ lightStation2Asset.setId(UniqueIdentifierGenerator.generateId(lightStation2Asset.getName()));
lightStation2Asset = assetStorageService.merge(lightStation2Asset);
Asset lightStation3Asset = createDemoLightAsset("Station Light S", assetAreaStation, new GeoJSONPoint(4.470558, 51.923186));
+ lightStation3Asset.setId(UniqueIdentifierGenerator.generateId(lightStation3Asset.getName()));
lightStation3Asset = assetStorageService.merge(lightStation3Asset);
// ### Lighting controller ###
Asset lightingControllerOPAsset = createDemoLightControllerAsset("Lighting Noordereiland", mobilityAndSafety, new GeoJSONPoint(4.496177, 51.915060));
+ lightingControllerOPAsset.setId(UniqueIdentifierGenerator.generateId(lightingControllerOPAsset.getName()));
lightingControllerOPAsset = assetStorageService.merge(lightingControllerOPAsset);
Asset lightOP1Asset = createDemoLightAsset("OnsPark1", lightingControllerOPAsset, new GeoJSONPoint(4.49626, 51.91516));
+ lightOP1Asset.setId(UniqueIdentifierGenerator.generateId(lightOP1Asset.getName()));
lightOP1Asset = assetStorageService.merge(lightOP1Asset);
Asset lightOP2Asset = createDemoLightAsset("OnsPark2", lightingControllerOPAsset, new GeoJSONPoint(4.49705, 51.91549));
+ lightOP2Asset.setId(UniqueIdentifierGenerator.generateId(lightOP2Asset.getName()));
lightOP2Asset = assetStorageService.merge(lightOP2Asset);
Asset lightOP3Asset = createDemoLightAsset("OnsPark3", lightingControllerOPAsset, new GeoJSONPoint(4.49661, 51.91495));
+ lightOP3Asset.setId(UniqueIdentifierGenerator.generateId(lightOP3Asset.getName()));
lightOP3Asset = assetStorageService.merge(lightOP3Asset);
Asset lightOP4Asset = createDemoLightAsset("OnsPark4", lightingControllerOPAsset, new GeoJSONPoint(4.49704, 51.91520));
+ lightOP4Asset.setId(UniqueIdentifierGenerator.generateId(lightOP4Asset.getName()));
lightOP4Asset = assetStorageService.merge(lightOP4Asset);
Asset lightOP5Asset = createDemoLightAsset("OnsPark5", lightingControllerOPAsset, new GeoJSONPoint(4.49758, 51.91440));
+ lightOP5Asset.setId(UniqueIdentifierGenerator.generateId(lightOP5Asset.getName()));
lightOP5Asset = assetStorageService.merge(lightOP5Asset);
Asset lightOP6Asset = createDemoLightAsset("OnsPark6", lightingControllerOPAsset, new GeoJSONPoint(4.49786, 51.91452));
+ lightOP6Asset.setId(UniqueIdentifierGenerator.generateId(lightOP6Asset.getName()));
lightOP6Asset = assetStorageService.merge(lightOP6Asset);
+
+ persistenceService.doTransaction(entityManager ->
+ entityManager.merge(new ConsoleAppConfig(
+ realmCityTenant,
+ "https://demo.openremote.io/mobile/?realm=smartcity&consoleProviders=geofence push storage",
+ true,
+ ConsoleAppConfig.MenuPosition.BOTTOM_LEFT,
+ null,
+ "#FAFAFA",
+ "#AFAFAF",
+ Values.createArray().addAll(
+ Values.createObject()
+ .put("displayText", "Map")
+ .put("pageLink", "https://demo.openremote.io/mobile/#!geofences?realm=smartcity&consoleProviders=geofence push storage")
+ )))
+ );
}
@SuppressWarnings("OptionalGetWithoutIsPresent")
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.java
index 4d2b2b36d..2c3604bcd 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
@@ -60,30 +60,6 @@ public class RulesDemoSetup extends AbstractManagerSetup {
// }
// SmartCity geofences
- try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoGeofence.json")) {
- String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Demo Geofences", Ruleset.Lang.JSON, rules
- ).setAccessPublicRead(true).addMeta("showOnMap", Values.create(true)).addMeta("showOnList", Values.create(true));
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
- }
-
- try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoGeofence2.json")) {
- String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Euromast", Ruleset.Lang.JSON, rules
- ).setAccessPublicRead(true).addMeta("showOnMap", Values.create(true)).addMeta("showOnList", Values.create(true));
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
- }
-
- try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoGeofence3.json")) {
- String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Markthal", Ruleset.Lang.JSON, rules
- ).setAccessPublicRead(true).addMeta("showOnMap", Values.create(true)).addMeta("showOnList", Values.create(true));
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
- }
-
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/DeKuip.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new TenantRuleset(
@@ -112,14 +88,14 @@ public class RulesDemoSetup extends AbstractManagerSetup {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new TenantRuleset(
keycloakDemoSetup.tenantCity.getRealm(), "Markthal: All chargers in use", Ruleset.Lang.JSON, rules
- ).setAccessPublicRead(true).addMeta("showOnMap", Values.create(true)).addMeta("showOnList", Values.create(true));
+ );
tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/OnsParkBrightStrongWinds.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Ons Park: Brighter light with strong winds", Ruleset.Lang.JSON, rules
+ keycloakDemoSetup.tenantCity.getRealm(), "Ons Park: Brighten lights", Ruleset.Lang.JSON, rules
);
tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
@@ -127,7 +103,7 @@ public class RulesDemoSetup extends AbstractManagerSetup {
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/OnsParkDimLightWinds.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Ons Park: Dim lights with low wind speed", Ruleset.Lang.JSON, rules
+ keycloakDemoSetup.tenantCity.getRealm(), "Ons Park: Dim lights", Ruleset.Lang.JSON, rules
);
tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
@@ -151,7 +127,7 @@ public class RulesDemoSetup extends AbstractManagerSetup {
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/TotalPowerConsumption.flow")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Total power consumption of buildings", Ruleset.Lang.FLOW, rules
+ keycloakDemoSetup.tenantCity.getRealm(), "Total power consumption", Ruleset.Lang.FLOW, rules
);
tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
@@ -159,7 +135,7 @@ public class RulesDemoSetup extends AbstractManagerSetup {
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/TotalSolarProduction.flow")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Total power production of solar panels", Ruleset.Lang.FLOW, rules
+ keycloakDemoSetup.tenantCity.getRealm(), "Total power production", Ruleset.Lang.FLOW, rules
);
tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
@@ -175,7 +151,7 @@ public class RulesDemoSetup extends AbstractManagerSetup {
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/ParkingOccupiedPercentage.flow")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Parking: Percentage of occupied spaces", Ruleset.Lang.FLOW, rules
+ keycloakDemoSetup.tenantCity.getRealm(), "Parking: Occupied spaces", Ruleset.Lang.FLOW, rules
);
tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
diff --git a/manager/src/main/resources/demo/rules/DemoGeofence2.json b/manager/src/main/resources/demo/rules/DemoGeofence2.json
deleted file mode 100644
index 26534d751..000000000
--- a/manager/src/main/resources/demo/rules/DemoGeofence2.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
- "rules": [
- {
- "name": "Euromast",
- "when": {
- "operator": "OR",
- "groups": [
- {
- "operator": "AND",
- "items": [
- {
- "assets": {
- "types": [
- {
- "predicateType": "string",
- "match": "EXACT",
- "value": "urn:openremote:asset:console"
- }
- ],
- "attributes": {
- "items": [
- {
- "name": {
- "predicateType": "string",
- "match": "EXACT",
- "value": "location"
- },
- "value": {
- "predicateType": "radial",
- "negated": false,
- "radius": 100,
- "lat": 51.9069373,
- "lng": 4.4633775
- }
- }
- ]
- }
- }
- }
- ]
- }
- ]
- },
- "then": [
- {
- "action": "notification",
- "target": {
- "useAssetsFromWhen": true
- },
- "notification": {
- "name": "Euromast",
- "message": {
- "type": "push",
- "title": "Euromast",
- "body": "Euromast, sinds 1960",
- "action": {
- "url": "https://euromast.nl"
- },
- "buttons": [
- {
- "title": "Open in app",
- "action": {
- "url": "https://euromast.nl"
- }
- },
- {
- "title": "Open in browser",
- "action": {
- "url": "https://euromast.nl",
- "openInBrowser": true
- }
- }
- ]
- }
- }
- }
- ],
- "reset": {
- "timer": "1m"
- }
- }
- ]
-}
diff --git a/manager/src/main/resources/demo/rules/DemoGeofence3.json b/manager/src/main/resources/demo/rules/DemoGeofence3.json
deleted file mode 100644
index 4cd31fa45..000000000
--- a/manager/src/main/resources/demo/rules/DemoGeofence3.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
- "rules": [
- {
- "name": "Markthal",
- "when": {
- "operator": "OR",
- "groups": [
- {
- "operator": "AND",
- "items": [
- {
- "assets": {
- "types": [
- {
- "predicateType": "string",
- "match": "EXACT",
- "value": "urn:openremote:asset:console"
- }
- ],
- "attributes": {
- "items": [
- {
- "name": {
- "predicateType": "string",
- "match": "EXACT",
- "value": "location"
- },
- "value": {
- "predicateType": "radial",
- "negated": false,
- "radius": 100,
- "lat": 51.9202494,
- "lng": 4.4851372
- }
- }
- ]
- }
- }
- }
- ]
- }
- ]
- },
- "then": [
- {
- "action": "notification",
- "target": {
- "useAssetsFromWhen": true
- },
- "notification": {
- "name": "Markthal",
- "message": {
- "type": "push",
- "title": "Markthal",
- "body": "Happy Food Shopping",
- "action": {
- "url": "https://www.markthal.nl"
- },
- "buttons": [
- {
- "title": "Open in app",
- "action": {
- "url": "https://www.markthal.nl"
- }
- },
- {
- "title": "Open in browser",
- "action": {
- "url": "https://www.markthal.nl",
- "openInBrowser": true
- }
- }
- ]
- }
- }
- }
- ],
- "reset": {
- "timer": "1m"
- }
- }
- ]
-}
diff --git a/manager/src/main/resources/demo/rules/smartcity/Euromast.json b/manager/src/main/resources/demo/rules/smartcity/Euromast.json
index 2a9e7aa29..26534d751 100644
--- a/manager/src/main/resources/demo/rules/smartcity/Euromast.json
+++ b/manager/src/main/resources/demo/rules/smartcity/Euromast.json
@@ -24,13 +24,17 @@
"predicateType": "string",
"match": "EXACT",
"value": "location"
+ },
+ "value": {
+ "predicateType": "radial",
+ "negated": false,
+ "radius": 100,
+ "lat": 51.9069373,
+ "lng": 4.4633775
}
}
]
- },
- "ids": [
- "2XY9PRltl9XELEXJzipxs6"
- ]
+ }
}
}
]
@@ -56,8 +60,7 @@
{
"title": "Open in app",
"action": {
- "url": "https://euromast.nl",
- "openInBrowser": true
+ "url": "https://euromast.nl"
}
},
{
@@ -70,24 +73,6 @@
]
}
}
- },
- {
- "action": "write-attribute",
- "target": {
- "assets": {
- "ids": [
- "50hkax4s7pQloGAv3d4NAw"
- ],
- "types": [
- {
- "predicateType": "string",
- "value": "urn:openremote:asset:light"
- }
- ]
- }
- },
- "value": 37,
- "attributeName": "lightDimLevel"
}
],
"reset": {
diff --git a/manager/src/main/resources/demo/rules/smartcity/Markthal.json b/manager/src/main/resources/demo/rules/smartcity/Markthal.json
index 474a0a48f..4cd31fa45 100644
--- a/manager/src/main/resources/demo/rules/smartcity/Markthal.json
+++ b/manager/src/main/resources/demo/rules/smartcity/Markthal.json
@@ -22,7 +22,15 @@
{
"name": {
"predicateType": "string",
- "match": "EXACT"
+ "match": "EXACT",
+ "value": "location"
+ },
+ "value": {
+ "predicateType": "radial",
+ "negated": false,
+ "radius": 100,
+ "lat": 51.9202494,
+ "lng": 4.4851372
}
}
]
@@ -52,8 +60,7 @@
{
"title": "Open in app",
"action": {
- "url": "https://www.markthal.nl",
- "openInBrowser": true
+ "url": "https://www.markthal.nl"
}
},
{
diff --git a/manager/src/main/resources/demo/rules/smartcity/MarkthalChargersInUse.json b/manager/src/main/resources/demo/rules/smartcity/MarkthalChargersInUse.json
index 1b0171fe3..0a4e1eaab 100644
--- a/manager/src/main/resources/demo/rules/smartcity/MarkthalChargersInUse.json
+++ b/manager/src/main/resources/demo/rules/smartcity/MarkthalChargersInUse.json
@@ -36,7 +36,7 @@
]
},
"ids": [
- "2PDhv85TE8UR81EaBdU4Sn"
+ "2QEKoczoTiOfLKh5UHqEf5"
]
}
},
@@ -66,7 +66,7 @@
]
},
"ids": [
- "5sPOlQ4hwoDBAHpWSxXFlZ"
+ "6Pgv4HQGmC0EjXg7GmNM6l"
]
}
},
@@ -96,7 +96,7 @@
]
},
"ids": [
- "79arRAQF4HzIdCG2ezj3gV"
+ "3KUCNnuNcS2zFAURMpAq0u"
]
}
},
@@ -126,7 +126,7 @@
]
},
"ids": [
- "2FMdjRfgAEvD8tQMjZQKi5"
+ "6EaYX7DEAFwxOJr3de4GFf"
]
}
}
@@ -152,7 +152,7 @@
}
}
],
- "name": "Markthal: All chargers are in use"
+ "name": "Markthal: All chargers in use"
}
]
}
diff --git a/manager/src/main/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.json b/manager/src/main/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.json
index f4a223671..2ddca0f75 100644
--- a/manager/src/main/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.json
+++ b/manager/src/main/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.json
@@ -50,7 +50,7 @@
"target": {
"assets": {
"ids": [
- "50hkax4s7pQloGAv3d4NAw"
+ "54LS0LDCxIqVHnOCAVTK58"
],
"types": [
{
@@ -68,7 +68,7 @@
"target": {
"assets": {
"ids": [
- "5B5Die9qlpXk6I0AnUKsGz"
+ "4vHXXX1zQEB6J27Kee8Nwf"
],
"types": [
{
@@ -86,7 +86,7 @@
"target": {
"assets": {
"ids": [
- "5fBdNTUStqaRl2lck2taz3"
+ "57wYnE3LEpPLDfsBwnOHzk"
],
"types": [
{
@@ -104,7 +104,7 @@
"target": {
"assets": {
"ids": [
- "3ejfNQCTpu7c7QKrhuWX2U"
+ "61BNFNS5vTR2SCOLDXUBvX"
],
"types": [
{
@@ -122,7 +122,7 @@
"target": {
"assets": {
"ids": [
- "1xg374XfhgHBIan8hsEV8e"
+ "6uE2d0t2SqZcXUtv9qnjq5"
],
"types": [
{
@@ -140,7 +140,7 @@
"target": {
"assets": {
"ids": [
- "7JJAn5YHWD2m2AMwtIYjHz"
+ "3uCPRjC6XTrx38xFG10FSb"
],
"types": [
{
@@ -154,7 +154,7 @@
"attributeName": "lightDimLevel"
}
],
- "name": "Ons Park: Brighter light with strong winds"
+ "name": "Ons Park: Brighten lights"
}
]
}
diff --git a/manager/src/main/resources/demo/rules/smartcity/OnsParkDimLightWinds.json b/manager/src/main/resources/demo/rules/smartcity/OnsParkDimLightWinds.json
index b92d89825..f0d7b0202 100644
--- a/manager/src/main/resources/demo/rules/smartcity/OnsParkDimLightWinds.json
+++ b/manager/src/main/resources/demo/rules/smartcity/OnsParkDimLightWinds.json
@@ -50,7 +50,7 @@
"target": {
"assets": {
"ids": [
- "50hkax4s7pQloGAv3d4NAw"
+ "54LS0LDCxIqVHnOCAVTK58"
],
"types": [
{
@@ -68,7 +68,7 @@
"target": {
"assets": {
"ids": [
- "5B5Die9qlpXk6I0AnUKsGz"
+ "4vHXXX1zQEB6J27Kee8Nwf"
],
"types": [
{
@@ -86,7 +86,7 @@
"target": {
"assets": {
"ids": [
- "5fBdNTUStqaRl2lck2taz3"
+ "57wYnE3LEpPLDfsBwnOHzk"
],
"types": [
{
@@ -104,7 +104,7 @@
"target": {
"assets": {
"ids": [
- "3ejfNQCTpu7c7QKrhuWX2U"
+ "61BNFNS5vTR2SCOLDXUBvX"
],
"types": [
{
@@ -122,7 +122,7 @@
"target": {
"assets": {
"ids": [
- "1xg374XfhgHBIan8hsEV8e"
+ "6uE2d0t2SqZcXUtv9qnjq5"
],
"types": [
{
@@ -140,7 +140,7 @@
"target": {
"assets": {
"ids": [
- "7JJAn5YHWD2m2AMwtIYjHz"
+ "3uCPRjC6XTrx38xFG10FSb"
],
"types": [
{
@@ -154,7 +154,7 @@
"attributeName": "lightDimLevel"
}
],
- "name": "Ons Park: Dim lights with low wind speed"
+ "name": "Ons Park: Dim lights"
}
]
}
diff --git a/manager/src/main/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flow b/manager/src/main/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flow
index 6a09707ec..783915962 100644
--- a/manager/src/main/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flow
+++ b/manager/src/main/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flow
@@ -1,5 +1,5 @@
{
- "name": "Parking: Percentage of occupied spaces",
+ "name": "Parking: Occupied spaces",
"description": null,
"connections": [
{
@@ -65,7 +65,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "3Snb9xk4Qr35XbxZD98n8W",
+ "assetId": "2tLAEBGjmRCu1KrdJn9T2Z",
"attributeName": "occupiedSpaces"
}
}
@@ -99,7 +99,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "5neUJEqucLhYdRTYHqtm1P",
+ "assetId": "1yuaW634x1LqumPTwGxvyg",
"attributeName": "occupiedSpaces"
}
}
@@ -133,7 +133,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "6iJyO3fOGmT5GRWmC5Warv",
+ "assetId": "3D49AxXerrIycM8gNd0zlK",
"attributeName": "occupiedSpaces"
}
}
@@ -167,7 +167,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "5neUJEqucLhYdRTYHqtm1P",
+ "assetId": "1yuaW634x1LqumPTwGxvyg",
"attributeName": "totalSpaces"
}
}
@@ -201,7 +201,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "3Snb9xk4Qr35XbxZD98n8W",
+ "assetId": "2tLAEBGjmRCu1KrdJn9T2Z",
"attributeName": "totalSpaces"
}
}
@@ -235,7 +235,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "6iJyO3fOGmT5GRWmC5Warv",
+ "assetId": "3D49AxXerrIycM8gNd0zlK",
"attributeName": "totalSpaces"
}
}
@@ -529,7 +529,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "4BcMGBFNLNqji2j0dJKyUj",
+ "assetId": "7UUzmvnTuLdjVpTb8MnjSX",
"attributeName": "totalOccupancy"
}
}
diff --git a/manager/src/main/resources/demo/rules/smartcity/RotterdamPowerBalance.flow b/manager/src/main/resources/demo/rules/smartcity/RotterdamPowerBalance.flow
index 5f40f61bc..d902d1a28 100644
--- a/manager/src/main/resources/demo/rules/smartcity/RotterdamPowerBalance.flow
+++ b/manager/src/main/resources/demo/rules/smartcity/RotterdamPowerBalance.flow
@@ -25,7 +25,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "4qSMq7lzXJATWgITK4pZQF",
+ "assetId": "6DW7WWYVtOybr7W1BWREc3",
"attributeName": "totalPower"
}
}
@@ -59,7 +59,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "4wdiljqcz2JYv3hEcB32oz",
+ "assetId": "3Mj9yiC6bcH4MoIYDY2T35",
"attributeName": "totalPower"
}
}
@@ -137,7 +137,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "6jG40HViCOrHbrGE9XbSjh",
+ "assetId": "2wzKB2j39144oTzAJnHpfs",
"attributeName": "powerBalance"
}
}
diff --git a/manager/src/main/resources/demo/rules/smartcity/StationCrowded.json b/manager/src/main/resources/demo/rules/smartcity/StationCrowded.json
index 66588093a..8a20402ed 100644
--- a/manager/src/main/resources/demo/rules/smartcity/StationCrowded.json
+++ b/manager/src/main/resources/demo/rules/smartcity/StationCrowded.json
@@ -36,7 +36,7 @@
]
},
"ids": [
- "49R3piJ2Pu3s4GSvJxBgEv"
+ "2bdD9xZlveIOabucPi9Iur"
]
}
}
@@ -71,7 +71,7 @@
]
},
"ids": [
- "7RCNs2Mb3XZOS8npXsvC9k"
+ "5WKcxVxZqFq1GYd9b2YVGD"
]
}
},
@@ -101,7 +101,7 @@
]
},
"ids": [
- "5S1IkRe9oZ3QUCv6AFCuY3"
+ "4vD8XpKSR6iieaSLJ35nKl"
]
}
}
@@ -115,7 +115,7 @@
"target": {
"assets": {
"ids": [
- "5Pc19lYBXGp1oGjb1mnLAj"
+ "2JA9oLQDHY0pjVHnGJMS35"
],
"types": [
{
@@ -133,7 +133,7 @@
"target": {
"assets": {
"ids": [
- "3V6eqJqfSBjfQT3AhlEvx3"
+ "3BSvaTREZX2MLjuE8bkM16"
],
"types": [
{
@@ -151,7 +151,7 @@
"target": {
"assets": {
"ids": [
- "3GIADRIXFMxjUIEL3io0at"
+ "2motXSzult66RsYrImPTdf"
],
"types": [
{
diff --git a/manager/src/main/resources/demo/rules/smartcity/TotalPowerConsumption.flow b/manager/src/main/resources/demo/rules/smartcity/TotalPowerConsumption.flow
index 329b8ad51..bb021adff 100644
--- a/manager/src/main/resources/demo/rules/smartcity/TotalPowerConsumption.flow
+++ b/manager/src/main/resources/demo/rules/smartcity/TotalPowerConsumption.flow
@@ -1,5 +1,5 @@
{
- "name": "Total power consumption of buildings",
+ "name": "Total power consumption",
"description": null,
"connections": [
{
@@ -41,7 +41,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "4wdiljqcz2JYv3hEcB32oz",
+ "assetId": "3Mj9yiC6bcH4MoIYDY2T35",
"attributeName": "totalPower"
}
}
@@ -75,7 +75,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "62Bqe0GL7ZsGwHCAl7cYQT",
+ "assetId": "4jBtdIZOtA7pLxPNSwWCVa",
"attributeName": "totalPower"
}
}
@@ -109,7 +109,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "3guR57kNLarlKBYBrlOI47",
+ "assetId": "6L8hVlM1fQ4dDHFM6HYA6O",
"attributeName": "totalPower"
}
}
@@ -143,7 +143,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "4kvjjhyOk11asFPQ36DCDl",
+ "assetId": "4oio0T4DX9lxeBsZVNIpEN",
"attributeName": "totalPower"
}
}
@@ -295,7 +295,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "2OF3l0ek5JltAmwEAUcSli",
+ "assetId": "642TlrE2HLMmRErWHC6NF6",
"attributeName": "totalPowerConsumers"
}
}
diff --git a/manager/src/main/resources/demo/rules/smartcity/TotalSolarProduction.flow b/manager/src/main/resources/demo/rules/smartcity/TotalSolarProduction.flow
index ade90575a..17a42311d 100644
--- a/manager/src/main/resources/demo/rules/smartcity/TotalSolarProduction.flow
+++ b/manager/src/main/resources/demo/rules/smartcity/TotalSolarProduction.flow
@@ -1,5 +1,5 @@
{
- "name": "Total power production of solar panels",
+ "name": "Total power production",
"description": null,
"connections": [
{
@@ -41,7 +41,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "4qSMq7lzXJATWgITK4pZQF",
+ "assetId": "6DW7WWYVtOybr7W1BWREc3",
"attributeName": "totalPower"
}
}
@@ -75,7 +75,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "7P0Nk5pdY0UzrfR6wv1raD",
+ "assetId": "4Fnz8pxxdtDobuDGWYwRNp",
"attributeName": "totalPower"
}
}
@@ -109,7 +109,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "3wus03XiU0n6ukvUfJdSct",
+ "assetId": "2RIt5xuSj1BSyaRhwU3z3I",
"attributeName": "totalPower"
}
}
@@ -143,7 +143,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "7bX04Q5sAVXBaIhG47pi7T",
+ "assetId": "5xgMdcrVWORYWpUKuP2Mo0",
"attributeName": "totalPower"
}
}
@@ -295,7 +295,7 @@
"type": "ASSET_ATTRIBUTE"
},
"value": {
- "assetId": "2OF3l0ek5JltAmwEAUcSli",
+ "assetId": "642TlrE2HLMmRErWHC6NF6",
"attributeName": "totalPowerProducers"
}
}
diff --git a/ui/app/mobile/src/index.ts b/ui/app/mobile/src/index.ts
index 47711d59d..60ce28cd2 100644
--- a/ui/app/mobile/src/index.ts
+++ b/ui/app/mobile/src/index.ts
@@ -27,15 +27,15 @@ import {pageMobileGeofencesProvider, GeofencesConfig} from "@openremote/or-app/d
const onboardingConfig:OnboardingConfig = {
pages: [
{
- title: "Welcome",
+ title: "Your opinion matters",
type: "default",
- description: "Welcome at the first page",
+ description: "With this app we will involve you in developments within the city. We keep you up to date on current projects and will ask for your opinion.",
image: require("../images/logo-mobile.png")
},
{
title: "At the right time and place",
type: "bottom-image",
- description: "Welcome at the second page",
+ description: "By sharing your location and allowing messages you receive useful info and surveys at the right time and place. Give your opinion and keep up to date on your favourite places.",
enableProviders: [
{
name:"geofence",
@@ -46,8 +46,8 @@ const onboardingConfig:OnboardingConfig = {
},
{
title: "View your messages",
- type: "default",
- description: "Welcome at the third page",
+ type: "bottom-image",
+ description: "Use the menu at the bottom to find messages that are always available to you.",
image: require("../images/logo-mobile.png")
}
],