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
Update demo setup to fix provisioned rules, add units to flow attribute selector
Don95c7401ce199
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 89c431699..361f64eda 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@@ -109,10 +109,14 @@ public class ManagerDemoSetup extends AbstractManagerSetup {new Attribute<>("powerTotalProducers", NUMBER).addOrReplaceMeta(new MetaItem<>(UNITS, Constants.units(Constants.UNITS_KILO, Constants.UNITS_WATT)),- new MetaItem<>(READ_ONLY, true)),+ new MetaItem<>(READ_ONLY, true),+ new MetaItem<>(STORE_DATA_POINTS, true),+ new MetaItem<>(RULE_STATE, true)),new Attribute<>("powerTotalConsumers", NUMBER).addOrReplaceMeta(new MetaItem<>(UNITS, Constants.units(Constants.UNITS_KILO, Constants.UNITS_WATT)),- new MetaItem<>(READ_ONLY, true))+ new MetaItem<>(READ_ONLY, true),+ new MetaItem<>(STORE_DATA_POINTS, true),+ new MetaItem<>(RULE_STATE, true)));energyManagement.setId(UniqueIdentifierGenerator.generateId(energyManagement.getName()));energyManagement = assetStorageService.merge(energyManagement);@@ -129,7 +133,9 @@ public class ManagerDemoSetup extends AbstractManagerSetup {new Attribute<>(Asset.LOCATION, new GeoJSONPoint(4.488324, 51.906577)),new Attribute<>("powerBalance", NUMBER).addMeta(new MetaItem<>(UNITS, Constants.units(Constants.UNITS_KILO, Constants.UNITS_WATT)),- new MetaItem<>(READ_ONLY))+ new MetaItem<>(READ_ONLY),+ new MetaItem<>(RULE_STATE),+ new MetaItem<>(STORE_DATA_POINTS)));building1Asset.setId(UniqueIdentifierGenerator.generateId(building1Asset.getName() + "building"));building1Asset = assetStorageService.merge(building1Asset);@@ -738,6 +744,8 @@ public class ManagerDemoSetup extends AbstractManagerSetup {new MetaItem<>(AGENT_LINK, agentLink),new MetaItem<>(LABEL, "Open Weather Map API weather end point"),new MetaItem<>(READ_ONLY, true),+ new MetaItem<>(STORE_DATA_POINTS, false),+ new MetaItem<>(RULE_STATE, false),new MetaItem<>(ATTRIBUTE_LINKS, new AttributeLink[] {createWeatherApiAttributeLink(weather.getId(), "main", "temp", "temperature"),createWeatherApiAttributeLink(weather.getId(), "main", "humidity", "humidity"),@@ -745,6 +753,30 @@ public class ManagerDemoSetup extends AbstractManagerSetup {createWeatherApiAttributeLink(weather.getId(), "wind", "deg", "windDirection")})));+ weather.getAttribute("windSpeed").ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(STORE_DATA_POINTS),+ new MetaItem<>(RULE_STATE)+ );+ });+ weather.getAttribute("temperature").ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(STORE_DATA_POINTS),+ new MetaItem<>(RULE_STATE)+ );+ });+ weather.getAttribute("windDirection").ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(STORE_DATA_POINTS),+ new MetaItem<>(RULE_STATE)+ );+ });+ weather.getAttribute("humidity").ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(STORE_DATA_POINTS),+ new MetaItem<>(RULE_STATE)+ );+ });new Attribute<>(Asset.LOCATION, new GeoJSONPoint(4.463250, 51.918849));weather = assetStorageService.merge(weather);@@ -905,7 +937,10 @@ public class ManagerDemoSetup extends AbstractManagerSetup {.addMeta(new MetaItem<>(UNITS, Constants.units(Constants.UNITS_PERCENTAGE)),new MetaItem<>(CONSTRAINTS, ValueConstraint.constraints(new ValueConstraint.Min(0), new ValueConstraint.Max(100))),- new MetaItem<>(READ_ONLY)));+ new MetaItem<>(READ_ONLY),+ new MetaItem<>(RULE_STATE),+ new MetaItem<>(STORE_DATA_POINTS)+ ));parkingGroupAsset.setId(UniqueIdentifierGenerator.generateId(parkingGroupAsset.getName()));parkingGroupAsset = assetStorageService.merge(parkingGroupAsset);@@ -950,6 +985,10 @@ public class ManagerDemoSetup extends AbstractManagerSetup {parking1Asset.setPriceHourly(3.75);parking1Asset.setPriceDaily(25.00);parking1Asset.setSpacesTotal(512);+ parking1Asset.getAttribute(ParkingAsset.SPACES_TOTAL).ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(RULE_STATE));+ });parking1Asset.setId(UniqueIdentifierGenerator.generateId(parking1Asset.getName()));parking1Asset = assetStorageService.merge(parking1Asset);@@ -994,6 +1033,10 @@ public class ManagerDemoSetup extends AbstractManagerSetup {parking2Asset.setPriceHourly(3.50);parking2Asset.setPriceDaily(23.00);parking2Asset.setSpacesTotal(390);+ parking2Asset.getAttribute(ParkingAsset.SPACES_TOTAL).ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(RULE_STATE));+ });parking2Asset.setId(UniqueIdentifierGenerator.generateId(parking2Asset.getName()));parking2Asset = assetStorageService.merge(parking2Asset);@@ -1038,6 +1081,10 @@ public class ManagerDemoSetup extends AbstractManagerSetup {parking3Asset.setPriceHourly(3.40);parking3Asset.setPriceDaily(20.00);parking3Asset.setSpacesTotal(373);+ parking3Asset.getAttribute(ParkingAsset.SPACES_TOTAL).ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(RULE_STATE));+ });parking3Asset.setId(UniqueIdentifierGenerator.generateId(parking3Asset.getName()));parking3Asset = assetStorageService.merge(parking3Asset);@@ -1233,37 +1280,37 @@ public class ManagerDemoSetup extends AbstractManagerSetup {lightingControllerOPAsset.setId(UniqueIdentifierGenerator.generateId(lightingControllerOPAsset.getName()));lightingControllerOPAsset = assetStorageService.merge(lightingControllerOPAsset);- LightAsset lightOP1Asset = createDemoLightAsset("OnsPark1", lightingControllerOPAsset, new GeoJSONPoint(4.49626, 51.91516));+ LightAsset lightOP1Asset = createDemoLightAsset("Ons Park 1", lightingControllerOPAsset, new GeoJSONPoint(4.49626, 51.91516));lightOP1Asset.setManufacturer("Schréder");lightOP1Asset.setModel("Axia 2");lightOP1Asset.setId(UniqueIdentifierGenerator.generateId(lightOP1Asset.getName()));lightOP1Asset = assetStorageService.merge(lightOP1Asset);- LightAsset lightOP2Asset = createDemoLightAsset("OnsPark2", lightingControllerOPAsset, new GeoJSONPoint(4.49705, 51.91549));+ LightAsset lightOP2Asset = createDemoLightAsset("Ons Park 2", lightingControllerOPAsset, new GeoJSONPoint(4.49705, 51.91549));lightOP2Asset.setManufacturer("Schréder");lightOP2Asset.setModel("Axia 2");lightOP2Asset.setId(UniqueIdentifierGenerator.generateId(lightOP2Asset.getName()));lightOP2Asset = assetStorageService.merge(lightOP2Asset);- LightAsset lightOP3Asset = createDemoLightAsset("OnsPark3", lightingControllerOPAsset, new GeoJSONPoint(4.49661, 51.91495));+ LightAsset lightOP3Asset = createDemoLightAsset("Ons Park 3", lightingControllerOPAsset, new GeoJSONPoint(4.49661, 51.91495));lightOP3Asset.setManufacturer("Schréder");lightOP3Asset.setModel("Axia 2");lightOP3Asset.setId(UniqueIdentifierGenerator.generateId(lightOP3Asset.getName()));lightOP3Asset = assetStorageService.merge(lightOP3Asset);- LightAsset lightOP4Asset = createDemoLightAsset("OnsPark4", lightingControllerOPAsset, new GeoJSONPoint(4.49704, 51.91520));+ LightAsset lightOP4Asset = createDemoLightAsset("Ons Park 4", lightingControllerOPAsset, new GeoJSONPoint(4.49704, 51.91520));lightOP4Asset.setManufacturer("Schréder");lightOP4Asset.setModel("Axia 2");lightOP4Asset.setId(UniqueIdentifierGenerator.generateId(lightOP4Asset.getName()));lightOP4Asset = assetStorageService.merge(lightOP4Asset);- LightAsset lightOP5Asset = createDemoLightAsset("OnsPark5", lightingControllerOPAsset, new GeoJSONPoint(4.49758, 51.91440));+ LightAsset lightOP5Asset = createDemoLightAsset("Ons Park 5", lightingControllerOPAsset, new GeoJSONPoint(4.49758, 51.91440));lightOP5Asset.setManufacturer("Schréder");lightOP5Asset.setModel("Axia 2");lightOP5Asset.setId(UniqueIdentifierGenerator.generateId(lightOP5Asset.getName()));lightOP5Asset = assetStorageService.merge(lightOP5Asset);- LightAsset lightOP6Asset = createDemoLightAsset("OnsPark6", lightingControllerOPAsset, new GeoJSONPoint(4.49786, 51.91452));+ LightAsset lightOP6Asset = createDemoLightAsset("Ons Park 6", lightingControllerOPAsset, new GeoJSONPoint(4.49786, 51.91452));lightOP6Asset.setManufacturer("Schréder");lightOP6Asset.setModel("Axia 2");lightOP6Asset.setId(UniqueIdentifierGenerator.generateId(lightOP6Asset.getName()));diff --git a/manager/src/main/resources/demo/rules/smartcity/LightGroupOnOff.flow b/manager/src/main/resources/demo/rules/smartcity/LightGroupOnOff.flowindex 8ab281c32..3cc9f75fc 100644--- a/manager/src/main/resources/demo/rules/smartcity/LightGroupOnOff.flow+++ b/manager/src/main/resources/demo/rules/smartcity/LightGroupOnOff.flow@@ -78,7 +78,7 @@"type": "ASSET_ATTRIBUTE"},"value": {- "assetId": "54LS0LDCxIqVHnOCAVTK58",+ "assetId": "3QlH8nQWvnevcyxat6tQKJ","attributeName": "onOff"}}@@ -112,7 +112,7 @@"type": "ASSET_ATTRIBUTE"},"value": {- "assetId": "4vHXXX1zQEB6J27Kee8Nwf",+ "assetId": "4Y8sldGAezGSxqSSW3bly5","attributeName": "onOff"}}@@ -146,7 +146,7 @@"type": "ASSET_ATTRIBUTE"},"value": {- "assetId": "57wYnE3LEpPLDfsBwnOHzk",+ "assetId": "4RYkKKuM1wOw21PNOgHShZ","attributeName": "onOff"}}@@ -180,7 +180,7 @@"type": "ASSET_ATTRIBUTE"},"value": {- "assetId": "61BNFNS5vTR2SCOLDXUBvX",+ "assetId": "43F9MlyRcnGhY2m2hHlOdz","attributeName": "onOff"}}@@ -214,7 +214,7 @@"type": "ASSET_ATTRIBUTE"},"value": {- "assetId": "6uE2d0t2SqZcXUtv9qnjq5",+ "assetId": "5aID6iE9exaVNirT2flago","attributeName": "onOff"}}@@ -248,7 +248,7 @@"type": "ASSET_ATTRIBUTE"},"value": {- "assetId": "3uCPRjC6XTrx38xFG10FSb",+ "assetId": "3wauEi0ol2th6hXULHV2N4","attributeName": "onOff"}}diff --git a/manager/src/main/resources/demo/rules/smartcity/MarkthalChargersInUse.json b/manager/src/main/resources/demo/rules/smartcity/MarkthalChargersInUse.jsonindex bc02da364..833a2c533 100644--- a/manager/src/main/resources/demo/rules/smartcity/MarkthalChargersInUse.json+++ b/manager/src/main/resources/demo/rules/smartcity/MarkthalChargersInUse.json@@ -21,12 +21,12 @@"name": {"predicateType": "string","match": "EXACT",- "value": "powerConsumption"+ "value": "power"},"value": {"predicateType": "number","operator": "GREATER_EQUALS",- "value": 0.01+ "value": 0}}]@@ -47,12 +47,12 @@"name": {"predicateType": "string","match": "EXACT",- "value": "powerConsumption"+ "value": "power"},"value": {"predicateType": "number","operator": "GREATER_EQUALS",- "value": 0.01+ "value": 0}}]@@ -73,12 +73,12 @@"name": {"predicateType": "string","match": "EXACT",- "value": "powerConsumption"+ "value": "power"},"value": {"predicateType": "number","operator": "GREATER_EQUALS",- "value": 0.01+ "value": 0}}]@@ -99,12 +99,12 @@"name": {"predicateType": "string","match": "EXACT",- "value": "powerConsumption"+ "value": "power"},"value": {"predicateType": "number","operator": "GREATER_EQUALS",- "value": 0.01+ "value": 0}}]diff --git a/manager/src/main/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.json b/manager/src/main/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.jsonindex 296f82e87..ee06d235f 100644--- a/manager/src/main/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.json+++ b/manager/src/main/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.json@@ -46,7 +46,7 @@"target": {"assets": {"ids": [- "54LS0LDCxIqVHnOCAVTK58"+ "3QlH8nQWvnevcyxat6tQKJ"],"types": ["LightAsset"@@ -61,7 +61,7 @@"target": {"assets": {"ids": [- "4vHXXX1zQEB6J27Kee8Nwf"+ "4Y8sldGAezGSxqSSW3bly5"],"types": ["LightAsset"@@ -76,7 +76,7 @@"target": {"assets": {"ids": [- "57wYnE3LEpPLDfsBwnOHzk"+ "4RYkKKuM1wOw21PNOgHShZ"],"types": ["LightAsset"@@ -91,7 +91,7 @@"target": {"assets": {"ids": [- "61BNFNS5vTR2SCOLDXUBvX"+ "43F9MlyRcnGhY2m2hHlOdz"],"types": ["LightAsset"@@ -106,7 +106,7 @@"target": {"assets": {"ids": [- "6uE2d0t2SqZcXUtv9qnjq5"+ "5aID6iE9exaVNirT2flago"],"types": ["LightAsset"@@ -121,7 +121,7 @@"target": {"assets": {"ids": [- "3uCPRjC6XTrx38xFG10FSb"+ "3wauEi0ol2th6hXULHV2N4"],"types": ["LightAsset"diff --git a/manager/src/main/resources/demo/rules/smartcity/OnsParkDimLightWinds.json b/manager/src/main/resources/demo/rules/smartcity/OnsParkDimLightWinds.jsonindex 0f7414c3f..dd59a4c85 100644--- a/manager/src/main/resources/demo/rules/smartcity/OnsParkDimLightWinds.json+++ b/manager/src/main/resources/demo/rules/smartcity/OnsParkDimLightWinds.json@@ -46,7 +46,7 @@"target": {"assets": {"ids": [- "54LS0LDCxIqVHnOCAVTK58"+ "3QlH8nQWvnevcyxat6tQKJ"],"types": ["LightAsset"@@ -61,7 +61,7 @@"target": {"assets": {"ids": [- "4vHXXX1zQEB6J27Kee8Nwf"+ "4Y8sldGAezGSxqSSW3bly5"],"types": ["LightAsset"@@ -76,7 +76,7 @@"target": {"assets": {"ids": [- "57wYnE3LEpPLDfsBwnOHzk"+ "4RYkKKuM1wOw21PNOgHShZ"],"types": ["LightAsset"@@ -91,7 +91,7 @@"target": {"assets": {"ids": [- "61BNFNS5vTR2SCOLDXUBvX"+ "43F9MlyRcnGhY2m2hHlOdz"],"types": ["LightAsset"@@ -106,7 +106,7 @@"target": {"assets": {"ids": [- "6uE2d0t2SqZcXUtv9qnjq5"+ "5aID6iE9exaVNirT2flago"],"types": ["LightAsset"@@ -121,7 +121,7 @@"target": {"assets": {"ids": [- "3uCPRjC6XTrx38xFG10FSb"+ "3wauEi0ol2th6hXULHV2N4"],"types": ["LightAsset"diff --git a/manager/src/main/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flow b/manager/src/main/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flowindex e33e79e62..38c595895 100644--- a/manager/src/main/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flow+++ b/manager/src/main/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flow@@ -530,7 +530,7 @@},"value": {"assetId": "7UUzmvnTuLdjVpTb8MnjSX",- "attributeName": "occupancyTotal"+ "attributeName": "totalOccupancy"}}],diff --git a/manager/src/main/resources/demo/rules/smartcity/RotterdamBatteryUse.json b/manager/src/main/resources/demo/rules/smartcity/RotterdamBatteryUse.jsonindex 90daaa791..0656b4fda 100644--- a/manager/src/main/resources/demo/rules/smartcity/RotterdamBatteryUse.json+++ b/manager/src/main/resources/demo/rules/smartcity/RotterdamBatteryUse.json@@ -26,7 +26,7 @@"value": {"predicateType": "number","operator": "GREATER_THAN",- "value": 1+ "value": 0}}]diff --git a/ui/component/or-rules/src/flow-viewer/components/internal-picker.ts b/ui/component/or-rules/src/flow-viewer/components/internal-picker.tsindex dff4d4d25..143abd394 100644--- a/ui/component/or-rules/src/flow-viewer/components/internal-picker.ts+++ b/ui/component/or-rules/src/flow-viewer/components/internal-picker.ts@@ -120,7 +120,8 @@ export class InternalPicker extends translate(i18next)(LitElement) {this.attributeNames = [];Object.values(this.selectedAsset.attributes).forEach((attribute) => {if (attribute.meta && (attribute.meta.hasOwnProperty(WellknownMetaItems.RULESTATE) ? attribute.meta[WellknownMetaItems.RULESTATE] : attribute.meta.hasOwnProperty(WellknownMetaItems.AGENTLINK))) {- const label = Util.getAttributeLabel(attribute, undefined, this.selectedAsset.type!, true);+ const attributeDescriptor = AssetModelUtil.getAttributeDescriptor(attribute.name, this.selectedAsset.type!);+ const label = Util.getAttributeLabel(attribute, attributeDescriptor, this.selectedAsset.type!, true);this.attributeNames.push({name: attribute.name!,label