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

Merge remote-tracking branch 'upstream/6170' into 6170

Browse Source
This commit is contained in:
chenyouting
2025-10-08 11:48:16 +08:00
parent 6a6397da23 d701a834b3
commit cf883bfa00
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,11 +59,11 @@
<if test="criteria.deviceName != null and criteria.deviceName.trim() != ''"> <if test="criteria.deviceName != null and criteria.deviceName.trim() != ''">
and d.device_name like concat('%', TRIM(#{criteria.deviceName}), '%') and d.device_name like concat('%', TRIM(#{criteria.deviceName}), '%')
</if> </if>
<if test="criteria.deviceMac != null"> <if test="criteria.deviceMac != null and criteria.deviceMac.trim() != ''">
and d.device_mac = #{criteria.deviceMac} and d.device_mac like concat('%', TRIM(#{criteria.deviceMac}), '%')
</if> </if>
<if test="criteria.deviceImei != null"> <if test="criteria.deviceImei != null and criteria.deviceImei.trim() != ''">
and d.device_imei = #{criteria.deviceImei} and d.device_imei like concat('%', TRIM(#{criteria.deviceImei}), '%')
</if> </if>
<if test="criteria.deviceType != null"> <if test="criteria.deviceType != null">
and d.device_type = #{criteria.deviceType} and d.device_type = #{criteria.deviceType}
@ -453,7 +453,7 @@
</select> </select>
<!-- 获取设备使用频次统计 --> <!-- 获取设备使用频次统计 -->
<select id="getDeviceUsageFrequency" resultType="com.fuyuanshen.equipment.domain.vo.DeviceUsageFrequencyVo"> <select id="getDeviceUsageFrequency1" resultType="com.fuyuanshen.equipment.domain.vo.DeviceUsageFrequencyVo">
SELECT SELECT
device_name AS deviceName, device_name AS deviceName,
COUNT(*) AS frequency COUNT(*) AS frequency
@ -462,6 +462,17 @@
GROUP BY device_name GROUP BY device_name
ORDER BY frequency DESC ORDER BY frequency DESC
</select> </select>
<!-- 获取设备使用频次统计 （设备类型）-->
<select id="getDeviceUsageFrequency" resultType="com.fuyuanshen.equipment.domain.vo.DeviceUsageFrequencyVo">
SELECT
d.type_name AS deviceName,
COUNT(*) AS frequency
FROM device_log dl
LEFT JOIN device d ON dl.device_id = d.id
WHERE dl.create_time >= DATE_SUB(NOW(), INTERVAL #{days} DAY)
GROUP BY d.device_type, d.type_name
ORDER BY frequency DESC
</select>
<!-- 根据设备IMEI查询设备 --> <!-- 根据设备IMEI查询设备 -->
<select id="selectDeviceByImei" resultType="com.fuyuanshen.equipment.domain.Device"> <select id="selectDeviceByImei" resultType="com.fuyuanshen.equipment.domain.Device">