From 2c90ca6754397903904ca8efabb4c9c93889b970 Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Mon, 05 Feb 2018 14:01:31 +0800 Subject: [PATCH] 报表 相关 --- src/main/resources/mapper/HistoryMinutelyMapper.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mapper/DataMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml similarity index 90% rename from src/main/resources/mapper/DataMapper.xml rename to src/main/resources/mapper/HistoryMinutelyMapper.xml index a3b7206..99b0cb4 100644 --- a/src/main/resources/mapper/DataMapper.xml +++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.moral.mapper.DataMapper"> +<mapper namespace="com.moral.mapper.HistoryMinutelyMapper"> <select id="getDayAQIByDevice" resultType="map"> SELECT @@ -11,7 +11,7 @@ AVG(json -> '$.e15[0]') e15, AVG(json -> '$.e16[0]') e16 FROM - data + history_minutely WHERE mac = #{mac} AND time >= #{start} @@ -23,7 +23,7 @@ DATE_FORMAT(time, #{typeFormat}) time, ${sensorKeyColumn} FROM - data h + history_minutely h WHERE h.time >= #{start} AND h.time <![CDATA[<]]> #{end} -- Gitblit v1.8.0