fix: 修复租户首页消息数、告警数统计

@@ -620,52 +620,19 @@ public class TkHomePageServiceImpl implements HomePageService {
   private void setAlarmAndMessageInfo(
   private void setAlarmAndMessageInfo(
       String tenantId, HomePageTopMessage messageInfo, BaseHomePageTop alarm)
       String tenantId, HomePageTopMessage messageInfo, BaseHomePageTop alarm)
       throws ExecutionException, InterruptedException {
       throws ExecutionException, InterruptedException {
-    List<EntityKey> entityFields = new ArrayList<>();
-    entityFields.add(new EntityKey(EntityKeyType.ENTITY_FIELD, "name"));
-    entityFields.add(new EntityKey(EntityKeyType.ENTITY_FIELD, "label"));
-    entityFields.add(new EntityKey(EntityKeyType.ENTITY_FIELD, "additionalInfo"));
-    List<EntityKey> latestValues = new ArrayList<>();
-    latestValues.add(new EntityKey(EntityKeyType.TIME_SERIES, "transportMsgCount"));
-    latestValues.add(new EntityKey(EntityKeyType.TIME_SERIES, "transportDataPointsCount"));
-    latestValues.add(new EntityKey(EntityKeyType.TIME_SERIES, "createdAlarmsCount"));
-
+    List<String> dictionaries = new ArrayList<>();
+    dictionaries.add("transportMsgCount");
+    dictionaries.add("transportDataPointsCount");
+    dictionaries.add("createdAlarmsCount");
+    //查询所有数据
+    List<Integer> sumCount = deviceMapper.getMsgSumByTenantIdAndDictionary(tenantId,dictionaries);
+    if(!sumCount.isEmpty()){
+      messageInfo.setMessageCount(sumCount.get(0));
+      messageInfo.setDataPointsCount(sumCount.get(1));
+      alarm.setSumCount(sumCount.get(2));
+    }
     TenantId currentTenantId = TenantId.fromUUID(UUID.fromString(tenantId));
     TenantId currentTenantId = TenantId.fromUUID(UUID.fromString(tenantId));
     ApiUsageState apiUsageState = apiUsageStateService.findTenantApiUsageState(currentTenantId);
     ApiUsageState apiUsageState = apiUsageStateService.findTenantApiUsageState(currentTenantId);
-    PageData<EntityData> pageData =
-        queryEntityData(apiUsageState.getId(), currentTenantId, entityFields, latestValues);
-    Map<EntityKeyType, Map<String, TsValue>> latest = pageData.getData().get(0).getLatest();
-    latest
-        .keySet()
-        .forEach(
-            item -> {
-              if (item.equals(EntityKeyType.TIME_SERIES)) {
-                Map<String, TsValue> tsValueMap = latest.get(item);
-                tsValueMap
-                    .keySet()
-                    .forEach(
-                        mapKey -> {
-                          String tsValue = tsValueMap.get(mapKey).getValue();
-                          Integer value =
-                              StringUtils.isEmpty(tsValue)
-                                  ? FastIotConstants.MagicNumber.ZERO
-                                  : Integer.parseInt(tsValue);
-                          switch (mapKey) {
-                            case "createdAlarmsCount":
-                              alarm.setSumCount(value);
-                              break;
-                            case "transportMsgCount":
-                              messageInfo.setMessageCount(value);
-                              break;
-                            case "transportDataPointsCount":
-                              messageInfo.setDataPointsCount(value);
-                              break;
-                            default:
-                              break;
-                          }
-                        });
-              }
-            });
-
     // 查询今日数据
     // 查询今日数据
     setTodayAlarmAndMessageInfo(currentTenantId, apiUsageState.getId(), messageInfo, alarm);
     setTodayAlarmAndMessageInfo(currentTenantId, apiUsageState.getId(), messageInfo, alarm);
   }
   }

@@ -146,4 +146,6 @@ public interface DeviceMapper extends BaseMapper<TkDeviceEntity> {
   String getDeviceRelation(@Param("isSlave") boolean isSlave, @Param("deviceId") String deviceId);
   String getDeviceRelation(@Param("isSlave") boolean isSlave, @Param("deviceId") String deviceId);
 
 
   DeviceDTO findDeviceInfo(@Param("tenantId") String tenantId,@Param("tbDeviceId") String tbDeviceId);
   DeviceDTO findDeviceInfo(@Param("tenantId") String tenantId,@Param("tbDeviceId") String tbDeviceId);
+
+  List<Integer> getMsgSumByTenantIdAndDictionary(@Param("tenantId") String tenantId, @Param("dictionaries")List<String> dictionaries);
 }
 }

 package org.thingsboard.server.dao.yunteng.service;
 package org.thingsboard.server.dao.yunteng.service;
 
 
 import org.springframework.web.context.request.async.DeferredResult;
 import org.springframework.web.context.request.async.DeferredResult;
-import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.query.TsValue;
 import org.thingsboard.server.common.data.query.TsValue;

@@ -460,4 +460,19 @@
         WHERE ifd.tb_device_id = #{tbDeviceId}
         WHERE ifd.tb_device_id = #{tbDeviceId}
         AND ifd.tenant_id = #{tenantId}
         AND ifd.tenant_id = #{tenantId}
     </select>
     </select>
+
+    <select id="getMsgSumByTenantIdAndDictionary" resultType="java.lang.Integer">
+        SELECT SUM ( long_v ) AS msgCount FROM
+            ts_kv tk
+                LEFT JOIN api_usage_state aus ON tk.entity_id = aus.ID
+                LEFT JOIN ts_kv_dictionary tkd ON tkd.key_id = tk."key"
+        WHERE
+            aus.tenant_id ::TEXT = #{tenantId}
+          AND tkd."key" IN
+        <foreach collection="dictionaries" item="dictionary" open="(" separator="," close=")">
+            #{dictionary}
+        </foreach>
+        GROUP BY
+            tk."key";
+    </select>
 </mapper>
 </mapper>