Commit 5bd0666249b97f62aa5ae77adbea509c636a7a45

Authored by 芯火源
1 parent b123baac

fix(DEFECT-1058): 设备事件标识符模糊查询

... ... @@ -30,7 +30,7 @@ public interface EventKvRepository extends PagingAndSortingRepository<TkEventKvE
30 30
31 31 @Query("SELECT a FROM TkEventKvEntity a WHERE a.id.entityId = :entityId "
32 32 + "AND (:eventType IS NULL OR a.id.eventType = :eventType) "
33   - + "AND (:eventIdentifier IS NULL OR a.id.eventIdentifier LIKE CONCAT('%',:eventIdentifier,'%')) "
  33 + + "AND (a.id.eventIdentifier LIKE concat('%',:eventIdentifier,'%')) "
34 34 + "AND (:startTime IS NULL OR a.id.eventTime >= :startTime) "
35 35 + "AND (:endTime IS NULL OR a.id.eventTime <= :endTime ) " )
36 36 Page<TkEventKvEntity> findEvents(@Param("entityId") UUID entityId,
... ...
... ... @@ -108,7 +108,7 @@ public class JpaEventDao extends JpaAbstractDaoListeningExecutorService implemen
108 108 @Override
109 109 public PageData<TkEventKvDto> findEvents(EntityId entityId,String eventIdentifier, DeviceEventTypeEnum eventType, TimePageLink pageLink) {
110 110
111   - return DaoUtil.toPageData(eventKvRepository.findEvents(entityId.getId(),eventType,eventIdentifier,pageLink.getStartTime(),pageLink.getEndTime(),DaoUtil.toPageable(pageLink)));
  111 + return DaoUtil.toPageData(eventKvRepository.findEvents(entityId.getId(),eventType,eventIdentifier==null?"":eventIdentifier,pageLink.getStartTime(),pageLink.getEndTime(),DaoUtil.toPageable(pageLink)));
112 112 }
113 113
114 114
... ...