From cdcc163408a45578880c91ca79d865e0e5e86b65 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Thu, 09 Nov 2017 10:04:36 +0800
Subject: [PATCH] redis缓存开发

---
 src/main/resources/mapper/JobDao.xml |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/JobDao.xml b/src/main/resources/mapper/JobDao.xml
index d4baa19..e132f52 100644
--- a/src/main/resources/mapper/JobDao.xml
+++ b/src/main/resources/mapper/JobDao.xml
@@ -6,16 +6,22 @@
 <mapper namespace="com.moral.monitor.dao.JobDao">
 
     <resultMap type="HashMap" id="adjustResultMap">
-        <result column="mac_key"   property="key" javaType="java.lang.String" />
-        <result column="value"   property="value" javaType="java.lang.Float" />
+        <result column="owner_id"   property="orgId" javaType="java.lang.String" />
+        <result column="areacode"   property="areaCode" javaType="java.lang.String" />
+        <result column="monitorpoint"   property="monitorpointId" javaType="java.lang.String" />
+        <collection property="adjusts" column="id" javaType="java.util.List"  ofType="java.util.Map">
+		        <result column="mac_key" property="key" javaType="java.lang.String"/>  
+		        <result column="value" property="value" javaType="java.lang.Float"/>  
+        </collection>    
     </resultMap>
 
-    <select id="findAdjustByMac" resultMap="adjustResultMap">
-        select c.mac_key, d.`value`
+    <select id="findEquWithAdjustsByMac" resultMap="adjustResultMap">
+        select a.id,a.owner_id,a.monitorpoint,e.areacode,c.mac_key,d.`value`
         from equipment a
-        inner join mac b on a.id = b.equipment_id
+        inner join mac b on a.id = b.equipment_id			
         inner join sensor c on b.sensor = c.id
         left join sensoradjust d on b.id = d.sen_dev_id
+		left join monitorpoint e on e.id = a.monitorpoint
         where a.mac = #{0}
     </select>
 

--
Gitblit v1.8.0