简柏林 / thingskit · Commits

Commit c373ad88f20cefacc132ac49c3748e9e3fe18225

Authored by 芯火源
1 parent 138bdf5f

fix(DEFECT-1459): 告警分页数据，返回设备别名

Inline Side-by-side
Showing 2 changed files with 4 additions and 1 deletions
... ... @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
4 4 import com.baomidou.mybatisplus.annotation.TableId;
5 5 import com.baomidou.mybatisplus.annotation.TableName;
6 6 import com.fasterxml.jackson.databind.JsonNode;
  7 +import io.swagger.annotations.ApiModelProperty;
7 8 import lombok.Data;
8 9 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
9 10 import org.thingsboard.server.common.data.alarm.AlarmStatus;
... ... @@ -80,6 +81,7 @@ public class TkAlarmEntity {
80 81
81 82 private String organizationId;
82 83 private String organizationName;
  84 + private String deviceAlias;
83 85
84 86 public String getStartTs() {
85 87 return DateTimeUtils.format(this.startTs);
... ...
... ... @@ -7,6 +7,7 @@
7 7 <result property="id" column="id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
8 8 <result property="tenantId" column="tenant_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
9 9 <result property="deviceName" column="device_name"/>
  10 + <result property="deviceAlias" column="device_alias"/>
10 11 <result property="customerId" column="customer_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
11 12 <result property="type" column="type"/>
12 13 <result property="deviceId" column="device_id" />
... ... @@ -37,7 +38,7 @@
37 38
38 39
39 40 <select id="alarmPage" resultMap="alarmInfo">
40   - SELECT d.name AS device_name,d.id device_id,m.*,d.organization_id,org.name organization_name
  41 + SELECT d.name AS device_name,d.alias AS device_alias,d.id device_id,m.*,d.organization_id,org.name organization_name
41 42 FROM alarm m
42 43 LEFT JOIN tk_device d ON m.originator_id = d.tb_device_id::uuid
43 44 LEFT JOIN tk_organization org ON org.id = d.organization_id
... ...