From 6f873100decc93c30ca65504888382d2f2a466b2 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 04 Jul 2018 13:31:49 +0800
Subject: [PATCH] 优化
---
src/main/resources/mapper/DeviceMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index cf6ecf2..4d483d0 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -252,14 +252,15 @@
select
dev.*,
mpt.name as monitor_point_name,
- pro.name as profession_name
+ pro.name as profession_name,
+ dvn.version as device_version_value
from device dev
+ left join device_version dvn on dev.device_version_id = dvn.id
left join monitor_point mpt on dev.monitor_point_id = mpt.id
left join profession pro on pro.id = dev.profession_id
where dev.mac = #{mac,jdbcType=VARCHAR}
limit 0,1
</select>
-
<select id="getDeviceCountByRegion" resultType="java.lang.Integer">
SELECT
COUNT( * )
@@ -294,7 +295,6 @@
AND d.profession_id = #{professionId}
</if>
</select>
-
<select id="getDevicesByProfession" resultType="com.moral.entity.Device">
SELECT
*
--
Gitblit v1.8.0