From d4a2ee43f5d6c7a8209d7356002ce5a3191d9b3e Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Thu, 09 Nov 2017 11:22:27 +0800
Subject: [PATCH] task数据库没有的设备造成异常处理
---
src/main/resources/mapper/HistoryEntityMapper.xml | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/HistoryEntityMapper.xml b/src/main/resources/mapper/HistoryEntityMapper.xml
index ea7322f..cddc593 100644
--- a/src/main/resources/mapper/HistoryEntityMapper.xml
+++ b/src/main/resources/mapper/HistoryEntityMapper.xml
@@ -239,7 +239,12 @@
<select id="getAverageByAll" resultType="map">
SELECT
- h.mac_key,
+ <if test="macKey != null and macKey != 'all'">
+ e.name,
+ </if>
+ <if test="macKey == 'all'">
+ h.mac_key,
+ </if>
AVG(h.mac_value) avg
FROM
history h,
@@ -258,8 +263,14 @@
#{listItem}
</foreach>
</if>
- GROUP BY
- h.mac_key
+ <if test="macKey != null and macKey != 'all'">
+ AND h.mac_key = #{macKey}
+ GROUP BY e.id
+ ORDER BY avg
+ </if>
+ <if test="macKey == 'all'">
+ GROUP BY h.mac_key
+ </if>
</select>
<select id="getEquipmentStates" resultType="map">
@@ -275,8 +286,7 @@
#{listItem}
</foreach>
</if>
- GROUP BY
- state
+ GROUP BY state
</select>
<select id="getMacLogByLast" resultType="string">
--
Gitblit v1.8.0