dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web端控制中心4

Browse Source
This commit is contained in:
chenyouting
2025-08-29 16:49:16 +08:00
parent 837953bf3d
commit b5565da752
14 changed files with 450 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,11 +257,8 @@
<if test="criteria.deviceName != null and criteria.deviceName != ''">
and d.device_name like concat('%', #{criteria.deviceName}, '%')
</if>
<if test="criteria.deviceMac != null">
and d.device_mac = #{criteria.deviceMac}
</if>
<if test="criteria.deviceImei != null">
and d.device_imei = #{criteria.deviceImei}
and (d.device_imei = #{criteria.deviceImei} or d.device_mac = #{criteria.deviceImei})
</if>
<if test="criteria.deviceStatus != null">
and d.device_status = #{criteria.deviceStatus}
@ -276,5 +273,33 @@
and d.group_id = #{criteria.groupId}
</if>
</select>
<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
inner join device_type b on a.device_type = b.id
<if test="bo.deviceType != null">
AND b.id = #{bo.deviceType}
</if>
<if test="bo.deviceName != null and bo.deviceName != ''">
AND a.device_name like concat('%',#{bo.deviceName},'%')
</if>
<if test="bo.deviceMac != null and bo.deviceMac != ''">
AND a.device_mac = #{bo.deviceMac}
</if>
<if test="bo.deviceImei != null and bo.deviceImei != ''">
AND a.device_imei = #{bo.deviceImei}
</if>
<if test="bo.startTime != null and bo.startTime != ''">
AND a.create_time <![CDATA[>=]]> #{bo.startTime}
</if>
<if test="bo.endTime != null and bo.endTime != ''">
AND a.create_time <![CDATA[<=]]> #{bo.endTime}
</if>
<if test="bo.groupId != null">
and a.group_id = #{bo.groupId}
</if>
ORDER BY
a.create_time DESC
</select>
</mapper>