From 495fad8166b5952c013aea275243cb9ee6e7fa2a Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Tue, 10 Oct 2023 13:43:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa --- screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml index a71e032..61ab41c 100644 --- a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml +++ b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml @@ -104,4 +104,22 @@ order by time desc </select> + + <select id="listLikeResult" resultType="com.moral.api.entity.HistoryHourly"> + SELECT mac,time,value,version FROM history_hourly${table} + WHERE 1 =1 + <if test="macs != null and macs.size!=0"> + and mac in + <foreach collection="macs" item="id" index="index" open="(" close=")" separator=","> + #{id} + </foreach> + </if> + <if test="mac != null and mac != ''"> + and mac = #{mac} + </if> + + and time like concat(#{time},'%') + + order by time desc + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0