From 8490eb11583ffdc586436f165860de5cfc39f915 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:18:29 +0800
Subject: [PATCH] fix：sql查询时间调整
---
screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index 3a96058..d44f659 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
@@ -38,7 +38,15 @@
WHERE mac = #{mac}
AND `time` <![CDATA[>=]]> #{time1}
AND `time` <![CDATA[<=]]> #{time2}
- AND organization_id = #{orgId}
+ <if test="orgId !=null and orgId != 0">
+ AND organization_id = #{orgId}
+ </if>
+ <if test="orgIds != null and orgIds.size !=0">
+ and organization_id in
+ <foreach collection="orgIds" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </if>
order by time
</select>
@@ -50,8 +58,8 @@
AND `time` <![CDATA[<=]]> #{time2}
</select>
- <select id="getDust" resultType="java.lang.Double">
- select JSON_EXTRACT(value,'$.dustld')
+ <select id="getDust" resultType="java.lang.String">
+ select value ->>'$.dustld'
from `history_second_cruiser`
WHERE mac = #{mac}
AND `time` <![CDATA[>=]]> #{start}
@@ -75,7 +83,7 @@
`time`
FROM `history_second_cruiser`
WHERE mac = #{mac}
- AND `time` <![CDATA[>=]]> #{time1}
- AND `time` <![CDATA[<=]]> #{time2}
+ AND `time` <![CDATA[>=]]> #{startTime}
+ AND `time` <![CDATA[<=]]> #{endTime}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0