From 2e1d289a38cf4e0dfe0f1c7301b7a365cda8d395 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 15 Dec 2023 16:33:44 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/resources/mapper/DeviceMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 7cf8024..3a8f5f1 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -210,11 +210,11 @@
</select>
- <select id="getHeatMap" resultType="java.util.Map">
+ <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.mac as mac,
d.name as name,
(hd.value ->> '$.a34002' )+0 as count,
hd.time
@@ -228,13 +228,13 @@
</foreach>
</if>
<if test="tableName !=null">
- left join history_hourly${tableName} hd on hd.time = #{start} and d.mac = hd.mac
+ RIGHT join history_hourly${tableName} hd on hd.time = #{start} and d.mac = hd.mac
</if>
<if test="tableName ==null ">
- left join history_daily hd on hd.time = #{start} and d.mac = hd.mac
+ RIGHT join history_daily hd on hd.time = #{start} and d.mac = hd.mac
</if>
WHERE
d.is_delete = 0
- order by hd.mac
+ order by d.mac
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0