From f4bec22a616bb1f43ac2e51eeedda9162d880c9c Mon Sep 17 00:00:00 2001
From: Viacheslav Kukhtyn <vkukhtyn@thingsboard.io>
Date: Thu, 12 Nov 2020 19:15:40 +0200
Subject: [PATCH] Send to rule chain a timestamp when KV entries were updated

---
 .../org/thingsboard/server/controller/BaseController.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
index b82c3f8311..b6acfdd7fd 100644
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
@@ -771,10 +771,13 @@ public abstract class BaseController {
                         }
                     } else if (actionType == ActionType.TIMESERIES_UPDATED) {
                         List<TsKvEntry> telemetry = extractParameter(List.class, 0, additionalInfo);
-                        if (telemetry != null) {
+                        if (telemetry != null && !telemetry.isEmpty()) {
+                            ObjectNode values = json.createObjectNode();
                             for (TsKvEntry tsKvEntry : telemetry) {
-                                addKvEntry(entityNode, tsKvEntry);
+                                addKvEntry(values, tsKvEntry);
                             }
+                            entityNode.put("ts", telemetry.get(0).getTs());
+                            entityNode.set("values", values);
                         }
                     }
                 }