From 2c4bc4b044f8ff9a912446947db70694fd48442c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 15 Dec 2023 17:02:18 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/resources/mapper/DeviceMapper.xml | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 238bf81..3a8f5f1 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -199,7 +199,7 @@
<if test="organizationId !=null">
AND organization_id = #{organizationId}
</if>
- and mac LIKE "%"#{mac}"%" AND is_delete = 0
+ and mac LIKE "%"#{mac}"%" or `name` like "%"#{mac}"%" AND is_delete = 0
union
SELECT sd.id,sd.`name`,sd.mac,sd.special_type FROM special_device as sd
WHERE 1=1
@@ -208,4 +208,33 @@
</if>
and mac LIKE "%"#{mac}"%" AND is_delete = 0
</select>
+
+
+ <select id="getHeatMap" resultType="com.moral.api.pojo.dto.dataDisplay.HeatMapDTO">
+ SELECT
+ d.mac as mac,
+ d.latitude as lat,
+ d.longitude as lng,
+ d.name as name,
+ (hd.value ->> '$.a34002' )+0 as count,
+ hd.time
+ FROM
+ device as d
+ inner JOIN organization o on o.id = d.organization_id and o.is_delete = 0
+ <if test="organizationIds != null and organizationIds.size !=0">
+ and organization_id in
+ <foreach collection="organizationIds" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </if>
+ <if test="tableName !=null">
+ RIGHT join history_hourly${tableName} hd on hd.time = #{start} and d.mac = hd.mac
+ </if>
+ <if test="tableName ==null ">
+ RIGHT join history_daily hd on hd.time = #{start} and d.mac = hd.mac
+ </if>
+ WHERE
+ d.is_delete = 0
+ order by d.mac
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0