简柏林 / thingskit · Commits

Commit 43ecec5ef23383b179b27243d908154954a3079c

Authored by 芯火源
1 parent efc3a291

fix: 设备事件分页查询

Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
@@ -106,7 +106,7 @@ public class JpaEventDao extends JpaAbstractDaoListeningExecutorService implemen @@ -106,7 +106,7 @@ public class JpaEventDao extends JpaAbstractDaoListeningExecutorService implemen
106 @Override 106 @Override
107 public PageData<TkEventKvDto> findEvents(EntityId entityId,String eventIdentifier, DeviceEventTypeEnum eventType, TimePageLink pageLink) { 107 public PageData<TkEventKvDto> findEvents(EntityId entityId,String eventIdentifier, DeviceEventTypeEnum eventType, TimePageLink pageLink) {
108 108
109 - return DaoUtil.toPageData(eventKvRepository.findEvents(entityId.getId(),DaoUtil.toPageable(pageLink))); 109 + return DaoUtil.toPageData(eventKvRepository.findEvents(entityId.getId(),eventType,eventIdentifier,pageLink.getStartTime(),pageLink.getEndTime(),DaoUtil.toPageable(pageLink)));
110 } 110 }
111 111
112 112
@@ -114,6 +114,7 @@ public class JpaEventDao extends JpaAbstractDaoListeningExecutorService implemen @@ -114,6 +114,7 @@ public class JpaEventDao extends JpaAbstractDaoListeningExecutorService implemen
114 public ListenableFuture<Void> save(TenantId tenantId, DeviceProfileId profileId,EntityId entityId,DeviceEventTypeEnum eventType, String eventIdentifier, String eventData,Long eventTime) { 114 public ListenableFuture<Void> save(TenantId tenantId, DeviceProfileId profileId,EntityId entityId,DeviceEventTypeEnum eventType, String eventIdentifier, String eventData,Long eventTime) {
115 TkEventKvEntity entity = new TkEventKvEntity(); 115 TkEventKvEntity entity = new TkEventKvEntity();
116 entity.setId(new TkEventKvCompositeKey(eventType, entityId.getId(), eventIdentifier, eventTime)); 116 entity.setId(new TkEventKvCompositeKey(eventType, entityId.getId(), eventIdentifier, eventTime));
  117 + entity.setEventName("test");
117 entity.setDeviceProfileId(profileId.getId()); 118 entity.setDeviceProfileId(profileId.getId());
118 entity.setEventValue(eventData); 119 entity.setEventValue(eventData);
119 return addToQueue(entity); 120 return addToQueue(entity);