Merge branch 'master_dev' into 'master'

fix:小程序统计告警信息及告警分页查询

See merge request yunteng/thingskit!422

 package org.thingsboard.server.common.data.yunteng.dto.statistics;
 package org.thingsboard.server.common.data.yunteng.dto.statistics;
 
 
 import lombok.Data;
 import lombok.Data;
+import org.thingsboard.server.common.data.alarm.AlarmStatus;
 
 
 /**
 /**
  * @Description : 数据聚合统计对象
  * @Description : 数据聚合统计对象
@@ -15,4 +16,22 @@ import lombok.Data;
 public class AggregationDTO {
 public class AggregationDTO {
     private String key;
     private String key;
     private Integer value;
     private Integer value;
+    private Boolean acknowledged;
+    private Boolean cleared;
+    public String getKey(){
+        String status = null;
+        if(!acknowledged&&!cleared){
+            status = AlarmStatus.ACTIVE_UNACK.name();//激活未确认
+        }
+        if(acknowledged&&!cleared){
+            status = AlarmStatus.ACTIVE_ACK.name();//激活已确认
+        }
+        if(!acknowledged&&cleared){
+            status = AlarmStatus.CLEARED_UNACK.name();//清除未确认
+        }
+        if(acknowledged&&cleared){
+            status = AlarmStatus.CLEARED_ACK.name();//清除已确认
+        }
+        return status;
+    }
 }
 }

@@ -85,7 +85,8 @@ public class TkAlarmEntity {
   private String organizationId;
   private String organizationId;
   private String organizationName;
   private String organizationName;
   private String deviceAlias;
   private String deviceAlias;
-
+  @TableField(exist = false)
+  private AlarmStatus status;
   public String getStartTs() {
   public String getStartTs() {
     return DateTimeUtils.format(this.startTs);
     return DateTimeUtils.format(this.startTs);
   }
   }
@@ -109,4 +110,21 @@ public class TkAlarmEntity {
   public String getUpdatedTime() {
   public String getUpdatedTime() {
     return DateTimeUtils.format(this.updatedTime);
     return DateTimeUtils.format(this.updatedTime);
   }
   }
+
+  public AlarmStatus getStatus() {
+    AlarmStatus alarmStatus = null;
+    if(!acknowledged&&!cleared){
+      alarmStatus = AlarmStatus.ACTIVE_UNACK;//激活未确认
+    }
+    if(acknowledged&&!cleared){
+      alarmStatus = AlarmStatus.ACTIVE_ACK;//激活已确认
+    }
+    if(!acknowledged&&cleared){
+      alarmStatus = AlarmStatus.CLEARED_UNACK;//清除未确认
+    }
+    if(acknowledged&&cleared){
+      alarmStatus = AlarmStatus.CLEARED_ACK;//清除已确认
+    }
+    return alarmStatus;
+  }
 }
 }

@@ -305,7 +305,7 @@ public class TkHomePageServiceImpl implements HomePageService {
       app.setTodayCustomer(today);
       app.setTodayCustomer(today);
     }
     }
 
 
-    List<DeviceDTO> devices = getDeviceInfo(todayFilter);
+    List<TkDeviceEntity> devices = getDeviceInfo(todayFilter);
     AtomicInteger totalOnline = new AtomicInteger();
     AtomicInteger totalOnline = new AtomicInteger();
     AtomicInteger totalOffline = new AtomicInteger();
     AtomicInteger totalOffline = new AtomicInteger();
     AtomicInteger totalinactive = new AtomicInteger();
     AtomicInteger totalinactive = new AtomicInteger();
@@ -325,9 +325,9 @@ public class TkHomePageServiceImpl implements HomePageService {
                           totalinactive.incrementAndGet();
                           totalinactive.incrementAndGet();
                           break;
                           break;
                       }
                       }
-
-                      return device.getCreateTime().isAfter(startTime)
-                          && device.getCreateTime().isBefore(endTime);
+                      LocalDateTime createTime = LocalDateTime.ofEpochSecond(device.getCreateTime()/ 1000, 0, ZoneOffset.UTC);
+                      return createTime.isAfter(startTime)
+                          && createTime.isBefore(endTime);
                     })
                     })
                 .count();
                 .count();
     DeviceStatisticsDTO today = new DeviceStatisticsDTO(0);
     DeviceStatisticsDTO today = new DeviceStatisticsDTO(0);
@@ -354,7 +354,7 @@ public class TkHomePageServiceImpl implements HomePageService {
       EntityId entityId, LocalDateTime startTime, LocalDateTime endTime) {
       EntityId entityId, LocalDateTime startTime, LocalDateTime endTime) {
     Map<String, Object> filter = new HashMap<>();
     Map<String, Object> filter = new HashMap<>();
     if (entityId != null) {
     if (entityId != null) {
-      String idStr = entityId.getId().toString();
+      UUID idStr = entityId.getId();
       switch (entityId.getEntityType()) {
       switch (entityId.getEntityType()) {
         case TENANT:
         case TENANT:
           filter.put("tenantId", idStr);
           filter.put("tenantId", idStr);
@@ -385,8 +385,8 @@ public class TkHomePageServiceImpl implements HomePageService {
    *
    *
    * @param filter 数据过滤参数
    * @param filter 数据过滤参数
    */
    */
