dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/push-notifications' of github.com:thingsboard/thingsboard into feature/push-notifications

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2024-02-16 15:05:09 +02:00
commit 2ede5ee100
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/controller/BaseController.java
View File

@ -18,7 +18,6 @@ package org.thingsboard.server.controller;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.util.concurrent.ListenableFuture;
import lombok.Getter;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@ -46,6 +45,7 @@ import org.thingsboard.server.common.data.HasName;
import org.thingsboard.server.common.data.HasTenantId;
import org.thingsboard.server.common.data.OtaPackage;
import org.thingsboard.server.common.data.OtaPackageInfo;
import org.thingsboard.server.common.data.StringUtils;
import org.thingsboard.server.common.data.TbResource;
import org.thingsboard.server.common.data.TbResourceInfo;
import org.thingsboard.server.common.data.Tenant;

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java
View File

@ -30,6 +30,5 @@ public enum NotificationDeliveryMethod {
@Getter
private final String name;
// TODO: private final boolean allowUseSystemSettings;
}

2
common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/NotificationSettings.java
View File

@ -30,6 +30,4 @@ public class NotificationSettings implements Serializable {
@Valid
private Map<NotificationDeliveryMethod, NotificationDeliveryMethodConfig> deliveryMethodsConfigs;
// TODO: disable option, location on the screen, shown notifications count, timings of displaying
}