From f3a5cb316242634a019f2bdab54cd6f2b4b4d464 Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Tue, 8 Sep 2020 18:06:48 +0300 Subject: [PATCH] AlarmRules --- .../data/device/profile/AlarmCondition.java | 29 +++++++++++++++ .../common/data/device/profile/AlarmRule.java | 24 ++++++++++++ .../device/profile/DeviceProfileAlarm.java | 37 +++++++++++++++++++ .../device/profile/DeviceProfileData.java | 3 ++ 4 files changed, 93 insertions(+) create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmCondition.java create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmRule.java create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileAlarm.java diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmCondition.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmCondition.java new file mode 100644 index 0000000000..ed87aea319 --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmCondition.java @@ -0,0 +1,29 @@ +/** + * Copyright © 2016-2020 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.common.data.device.profile; + +import org.thingsboard.server.common.data.query.KeyFilter; + +import java.util.List; +import java.util.concurrent.TimeUnit; + +public class AlarmCondition { + + private List condition; + private TimeUnit durationUnit; + private long durationValue; + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmRule.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmRule.java new file mode 100644 index 0000000000..fd50825b88 --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmRule.java @@ -0,0 +1,24 @@ +/** + * Copyright © 2016-2020 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.common.data.device.profile; + +public class AlarmRule { + + private AlarmCondition condition; + // Advanced + private String alarmDetails; + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileAlarm.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileAlarm.java new file mode 100644 index 0000000000..cbaff61cde --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileAlarm.java @@ -0,0 +1,37 @@ +/** + * Copyright © 2016-2020 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.common.data.device.profile; + +import lombok.Data; +import org.thingsboard.server.common.data.alarm.AlarmSeverity; + +import java.util.List; +import java.util.Map; + +@Data +public class DeviceProfileAlarm { + + private String id; + private String alarmType; + + private Map createRules; + private AlarmRule clearRule; + + // Hidden in advanced settings + private boolean propagate; + private List propagateRelationTypes; + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileData.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileData.java index 6f9870e84e..275e6269d6 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileData.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileData.java @@ -17,10 +17,13 @@ package org.thingsboard.server.common.data.device.profile; import lombok.Data; +import java.util.List; + @Data public class DeviceProfileData { private DeviceProfileConfiguration configuration; private DeviceProfileTransportConfiguration transportConfiguration; + private List alarms; }