From f0837ee21f7650d4413830d4ee90da02bcdd6d36 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 10 Oct 2023 10:59:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index 3a96058..1b61bbb 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
@@ -50,8 +50,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 +75,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