tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fixed cf debug event filter

pull/12678/head
IrynaMatveieva 1 year ago
parent
65bd9d9886
commit
4245bd4809
3 changed files with 5 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      common/data/src/main/java/org/thingsboard/server/common/data/event/CalculatedFieldDebugEventFilter.java
  2. 4
      dao/src/main/java/org/thingsboard/server/dao/sql/event/CalculatedFieldDebugEventRepository.java
  3. 6
      dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java

5
common/data/src/main/java/org/thingsboard/server/common/data/event/CalculatedFieldDebugEventFilter.java
View File

@ -25,8 +25,6 @@ import org.thingsboard.server.common.data.StringUtils;
@Schema
public class CalculatedFieldDebugEventFilter extends DebugEventFilter {
@Schema(description = "String value representing the calculated field id in the event body", example = "ccbfa2fe-c8f5-45d8-bb37-6b61a6e02833")
protected String calculatedFieldId;
@Schema(description = "String value representing the entity id in the event body", example = "57b6bafe-d600-423c-9267-fe31e5218986")
protected String entityId;
@Schema(description = "String value representing the entity type", allowableValues = "DEVICE")
@ -43,8 +41,7 @@ public class CalculatedFieldDebugEventFilter extends DebugEventFilter {
@Override
public boolean isNotEmpty() {
return super.isNotEmpty() || !StringUtils.isEmpty(calculatedFieldId) || !StringUtils.isEmpty(entityId)
|| !StringUtils.isEmpty(entityType) || !StringUtils.isEmpty(msgId) || !StringUtils.isEmpty(msgType);
return super.isNotEmpty() || !StringUtils.isEmpty(entityId) || !StringUtils.isEmpty(entityType) || !StringUtils.isEmpty(msgId) || !StringUtils.isEmpty(msgType);
}
}

4
dao/src/main/java/org/thingsboard/server/dao/sql/event/CalculatedFieldDebugEventRepository.java
View File

@ -80,7 +80,7 @@ public interface CalculatedFieldDebugEventRepository extends EventRepository<Cal
@Param("entityId") UUID entityId,
@Param("startTime") Long startTime,
@Param("endTime") Long endTime,
@Param("serviceId") String server,
@Param("serviceId") String serviceId,
@Param("calculatedFieldId") UUID calculatedFieldId,
@Param("eventEntityId") String eventEntityId,
@Param("eventEntityType") String eventEntityType,
@ -123,7 +123,7 @@ public interface CalculatedFieldDebugEventRepository extends EventRepository<Cal
@Param("entityId") UUID entityId,
@Param("startTime") Long startTime,
@Param("endTime") Long endTime,
@Param("serviceId") String server,
@Param("serviceId") String serviceId,
@Param("calculatedFieldId") UUID calculatedFieldId,
@Param("eventEntityId") String eventEntityId,
@Param("eventEntityType") String eventEntityType,

6
dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
View File

@ -294,7 +294,6 @@ public class JpaBaseEventDao implements EventDao {
}
private PageData<? extends Event> findEventByFilter(UUID tenantId, UUID entityId, CalculatedFieldDebugEventFilter eventFilter, TimePageLink pageLink) {
parseUUID(eventFilter.getCalculatedFieldId(), "Calculated Field Id");
parseUUID(eventFilter.getEntityId(), "Entity Id");
parseUUID(eventFilter.getMsgId(), "Message Id");
return DaoUtil.toPageData(
@ -304,7 +303,7 @@ public class JpaBaseEventDao implements EventDao {
pageLink.getStartTime(),
pageLink.getEndTime(),
eventFilter.getServer(),
UUID.fromString(eventFilter.getCalculatedFieldId()),
entityId,
eventFilter.getEntityId(),
eventFilter.getEntityType(),
eventFilter.getMsgId(),
@ -389,7 +388,6 @@ public class JpaBaseEventDao implements EventDao {
}
private void removeEventsByFilter(UUID tenantId, UUID entityId, CalculatedFieldDebugEventFilter eventFilter, Long startTime, Long endTime) {
parseUUID(eventFilter.getCalculatedFieldId(), "Calculated Field Id");
parseUUID(eventFilter.getEntityId(), "Entity Id");
parseUUID(eventFilter.getMsgId(), "Message Id");
calculatedFieldDebugEventRepository.removeEvents(
@ -398,7 +396,7 @@ public class JpaBaseEventDao implements EventDao {
startTime,
endTime,
eventFilter.getServer(),
UUID.fromString(eventFilter.getCalculatedFieldId()),
entityId,
eventFilter.getEntityId(),
eventFilter.getEntityType(),
eventFilter.getMsgId(),

Write Preview
Loading…
Cancel
Save