From 83e42707519f5e2d886618ea55c30e8c3ab381ac Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Wed, 09 Aug 2023 09:13:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl --- screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml index 2f52e18..441d95e 100644 --- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml +++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml @@ -57,4 +57,14 @@ AND `time` <![CDATA[>=]]> #{start} AND `time` <![CDATA[<=]]> #{end} </select> + + + <select id="getAllCruiserData" resultType="java.util.Map"> + SELECT + `value` + FROM `history_second_cruiser` + WHERE mac = #{mac} + AND `time` <![CDATA[>=]]> #{time1} + AND `time` <![CDATA[<=]]> #{time2} + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0