liwenlong/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

控制中心设备绑定修改3

Browse Source
This commit is contained in:
chenyouting
2025-09-22 14:05:39 +08:00
parent 74b0059aca
commit f07ec53645
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
View File

@ -251,8 +251,7 @@
ap.name personnelBy, ap.name personnelBy,
d.device_status, d.device_status,
d.online_status, d.online_status,
c.binding_time, c.binding_time
d.create_time
from device d from device d
inner join device_type dt on d.device_type = dt.id inner join device_type dt on d.device_type = dt.id
inner join app_device_bind_record c on d.id = c.device_id inner join app_device_bind_record c on d.id = c.device_id
@ -285,7 +284,7 @@
<if test="criteria.onlineStatus != null"> <if test="criteria.onlineStatus != null">
and d.online_status = #{criteria.onlineStatus} and d.online_status = #{criteria.onlineStatus}
</if> </if>
ORDER BY d.create_time DESC ORDER BY c.binding_time DESC
</select> </select>
<select id="getLocationHistory" resultType="com.fuyuanshen.equipment.domain.vo.LocationHistoryVo"> <select id="getLocationHistory" resultType="com.fuyuanshen.equipment.domain.vo.LocationHistoryVo">
select a.id,a.device_name,a.device_type,b.type_name deviceTypeName,a.device_imei,a.device_mac from device a select a.id,a.device_name,a.device_type,b.type_name deviceTypeName,a.device_imei,a.device_mac from device a