-  private List<DeviceDTO> getDeviceInfo(Map<String, Object> filter) {
-    return deviceMapper.findDevices(filter).stream().map(e->CopyUtils.copyAndReturn(e,new DeviceDTO())).collect(Collectors.toList());
+  private List<TkDeviceEntity> getDeviceInfo(Map<String, Object> filter) {
+    return deviceMapper.findDevices(filter);
   }
   }
 
 
   /**
   /**

@@ -56,7 +56,8 @@
         <result property="organizationName" column="organization_name"/>
         <result property="organizationName" column="organization_name"/>
         <result property="description" column="description"/>
         <result property="description" column="description"/>
         <result property="isEdge" column="is_edge"/>
         <result property="isEdge" column="is_edge"/>
-
+        <result property="createTime" column="createTime"/>
+        <result property="updateTime" column="updateTime"/>
 
 
         <!--        <association property="deviceProfile" column="device_profile_id"-->
         <!--        <association property="deviceProfile" column="device_profile_id"-->
         <!--                     javaType="org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity">-->
         <!--                     javaType="org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity">-->
@@ -272,6 +273,8 @@
         io.NAME AS organization_name,
         io.NAME AS organization_name,
         attrAt.long_v last_online_time,
         attrAt.long_v last_online_time,
         ifd.customer_id,
         ifd.customer_id,
+        ifd.created_time as createTime,
+        ifd.update_time as updateTime,
         CASE
         CASE
         WHEN attrAt.long_v is null THEN 'INACTIVE'
         WHEN attrAt.long_v is null THEN 'INACTIVE'
         WHEN attrA0.bool_v =true THEN 'ONLINE'
         WHEN attrA0.bool_v =true THEN 'ONLINE'

@@ -33,7 +33,8 @@
     </resultMap>
     </resultMap>
 
 
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.statistics.AggregationDTO" id="aggregationMap">
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.statistics.AggregationDTO" id="aggregationMap">
-        <result property="key" column="cleared"/>
+        <result property="acknowledged" column="acknowledged"/>
+        <result property="cleared" column="cleared"/>
         <result property="value" column="value"/>
         <result property="value" column="value"/>
     </resultMap>
     </resultMap>
 
 
@@ -103,7 +104,7 @@
     </select>
     </select>
 
 
     <select id="countAlarms" resultMap="aggregationMap">
     <select id="countAlarms" resultMap="aggregationMap">
-        SELECT cleared , COUNT(m.id) AS value FROM alarm  m
+        SELECT acknowledged,cleared , COUNT(m.id) AS value FROM alarm  m
         <if test="queryMap.customerId !=null or queryMap.deviceIds !=null ">
         <if test="queryMap.customerId !=null or queryMap.deviceIds !=null ">
             LEFT JOIN device d ON m.originator_id = d.id
             LEFT JOIN device d ON m.originator_id = d.id
         </if>
         </if>
@@ -127,7 +128,7 @@
                 </foreach>
                 </foreach>
             </if>
             </if>
         </where>
         </where>
-        GROUP BY cleared;
+        GROUP BY acknowledged, cleared;
     </select>
     </select>
     <select id="getByTbDeviceId" resultType="java.lang.String">
     <select id="getByTbDeviceId" resultType="java.lang.String">
         SELECT id  FROM alarm where 1=1
         SELECT id  FROM alarm where 1=1

@@ -249,7 +249,7 @@
         <where>
         <where>
             ro.role_type = 'CUSTOMER_USER'
             ro.role_type = 'CUSTOMER_USER'
             <if test="queryMap.tenantId !=null">
             <if test="queryMap.tenantId !=null">
-                AND u.tenant_id= #{queryMap.tenantId}
+                AND u.tenant_id= #{queryMap.tenantId}::TEXT
             </if>
             </if>
             <if test="queryMap.startTime !=null">
             <if test="queryMap.startTime !=null">
                 AND u.create_time >= #{queryMap.startTime}
                 AND u.create_time >= #{queryMap.startTime}