From 34d9307df9870510f9204659ddf9f5389012cd4d Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 17 Jun 2024 15:57:37 +0800
Subject: [PATCH] fix：sql查询时间调整
---
screen-api/src/main/resources/mapper/DeviceMapper.xml | 67 +++++++++++++++++++++++++++++++--
1 files changed, 62 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..64c99ba 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -210,13 +210,13 @@
</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.value ->> #{type} ) as count,
hd.time
FROM
device as d
@@ -228,13 +228,70 @@
</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>
+
+
+ <select id="getHeatMapV1" 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 ->> #{type} ) as count,
+ hd.time,
+ dm.group_id AS groupId
+ 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>
+ left JOIN device_map_hierarchy as dm on d.id = dm.device_id
+ <if test="tableName !=null">
left 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
</if>
WHERE
- d.is_delete = 0
- order by hd.mac
+ d.is_delete = 0
+ order by d.mac
+ </select>
+
+
+ <select id="getPage" resultType="com.moral.api.vo.OnlineRateVo">
+ select d.name,d.state,d.mac from device as d where organization_id=#{organizationId}
+ </select>
+
+
+ <select id="getLists" resultType="com.moral.api.vo.OnlineRateVo">
+ select d.name,d.state,d.mac from device as d where is_delete=0
+ <if test="macs != null and macs.size !=0">
+ and mac in
+ <foreach collection="macs" item="mac" index="index" open="(" close=")" separator=",">
+ #{mac}
+ </foreach>
+ </if>
+ <if test="state !=null and state == 0" >
+ and state=#{state}
+ </if>
+ <if test="state !=null and state != 0">
+ and state<![CDATA[>=]]>#{state}
+ </if>
+ </select>
+
+ <select id="getListVo" resultType="com.moral.api.pojo.vo.device.DeviceVO">
+ select * from device where monitor_point_id=#{monitorPointId} and is_delete=0
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0