Showing
3 changed files
with
6 additions
and
1 deletions
... | ... | @@ -24,6 +24,7 @@ |
24 | 24 | <result property="organizationId" column="organization_id"/> |
25 | 25 | <association property="deviceProfile" javaType="org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO"> |
26 | 26 | <result property="name" column="profile_name"/> |
27 | + <result property="transportType" column="transport_type"/> | |
27 | 28 | </association> |
28 | 29 | <association property="organizationDTO" javaType="org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO"> |
29 | 30 | <result property="name" column="organization_name"/> |
... | ... | @@ -33,10 +34,12 @@ |
33 | 34 | ifd.id,ifd.name,ifd.device_info,ifd.profile_id,ifd.active_time,ifd.device_token,ifd.tenant_id |
34 | 35 | ,ifd.tb_device_id,ifd.label,ifd.last_connect_time,ifd.device_type,ifd.device_state,ifd.create_time,ifd.update_time,ifd.creator, |
35 | 36 | ifd.updater,ifd.organization_id,ifd,alarm_status |
37 | + ,ifdp.name AS profile_name,ifdp.transport_type | |
38 | + ,io.name AS organization_name | |
36 | 39 | </sql> |
37 | 40 | <select id="getDevicePage" resultMap="deviceMap"> |
38 | 41 | SELECT |
39 | - <include refid="columns"/>,ifdp.name AS profile_name,io.name AS organization_name | |
42 | + <include refid="columns"/> | |
40 | 43 | FROM iotfs_device ifd |
41 | 44 | LEFT JOIN device_profile ifdp ON ifd.profile_id = CAST (ifdp.id AS VARCHAR) |
42 | 45 | LEFT JOIN iotfs_organization io ON io.id = ifd.organization_id | ... | ... |