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

@@ -30,7 +30,7 @@ public interface EventKvRepository extends PagingAndSortingRepository<TkEventKvE
 
 
     @Query("SELECT a FROM TkEventKvEntity a  WHERE a.id.entityId = :entityId "
     @Query("SELECT a FROM TkEventKvEntity a  WHERE a.id.entityId = :entityId "
             + "AND (:eventType IS NULL OR a.id.eventType = :eventType) "
             + "AND (:eventType IS NULL OR a.id.eventType = :eventType) "
-            + "AND (:eventIdentifier IS NULL OR a.id.eventIdentifier  LIKE CONCAT('%',:eventIdentifier,'%')) "
+            + "AND (a.id.eventIdentifier  LIKE concat('%',:eventIdentifier,'%')) "
             + "AND (:startTime IS NULL OR a.id.eventTime >= :startTime) "
             + "AND (:startTime IS NULL OR a.id.eventTime >= :startTime) "
             + "AND (:endTime IS NULL OR a.id.eventTime <= :endTime ) " )
             + "AND (:endTime IS NULL OR a.id.eventTime <= :endTime ) " )
     Page<TkEventKvEntity> findEvents(@Param("entityId") UUID entityId,
     Page<TkEventKvEntity> findEvents(@Param("entityId") UUID entityId,

@@ -108,7 +108,7 @@ public class JpaEventDao extends JpaAbstractDaoListeningExecutorService implemen
     @Override
     @Override
     public PageData<TkEventKvDto> findEvents(EntityId entityId,String eventIdentifier,  DeviceEventTypeEnum eventType, TimePageLink pageLink) {
     public PageData<TkEventKvDto> findEvents(EntityId entityId,String eventIdentifier,  DeviceEventTypeEnum eventType, TimePageLink pageLink) {
 
 
-        return DaoUtil.toPageData(eventKvRepository.findEvents(entityId.getId(),eventType,eventIdentifier,pageLink.getStartTime(),pageLink.getEndTime(),DaoUtil.toPageable(pageLink)));
+        return DaoUtil.toPageData(eventKvRepository.findEvents(entityId.getId(),eventType,eventIdentifier==null?"":eventIdentifier,pageLink.getStartTime(),pageLink.getEndTime(),DaoUtil.toPageable(pageLink)));
     }
     }