From 5586964c3e63f95c9e460a6a3d85d7dca408e096 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Mon, 18 Oct 2021 14:35:39 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev --- 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 49a6cbc..41b2d2f 100644 --- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml +++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml @@ -20,4 +20,14 @@ ORDER BY `time` </select> + <select id="getCruiserData" resultType="java.util.Map"> + SELECT + DATE_FORMAT(`time`, #{dateFormat}) AS `time`, + `value` + FROM `history_second_cruiser` + WHERE mac = #{mac} + AND `time` LIKE #{time}"%" + AND organization_id = #{orgId} + </select> + </mapper> \ No newline at end of file -- Gitblit v1.8.0