From a9cc2343ceaad3e99dc25eb036dc99aeded279a6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 20 Oct 2023 09:26:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index 081b133..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}
@@ -76,6 +76,6 @@
FROM `history_second_cruiser`
WHERE mac = #{mac}
AND `time` <![CDATA[>=]]> #{startTime}
- AND `time` <![CDATA[<=]]> #{endTtime}
+ AND `time` <![CDATA[<=]]> #{endTime}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0