Merge branch 'master' into 20220322

云中非
2 parents e66e3704 a15d9d8a
Showing 5 changed files with 110 additions and 56 deletions
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/HomePageTopMessage.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/HomePageServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/DeviceMapper.java
dao/src/main/resources/mapper/DeviceMapper.xml
dao/src/main/resources/mapper/UserMapper.xml
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/HomePageTopMessage.java
View file @2b20ef5
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/HomePageTopMessage.java
View file @2b20ef5
@@ -29,6 +29,13 @@ public class HomePageTopMessage {
     this.todayDataPointsAdd = todayDataPointsAdd;
   }
+  public HomePageTopMessage(Integer messageCount, Integer todayMessageAdd) {
+    this.messageCount = messageCount;
+    this.todayMessageAdd = todayMessageAdd;
+    this.dataPointsCount = 0;
+    this.todayDataPointsAdd = 0;
+  }
+
   public HomePageTopMessage(Integer defaultValue) {
     this.messageCount = defaultValue;
     this.dataPointsCount = defaultValue;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/HomePageServiceImpl.java
View file @2b20ef5
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/HomePageServiceImpl.java
View file @2b20ef5
 package org.thingsboard.server.dao.yunteng.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.google.common.util.concurrent.*;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
@@ -22,13 +21,10 @@ import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.RoleEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TrendType;
-import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.entity.EntityService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
-import org.thingsboard.server.dao.yunteng.entities.User;
-import org.thingsboard.server.dao.yunteng.entities.YtDevice;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
 import org.thingsboard.server.dao.yunteng.service.HomePageService;
@@ -91,8 +87,26 @@ public class HomePageServiceImpl implements HomePageService {
     } else {
       String customerId = userMapper.findCustomerIdByUserId(currentUserId);
-      // 查询customerId
-      queryMap.put("customerId", customerId);
+      if (StringUtils.isNotEmpty(customerId)) {
+        // 查询customerId
+        queryMap.put("customerId", customerId);
+        long startTs =
+            LocalDateTime.of(LocalDateTime.now().toLocalDate(), LocalTime.MIN)
+                .toInstant(ZoneOffset.of("+8"))
+                .toEpochMilli();
+        List<BaseHomePageTop> baseHomePageTopList =
+            deviceMapper.findDeviceMessageInfo(startTs, customerId);
+        if (baseHomePageTopList.size() > FastIotConstants.MagicNumber.ZERO) {
+          messageInfo.setMessageCount(baseHomePageTopList.get(0).getSumCount());
+          messageInfo.setTodayMessageAdd(baseHomePageTopList.get(0).getTodayAdd());
+        }
+        List<BaseHomePageTop> alarmList =
+            deviceMapper.findDeviceAlarmInfoByCustomer(startTs, customerId);
+        if (alarmList.size() > FastIotConstants.MagicNumber.ZERO) {
+          alarm.setSumCount(alarmList.get(0).getSumCount());
+          alarm.setTodayAdd(alarmList.get(0).getTodayAdd());
+        }
+      }
     }
     deviceList = deviceMapper.findDevices(queryMap);
     homeDeviceInfo = new HomeDeviceInfoDTO(FastIotConstants.MagicNumber.ZERO);
@@ -178,8 +192,8 @@ public class HomePageServiceImpl implements HomePageService {
           listenableFuture,
           getTransportMessageCallback(deferredResult),
           MoreExecutors.directExecutor());
-    }else{
-      List<TenantTransportMessageDTO> result =new ArrayList<>();
+    } else {
+      List<TenantTransportMessageDTO> result = new ArrayList<>();
       deferredResult.setResult(result);
     }
     return deferredResult;
