Skip to content

armgit / core

Public Imported from GitHub
0

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

Update for demo rule.

Michael Rademakerc7aa0619984b
diff --git a/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java b/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java
index 25aec2464..be694666c 100644
--- a/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java
@@ -550,7 +550,7 @@ public abstract class AbstractManagerSetup implements Setup {
new MetaItem(READ_ONLY, Values.create(true)),
new MetaItem(RULE_STATE, Values.create(true))
),
- new AssetAttribute("cameraCountTotalAlertLevel", NUMBER)
+ new AssetAttribute("cameraCountTotalAlertLevel", NUMBER, Values.create(100))
.setMeta(
new MetaItem(LABEL, Values.create("Camera Count Total Alert Level")),
new MetaItem(DESCRIPTION, Values.create("When Camera Count Total equals or passes this value, an alert will be sent")),
@@ -560,10 +560,10 @@ public abstract class AbstractManagerSetup implements Setup {
.setMeta(
new MetaItem(LABEL, Values.create("Camera Count Total Alert")),
new MetaItem(DESCRIPTION, Values.create("True when alert rule is triggered")),
- new MetaItem(READ_ONLY, Values.create(true)),
+// new MetaItem(READ_ONLY, Values.create(true)),
new MetaItem(RULE_STATE, Values.create(true))
),
- new AssetAttribute("cameraCountGrowthAlertLevel", NUMBER)
+ new AssetAttribute("cameraCountGrowthAlertLevel", NUMBER, Values.create(200))
.setMeta(
new MetaItem(LABEL, Values.create("Camera Count Growth Alert Level")),
new MetaItem(DESCRIPTION, Values.create("When Camera Count Growth equals or passes this value, an alert will be sent")),
@@ -591,7 +591,7 @@ public abstract class AbstractManagerSetup implements Setup {
new MetaItem(READ_ONLY, Values.create(true)),
new MetaItem(RULE_STATE, Values.create(true))
).addMeta(agentLinker.get()),
- new AssetAttribute("microphoneLevelAlertLevel", SOUND_DB)
+ new AssetAttribute("microphoneLevelAlertLevel", SOUND_DB, Values.create(80))
.setMeta(
new MetaItem(LABEL, Values.create("Microphone Level Alert Level")),
new MetaItem(DESCRIPTION, Values.create("Level of dB when alert will be send")),
@@ -667,7 +667,7 @@ public abstract class AbstractManagerSetup implements Setup {
new MetaItem(READ_ONLY, Values.create(true)),
new MetaItem(RULE_STATE, Values.create(true))
).addMeta(agentLinker.get()),
- new AssetAttribute("ozonAlertLevel", NUMBER)
+ new AssetAttribute("ozonAlertLevel", NUMBER, Values.create(300))
.setMeta(
new MetaItem(LABEL, Values.create("Ozon Alert Level")),
new MetaItem(DESCRIPTION, Values.create("µg/m3")),
diff --git a/manager/src/main/resources/demo/rules/DemoSmartCityCamera.groovy b/manager/src/main/resources/demo/rules/DemoSmartCityCamera.groovy
index 4e0d11274..3966e2be8 100644
--- a/manager/src/main/resources/demo/rules/DemoSmartCityCamera.groovy
+++ b/manager/src/main/resources/demo/rules/DemoSmartCityCamera.groovy
@@ -62,29 +62,22 @@ rules.add()
.when({
facts ->
- LOG.info("cam: "+ facts.matchAssetState(new AssetQuery()
- .name(new StringPredicate(BaseAssetQuery.Match.BEGIN, "Camera"))).collect())
-
def cameraIds = facts.matchAssetState(new AssetQuery()
.name(new StringPredicate(BaseAssetQuery.Match.BEGIN, "Camera"))
.attributeName("cameraCountTotalAlert"))
.filter(
{
- LOG.info("id: " + it.id)
- LOG.info("cameraCountTotalAlert: " + it.valueAsBoolean)
- LOG.info("OrElse: " + it.valueAsBoolean.orElse(false))
-
!it.valueAsBoolean.orElse(false) &&
facts.matchFirstAssetState(new AssetQuery()
.id(it.id)
.attributeName("cameraCountTotal"))
.map({ it.valueAsNumber.orElse(-1) })
- .orElse(-1) >=
+ .orElse(-1) >
facts.matchFirstAssetState(new AssetQuery()
.id(it.id)
- .attributeName("cameraCountTotalAlert"))
- .map({ it.valueAsNumber.orElse(0) })
- .orElse(0)
+ .attributeName("cameraCountTotalAlertLevel"))
+ .map({ it.valueAsNumber.orElse(-1) })
+ .orElse(-1)
})
.map({ it.id })
.collect()
@@ -98,8 +91,7 @@ rules.add()
}).then({
facts ->
List<String> cameraIds = facts.bound("cameraIds")
- def attributesEvents = cameraIds.collect {
- new AttributeEvent(it, "cameraCountTotalAlert", Values.create(true))
- } as AttributeEvent[]
- assets.dispatch(attributesEvents)
+ cameraIds.forEach({
+ facts.updateAssetState(it, "cameraCountTotalAlert", true)
+ })
})
\ No newline at end of file