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 DataPoints to demo Assets
Michael Rademakerbe9b8179b9f6
diff --git a/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java b/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.javaindex 23c0b6719..886df6e3c 100644--- a/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java@@ -148,7 +148,8 @@ public abstract class AbstractManagerSetup implements Setup {new MetaItem(LABEL, Values.create("Motion sensor")),new MetaItem(DESCRIPTION, Values.create("Greater than zero when motion is sensed")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(shouldBeLinked ? agentLinker.get() : null),new AssetAttribute("presenceDetected", AttributeValueType.BOOLEAN).setMeta(@@ -187,7 +188,8 @@ public abstract class AbstractManagerSetup implements Setup {new MetaItem(READ_ONLY, Values.create(true)),new MetaItem(STORE_DATA_POINTS, Values.create(true)),new MetaItem(SHOW_ON_DASHBOARD, Values.create(true)),- new MetaItem(FORMAT, Values.create("%4d ppm"))+ new MetaItem(FORMAT, Values.create("%4d ppm")),+ new MetaItem(STORE_DATA_POINTS)).addMeta(shouldBeLinked ? agentLinker.get() : null));}@@ -204,7 +206,8 @@ public abstract class AbstractManagerSetup implements Setup {new MetaItem(READ_ONLY, Values.create(true)),new MetaItem(STORE_DATA_POINTS, Values.create(true)),new MetaItem(SHOW_ON_DASHBOARD, Values.create(true)),- new MetaItem(FORMAT, Values.create("%3d %%"))+ new MetaItem(FORMAT, Values.create("%3d %%")),+ new MetaItem(STORE_DATA_POINTS)).addMeta(shouldBeLinked ? agentLinker.get() : null));}@@ -221,7 +224,8 @@ public abstract class AbstractManagerSetup implements Setup {new MetaItem(READ_ONLY, Values.create(true)),new MetaItem(STORE_DATA_POINTS, Values.create(true)),new MetaItem(SHOW_ON_DASHBOARD, Values.create(true)),- new MetaItem(FORMAT, Values.create("%0.1f° C"))+ new MetaItem(FORMAT, Values.create("%0.1f° C")),+ new MetaItem(STORE_DATA_POINTS)).addMeta(shouldBeLinked ? agentLinker.get() : null));}@@ -237,7 +241,8 @@ public abstract class AbstractManagerSetup implements Setup {new MetaItem(ACCESS_RESTRICTED_READ, Values.create(true)),new MetaItem(ACCESS_RESTRICTED_WRITE, Values.create(true)),new MetaItem(SHOW_ON_DASHBOARD, Values.create(true)),- new MetaItem(FORMAT, Values.create("%0f° C"))+ new MetaItem(FORMAT, Values.create("%0f° C")),+ new MetaItem(STORE_DATA_POINTS)).addMeta(shouldBeLinked ? agentLinker.get() : null));}@@ -313,7 +318,8 @@ public abstract class AbstractManagerSetup implements Setup {new MetaItem(RULE_STATE, Values.create(true)),new MetaItem(ACCESS_RESTRICTED_READ, Values.create(true)),new MetaItem(ACCESS_RESTRICTED_WRITE, Values.create(true)),- new MetaItem(FORMAT, Values.create("%d"))+ new MetaItem(FORMAT, Values.create("%d")),+ new MetaItem(STORE_DATA_POINTS)).addMeta(shouldBeLinked ? agentLinker.get() : null),new AssetAttribute("ventilationAuto", BOOLEAN).setMeta(@@ -518,42 +524,48 @@ public abstract class AbstractManagerSetup implements Setup {new MetaItem(LABEL, Values.create("People Count In")),new MetaItem(DESCRIPTION, Values.create("Cumulative number of people going into area")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()),new AssetAttribute("peopleCountOut", NUMBER).setMeta(new MetaItem(LABEL, Values.create("People Count Out")),new MetaItem(DESCRIPTION, Values.create("Cumulative number of people leaving area")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()),new AssetAttribute("peopleCountInMinute", NUMBER).setMeta(new MetaItem(LABEL, Values.create("People Count In Minute")),new MetaItem(DESCRIPTION, Values.create("Number of people going into area per minute")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()),new AssetAttribute("peopleCountOutMinute", NUMBER).setMeta(new MetaItem(LABEL, Values.create("People Count Out Minute")),new MetaItem(DESCRIPTION, Values.create("Number of people leaving area per minute")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()),new AssetAttribute("peopleCountTotal", NUMBER).setMeta(new MetaItem(LABEL, Values.create("People Count Total")),new MetaItem(DESCRIPTION, Values.create("cameraCountIn - cameraCountOut")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)),new AssetAttribute("peopleCountGrowth", NUMBER).setMeta(new MetaItem(LABEL, Values.create("People Count Growth")),new MetaItem(DESCRIPTION, Values.create("cameraCountIn - cameraCountOut")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)));@@ -569,7 +581,8 @@ public abstract class AbstractManagerSetup implements Setup {new MetaItem(LABEL, Values.create("Microphone Level")),new MetaItem(DESCRIPTION, Values.create("dB")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()));return microphoneAsset;@@ -583,35 +596,40 @@ public abstract class AbstractManagerSetup implements Setup {new MetaItem(LABEL, Values.create("Last Aggression event")),new MetaItem(DESCRIPTION, Values.create("Input from microphone")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)),new AssetAttribute("lastGunshot", OBJECT).setMeta(new MetaItem(LABEL, Values.create("Last Gunshot event")),new MetaItem(DESCRIPTION, Values.create("Input from microphone")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()),new AssetAttribute("lastBreakingGlass", OBJECT).setMeta(new MetaItem(LABEL, Values.create("Last Breaking Glass event")),new MetaItem(DESCRIPTION, Values.create("Input from microphone")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()),new AssetAttribute("lastIntensity", OBJECT).setMeta(new MetaItem(LABEL, Values.create("Last Intensity event")),new MetaItem(DESCRIPTION, Values.create("Input from microphone")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()),new AssetAttribute("lastEvent", OBJECT).setMeta(new MetaItem(LABEL, Values.create("Last event")),new MetaItem(DESCRIPTION, Values.create("Input from microphone")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)));return soundEventAsset;@@ -626,49 +644,56 @@ public abstract class AbstractManagerSetup implements Setup {new MetaItem(LABEL, Values.create("Tempature Level")),new MetaItem(DESCRIPTION, Values.create("oC")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()),new AssetAttribute("nO2", NUMBER).setMeta(new MetaItem(LABEL, Values.create("Nitrogen Level")),new MetaItem(DESCRIPTION, Values.create("µg/m3")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()),new AssetAttribute("relHumidity", PERCENTAGE).setMeta(new MetaItem(LABEL, Values.create("Humidity")),new MetaItem(DESCRIPTION, Values.create("Humidity in area")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()),new AssetAttribute("ozon", NUMBER).setMeta(new MetaItem(LABEL, Values.create("Ozon Level")),new MetaItem(DESCRIPTION, Values.create("µg/m3")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()),new AssetAttribute("particlesPM1", NUMBER).setMeta(new MetaItem(LABEL, Values.create("Particles PM 1")),new MetaItem(DESCRIPTION, Values.create("Particles PM 1")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()),new AssetAttribute("particlesPM2_5", NUMBER).setMeta(new MetaItem(LABEL, Values.create("Particles PM 2.5")),new MetaItem(DESCRIPTION, Values.create("Particles PM 2.5")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()),new AssetAttribute("particlesPM10", NUMBER).setMeta(new MetaItem(LABEL, Values.create("Particles PM 10")),new MetaItem(DESCRIPTION, Values.create("Particles PM 10")),new MetaItem(READ_ONLY, Values.create(true)),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)).addMeta(agentLinker.get()));@@ -683,25 +708,29 @@ public abstract class AbstractManagerSetup implements Setup {.setMeta(new MetaItem(LABEL, Values.create("Light Status")),new MetaItem(DESCRIPTION, Values.create("On or off")),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)),new AssetAttribute("lightDimLevel", PERCENTAGE).setMeta(new MetaItem(LABEL, Values.create("Light Dim Level")),new MetaItem(DESCRIPTION, Values.create("The level of dimming of the light")),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)),new AssetAttribute("colorRGBW", OBJECT).setMeta(new MetaItem(LABEL, Values.create("Color RGBW")),new MetaItem(DESCRIPTION, Values.create("The RGBW color of the light")),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)),new AssetAttribute("groupNumber", NUMBER).setMeta(new MetaItem(LABEL, Values.create("Group number")),new MetaItem(DESCRIPTION, Values.create("Which group this lights belongs to")),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)),new AssetAttribute("scenario", STRING).setMeta(@@ -722,19 +751,22 @@ public abstract class AbstractManagerSetup implements Setup {.setMeta(new MetaItem(LABEL, Values.create("Light Status")),new MetaItem(DESCRIPTION, Values.create("On or off")),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)),new AssetAttribute("lightAllDimLevel", PERCENTAGE).setMeta(new MetaItem(LABEL, Values.create("Light Dim Level")),new MetaItem(DESCRIPTION, Values.create("The level of dimming of all the lights")),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)),new AssetAttribute("colorAllRGBW", OBJECT).setMeta(new MetaItem(LABEL, Values.create("Color RGBW")),new MetaItem(DESCRIPTION, Values.create("The RGBW color of all the lights")),- new MetaItem(RULE_STATE, Values.create(true))+ new MetaItem(RULE_STATE, Values.create(true)),+ new MetaItem(STORE_DATA_POINTS)),new AssetAttribute("scenario", STRING).setMeta(diff --git a/model/src/main/java/org/openremote/model/asset/AssetType.java b/model/src/main/java/org/openremote/model/asset/AssetType.javaindex 6cd39c56c..aba8467b2 100644--- a/model/src/main/java/org/openremote/model/asset/AssetType.java+++ b/model/src/main/java/org/openremote/model/asset/AssetType.java@@ -69,7 +69,8 @@ public enum AssetType implements AssetDescriptor {LABEL.withInitialValue(Values.create("Microphone Level")),DESCRIPTION.withInitialValue(Values.create("DB")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS)),@@ -78,31 +79,36 @@ public enum AssetType implements AssetDescriptor {LABEL.withInitialValue(Values.create("Last Aggression event")),DESCRIPTION.withInitialValue(Values.create("Input from microphone")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("lastGunshot", OBJECT, Values.createObject(),LABEL.withInitialValue(Values.create("Last Gunshot event")),DESCRIPTION.withInitialValue(Values.create("Input from microphone")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("lastBreakingGlass", OBJECT, Values.createObject(),LABEL.withInitialValue(Values.create("Last Breaking Glass event")),DESCRIPTION.withInitialValue(Values.create("Input from microphone")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("lastIntensity", OBJECT, Values.createObject(),LABEL.withInitialValue(Values.create("Last Intensity event")),DESCRIPTION.withInitialValue(Values.create("Input from microphone")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("lastEvent", OBJECT, Values.createObject(),LABEL.withInitialValue(Values.create("Last event")),DESCRIPTION.withInitialValue(Values.create("Input from microphone")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS)),@@ -111,40 +117,47 @@ public enum AssetType implements AssetDescriptor {LABEL.withInitialValue(Values.create("Temperature")),DESCRIPTION.withInitialValue(Values.create("Temperature in celcius")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("nO2", NUMBER, Values.create(0),LABEL.withInitialValue(Values.create("Nitrogen Level")),DESCRIPTION.withInitialValue(Values.create("µg/m3")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("relHumidity", PERCENTAGE, Values.create(0),LABEL.withInitialValue(Values.create("Humidity")),DESCRIPTION.withInitialValue(Values.create("Humidity in area")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("ozon", NUMBER, Values.create(0),LABEL.withInitialValue(Values.create("Ozon Level")),DESCRIPTION.withInitialValue(Values.create("µg/m3")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("particlesPM1", NUMBER, Values.create(0),LABEL.withInitialValue(Values.create("Particles PM 1")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("particlesPM2_5", NUMBER, Values.create(0),LABEL.withInitialValue(Values.create("Particles PM 2.5")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("particlesPM10", NUMBER, Values.create(0),LABEL.withInitialValue(Values.create("Particles PM 10")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS)),@@ -153,19 +166,22 @@ public enum AssetType implements AssetDescriptor {LABEL.withInitialValue(Values.create("Light status")),DESCRIPTION.withInitialValue(Values.create("Indicates if the light is on or off")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("lightDimLevel", PERCENTAGE, Values.create(0),LABEL.withInitialValue(Values.create("Light Dim Level")),DESCRIPTION.withInitialValue(Values.create("The level of dimming of the light")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("colorGBW", OBJECT, Values.createObject(),LABEL.withInitialValue(Values.create("Color RGBW")),DESCRIPTION.withInitialValue(Values.create("The RGBW color of the light")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("groupNumber", STRING, Values.create(""),LABEL.withInitialValue(Values.create("Group number")),@@ -186,19 +202,22 @@ public enum AssetType implements AssetDescriptor {LABEL.withInitialValue(Values.create("Light all status")),DESCRIPTION.withInitialValue(Values.create("Indicates if all lights are on or off")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("lightAllDimLevel", PERCENTAGE, Values.create(0),LABEL.withInitialValue(Values.create("Light Dim Level")),DESCRIPTION.withInitialValue(Values.create("The level of dimming of all the lights")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("colorAllRGBW", OBJECT, Values.createObject(),LABEL.withInitialValue(Values.create("Color RGBW")),DESCRIPTION.withInitialValue(Values.create("The RGBW color of all the lights")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("Scenario", NUMBER, Values.create(0),LABEL.withInitialValue(Values.create("Scenario")),@@ -213,37 +232,43 @@ public enum AssetType implements AssetDescriptor {LABEL.withInitialValue(Values.create("People Count In")),DESCRIPTION.withInitialValue(Values.create("Cumulative number of people going into area")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("peopleCountOut", NUMBER, Values.create(0),LABEL.withInitialValue(Values.create("People Count Out")),DESCRIPTION.withInitialValue(Values.create("Cumulative number of people leaving area")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("peopleCountInMinute", NUMBER, Values.create(0),LABEL.withInitialValue(Values.create("People Count In Minute")),DESCRIPTION.withInitialValue(Values.create("Number of people going into area per minute")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("peopleCountOutMinute", NUMBER, Values.create(0),LABEL.withInitialValue(Values.create("People Count Out Minute")),DESCRIPTION.withInitialValue(Values.create("Number of people leaving area per minute")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("peopleCountTotal", NUMBER, Values.create(0),LABEL.withInitialValue(Values.create("People Count Total")),DESCRIPTION.withInitialValue(Values.create("cameraCountIn - cameraCountOut")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS),new AttributeDescriptorImpl("peopleCountGrowth", NUMBER, Values.create(0),LABEL.withInitialValue(Values.create("People Count Growth")),DESCRIPTION.withInitialValue(Values.create("cameraCountIn - cameraCountOut")),READ_ONLY,- RULE_STATE+ RULE_STATE,+ STORE_DATA_POINTS)),