@@ -312,7 +326,7 @@ public class HomePageServiceImpl implements HomePageService {
                           Integer value =
                               StringUtils.isEmpty(tsValue)
                                   ? FastIotConstants.MagicNumber.ZERO
-                                  : Integer.valueOf(tsValue);
+                                  : Integer.parseInt(tsValue);
                           switch (mapKey) {
                             case "createdAlarmsCount":
                               alarm.setSumCount(value);
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/DeviceMapper.java
View file @2b20ef5
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/DeviceMapper.java
View file @2b20ef5
@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.yunteng.dto.BaseHomePageTop;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.HomePageTopMessage;
 import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
 import org.thingsboard.server.dao.yunteng.entities.YtDevice;
@@ -15,49 +17,58 @@ import java.util.Map;
 @Mapper
 public interface DeviceMapper extends BaseMapper<YtDevice> {
-    IPage<DeviceDTO> getDevicePage(
-            IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
-
-    DeviceDTO selectDetail(@Param("tenantId") String tenantId, @Param("id") String id);
-
-    /**
-     * 通过网关子设备的TB设备ID查询网关设备信息
-     *
-     * @param tbDeviceId 网关子设备的TB设备ID
-     * @return 网关设备信息
-     */
-    List<DeviceDTO> findGateWayDeviceByTbDeviceId(@Param("tbDeviceId") String tbDeviceId);
-
-    /**
-     * 更新设备告警状态
-     *
-     * @param tbDeviceId TB设备主键
-     * @param created    告警状态:0正常,1告警
-     * @return true or false
-     */
-    boolean freshAlarmStatus(@Param("tbDeviceId") String tbDeviceId, @Param("created") Integer created);
-
-    /**
-     * 用于统计设备相关信息
-     *
-     * @param queryMap 查询条件
-     * @return 查询的设备信息
-     */
-    List<DeviceDTO> findDevices(@Param("queryMap") Map<String, Object> queryMap);
-
-    /**
-     * 获取关联设备的子设备分页列表
-     *
-     * @param page     分页
-     * @param queryMap 查询条件
-     * @return 分页数据
-     */
-    IPage<RelationDeviceDTO> getRelationDevicePage(IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
-
-    /**
-     * 通过用户ID查询分配的所有设备ID
-     * @param customerId 用户ID
-     * @return 所有的设备ids
-     */
-    List<String> findDeviceIdsByCustomerId(@Param("customerId")String customerId);
+  IPage<DeviceDTO> getDevicePage(IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
+
+  DeviceDTO selectDetail(@Param("tenantId") String tenantId, @Param("id") String id);
+
+  /**
+   * 通过网关子设备的TB设备ID查询网关设备信息
+   *
+   * @param tbDeviceId 网关子设备的TB设备ID
+   * @return 网关设备信息
+   */
+  List<DeviceDTO> findGateWayDeviceByTbDeviceId(@Param("tbDeviceId") String tbDeviceId);
+
+  /**
+   * 更新设备告警状态
+   *
+   * @param tbDeviceId TB设备主键
+   * @param created 告警状态:0正常,1告警
+   * @return true or false
+   */
+  boolean freshAlarmStatus(
+      @Param("tbDeviceId") String tbDeviceId, @Param("created") Integer created);
+
+  /**
+   * 用于统计设备相关信息
+   *
+   * @param queryMap 查询条件
+   * @return 查询的设备信息
+   */
+  List<DeviceDTO> findDevices(@Param("queryMap") Map<String, Object> queryMap);
+
+  /**
+   * 获取关联设备的子设备分页列表
+   *
+   * @param page 分页
+   * @param queryMap 查询条件
+   * @return 分页数据
+   */
+  IPage<RelationDeviceDTO> getRelationDevicePage(
+      IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
+
+  /**
+   * 通过用户ID查询分配的所有设备ID
+   *
+   * @param customerId 用户ID
+   * @return 所有的设备ids
+   */
+  List<String> findDeviceIdsByCustomerId(@Param("customerId") String customerId);
+
+  List<BaseHomePageTop> findDeviceMessageInfo(
+      @Param("todayTime") Long todayTime, @Param("customerId") String customerId);
+
+  List<BaseHomePageTop> findDeviceAlarmInfoByCustomer(
+          @Param("todayTime") Long todayTime, @Param("customerId") String customerId);
+
 }
--- a/dao/src/main/resources/mapper/DeviceMapper.xml
View file @2b20ef5
+++ b/dao/src/main/resources/mapper/DeviceMapper.xml
View file @2b20ef5
@@ -44,6 +44,11 @@
         <result property="lastOnlineTime" column="last_online_time"/>
     </resultMap>
+    <resultMap id="baseHomePageTop" type="org.thingsboard.server.common.data.yunteng.dto.BaseHomePageTop">
+        <result property="sumCount" column="sum_count"/>
+        <result property="todayAdd" column="today_add"/>
+    </resultMap>
+
     <sql id="basicColumns">
         ifd.id,ifd.name,ifd.device_info,ifd.profile_id,ifd.active_time,ifd.tenant_id,ifd.description
         ,ifd.tb_device_id,ifd.label,ifd.last_connect_time,ifd.device_type,ifd.device_state,ifd.create_time,ifd.update_time,ifd.creator,
@@ -172,7 +177,7 @@
                 AND ifd.tenant_id = #{queryMap.tenantId}
             </if>
             <if test="queryMap.customerId !=null and queryMap.customerId !=''">
-                AND d.customer_id = #{queryMap.customerId}
+                AND d.customer_id :: TEXT = #{queryMap.customerId}
             </if>
         </where>
     </select>
@@ -215,4 +220,21 @@
         SELECT idi.tb_device_id FROM iotfs_device idi LEFT JOIN device d ON d.id::TEXT = idi.tb_device_id
         WHERE customer_id::TEXT = #{customerId}
     </select>
+
+    <select id="findDeviceMessageInfo" resultMap="baseHomePageTop">
+        SELECT COUNT( ts.ts ) AS sum_count,
+               SUM ( CASE WHEN ts.ts >= #{todayTime} THEN 1 ELSE 0 END ) AS today_add
+        FROM (SELECT tk.ts FROM ts_kv tk
+                        LEFT JOIN device d ON tk.entity_id = d.ID
+                        WHERE
+                        d.customer_id::TEXT = #{customerId}
+                        GROUP BY tk.ts) ts;
+    </select>
+
+    <select id="findDeviceAlarmInfoByCustomer" resultMap="baseHomePageTop">
+        SELECT COUNT( ID ) AS sum_count,
+               SUM ( CASE WHEN created_time >= #{todayTime} THEN 1 ELSE 0 END ) AS today_add
+        FROM alarm
+        WHERE customer_id ::TEXT = #{customerId} AND originator_type = 5;
+    </select>
 </mapper>
--- a/dao/src/main/resources/mapper/UserMapper.xml
View file @2b20ef5
+++ b/dao/src/main/resources/mapper/UserMapper.xml
View file @2b20ef5
@@ -205,6 +205,6 @@
     </select>
     <select id="findCustomerIdByUserId" resultType="java.lang.String">
-        SELECT tu.customer_id FROM sys_user su LEFT JOIN tb_user tu ON su.tb_user = tu.id WHERE su.id = #{id}
+        SELECT tu.customer_id FROM sys_user su LEFT JOIN tb_user tu ON su.tb_user = tu.id::TEXT WHERE su.id = #{id}
     </select>
 </mapper>