Browse Source
Merge pull request #20 from BohdanSmetanyuk/feature/edge_event_controller
added check permissions
pull/2436/head
VoBa
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
0 deletions
-
application/src/main/java/org/thingsboard/server/controller/EdgeEventController.java
|
|
|
@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.page.TimePageData; |
|
|
|
import org.thingsboard.server.common.data.page.TimePageLink; |
|
|
|
import org.thingsboard.server.dao.edge.EdgeEventService; |
|
|
|
import org.thingsboard.server.queue.util.TbCoreComponent; |
|
|
|
import org.thingsboard.server.service.security.permission.Operation; |
|
|
|
|
|
|
|
@Slf4j |
|
|
|
@RestController |
|
|
|
@ -58,6 +59,7 @@ public class EdgeEventController extends BaseController { |
|
|
|
try { |
|
|
|
TenantId tenantId = getCurrentUser().getTenantId(); |
|
|
|
EdgeId edgeId = new EdgeId(toUUID(strEdgeId)); |
|
|
|
checkEdgeId(edgeId, Operation.READ); |
|
|
|
TimePageLink pageLink = createPageLink(limit, startTime, endTime, ascOrder, offset); |
|
|
|
return checkNotNull(edgeEventService.findEdgeEvents(tenantId, edgeId, pageLink)); |
|
|
|
} catch (Exception e) { |
|
|
|
|
