From 1b690930edcb3a2c1a0fc7de3fff1b352ca4597c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 30 Oct 2017 15:16:57 +0800
Subject: [PATCH] 代码更新
---
src/main/resources/mapper/HistoryEntityMapper.xml | 27 ---------------------------
1 files changed, 0 insertions(+), 27 deletions(-)
diff --git a/src/main/resources/mapper/HistoryEntityMapper.xml b/src/main/resources/mapper/HistoryEntityMapper.xml
index 56eaad9..956888a 100644
--- a/src/main/resources/mapper/HistoryEntityMapper.xml
+++ b/src/main/resources/mapper/HistoryEntityMapper.xml
@@ -238,7 +238,6 @@
</select>
<select id="getAverageByAll" resultType="map">
-<!--
SELECT
h.mac_key,
AVG(h.mac_value) avg
@@ -261,32 +260,6 @@
AND h.time < #{end}
GROUP BY
h.mac_key
- -->
-
- SELECT
- mac_key,
- AVG(mac_value) avg
- FROM
- history h
- <if test="orgIds!=null and orgIds.size > 0">
- JOIN (
- SELECT
- e.mac
- FROM
- equipment e,
- org_equ oe
- WHERE
- e.id = oe.equid
- AND oe.orgid IN
- <foreach collection="orgIds" item="listItem" open="(" separator="," close=")" >
- #{listItem}
- </foreach>
- ) e ON h.mac = e.mac
- </if>
- WHERE h.time > #{start}
- AND h.time < #{end}
- GROUP BY
- mac_key
</select>
<select id="getEquipmentStates" resultType="map">
--
Gitblit v1.8.0