Merge branch '20230222' into 'master'

20230222

See merge request yunteng/thingskit!160

@@ -37,6 +37,6 @@ public class TkEventKvDto {
     private final UUID entityId;
     private final String eventIdentifier;
     private final String eventName;
-    private final UUID deviceProfileId;
-    private final String deviceProfileName;
+    private final UUID productId;
+    private final String productName;
 }

@@ -41,12 +41,13 @@ public class TkEventKvEntity implements ToData<TkEventKvDto>, Serializable {
     @Column(name = EVENT_VALUE_COLUMN)
     private String eventValue;
 
-
+    @Column
+    private  String eventName;
     @Column(name = DEVICE_DEVICE_PROFILE_ID_PROPERTY, columnDefinition = "uuid")
     private UUID deviceProfileId;
 
     @Override
     public TkEventKvDto toData() {
-        return new TkEventKvDto(id.getEventTime(),id.getEventType(), JacksonUtil.toJsonNode(eventValue),id.getEntityId(),id.getEventIdentifier(),"",deviceProfileId,"");
+        return new TkEventKvDto(id.getEventTime(),id.getEventType(), JacksonUtil.toJsonNode(eventValue),id.getEntityId(),id.getEventIdentifier(),eventName,deviceProfileId,null);
     }
 }

@@ -28,8 +28,8 @@ public abstract class EventKvInsertRepository {
             "WHERE    event_type = ? and entity_id = ? and event_identifier =? and event_time = ?;";
 
     private static final String INSERT_OR_UPDATE =
-            "INSERT INTO tk_event_kv (event_type, entity_id, event_identifier, event_time, event_value,device_profile_id) " +
-                    "VALUES(?, ?, ?, ?, ?, ?) " +
+            "INSERT INTO tk_event_kv (event_type, entity_id, event_identifier, event_time, event_name, event_value,device_profile_id) " +
+                    "VALUES(?, ?, ?, ?, ?, ?, ?) " +
                     "ON CONFLICT (event_type, entity_id, event_identifier, event_time) " +
                     "DO UPDATE SET event_value = ?,device_profile_id = ?;";
 
@@ -86,13 +86,14 @@ public abstract class EventKvInsertRepository {
                         ps.setObject(2, kvEntity.getId().getEntityId());
                         ps.setString(3, kvEntity.getId().getEventIdentifier());
                         ps.setLong(4, kvEntity.getId().getEventTime());
+                        ps.setString(5, kvEntity.getEventName());
 
-                        ps.setString(5, replaceNullChars(kvEntity.getEventValue()));
-                        ps.setString(7, replaceNullChars(kvEntity.getEventValue()));
+                        ps.setString(6, replaceNullChars(kvEntity.getEventValue()));
+                        ps.setString(8, replaceNullChars(kvEntity.getEventValue()));
 
 
-                        ps.setObject(6, kvEntity.getDeviceProfileId());
-                        ps.setObject(8, kvEntity.getDeviceProfileId());
+                        ps.setObject(7, kvEntity.getDeviceProfileId());
+                        ps.setObject(9, kvEntity.getDeviceProfileId());
                     }
 
                     @Override

 /**
  * Copyright © 2016-2022 The Thingsboard Authors
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,6 +20,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
 import org.thingsboard.server.dao.yunteng.jpa.entity.events.TkEventKvCompositeKey;
 import org.thingsboard.server.dao.yunteng.jpa.entity.events.TkEventKvEntity;
 
@@ -27,10 +28,15 @@ import java.util.UUID;
 
 public interface EventKvRepository extends PagingAndSortingRepository<TkEventKvEntity, TkEventKvCompositeKey> {
 
-    @Query("SELECT a FROM TkEventKvEntity a WHERE a.id.entityId = :entityId "
-//            +"AND a.id.eventType = :eventType AND a.id.eventIdentifier = :eventIdentifier "
-    )
+    @Query("SELECT a FROM TkEventKvEntity a  WHERE a.id.entityId = :entityId "
+            + "AND (:eventType IS NULL OR a.id.eventType = :eventType) "
+            + "AND (:eventIdentifier IS NULL OR a.id.eventIdentifier = :eventIdentifier) "
+            + "AND (:startTime IS NULL OR a.id.eventTime >= :startTime) "
+            + "AND (:endTime IS NULL OR a.id.eventTime <= :endTime ) " )
     Page<TkEventKvEntity> findEvents(@Param("entityId") UUID entityId,
+                                     @Param("eventType") DeviceEventTypeEnum eventType,
+                                     @Param("eventIdentifier") String eventIdentifier,
+                                     @Param("startTime") Long startTime,
+                                     @Param("endTime") Long endTime,
                                      Pageable pageable);
 }
-

@@ -106,7 +106,7 @@ public class JpaEventDao extends JpaAbstractDaoListeningExecutorService implemen
     @Override
     public PageData<TkEventKvDto> findEvents(EntityId entityId,String eventIdentifier,  DeviceEventTypeEnum eventType, TimePageLink pageLink) {
 
-        return DaoUtil.toPageData(eventKvRepository.findEvents(entityId.getId(),DaoUtil.toPageable(pageLink)));
+        return DaoUtil.toPageData(eventKvRepository.findEvents(entityId.getId(),eventType,eventIdentifier,pageLink.getStartTime(),pageLink.getEndTime(),DaoUtil.toPageable(pageLink)));
     }
 
 
@@ -114,6 +114,7 @@ public class JpaEventDao extends JpaAbstractDaoListeningExecutorService implemen
     public ListenableFuture<Void> save(TenantId tenantId, DeviceProfileId profileId,EntityId entityId,DeviceEventTypeEnum eventType, String eventIdentifier, String eventData,Long eventTime) {
         TkEventKvEntity entity = new TkEventKvEntity();
         entity.setId(new TkEventKvCompositeKey(eventType, entityId.getId(), eventIdentifier, eventTime));
+        entity.setEventName("test");
         entity.setDeviceProfileId(profileId.getId());
         entity.setEventValue(eventData);
         return addToQueue(entity);