From 7e424b1482b9d8971b8b738e7a165f3b09cb29e0 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 15 Nov 2018 10:18:22 +0800
Subject: [PATCH] update
---
src/main/resources/mapper/DeviceMapper.xml | 68 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index dec7671..16521ec 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -150,7 +150,7 @@
WHERE
mp.area_code = #{areaCode}
AND d.monitor_point_id = mp.id
- <if test="orgIds != null and orgIds.size > 0">
+ <if test="orgIds != null and orgIds.size() > 0">
AND mp.organization_id IN
<foreach collection="orgIds" open="(" separator="," close=")" item="listItem">
#{listItem}
@@ -172,7 +172,15 @@
left join device_version dve on dev.device_version_id = dve.id
<where>
<if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
- mpt.organization_id = #{orgId}
+ (
+ 1 > 1
+ <if test="orgIds!=null and orgIds.size() > 0">
+ or mpt.organization_id in
+ <foreach collection="orgIds" item="tempOrgId" open="(" close=")" separator=",">
+ #{tempOrgId,jdbcType=INTEGER}
+ </foreach>
+ </if>
+ )
</if>
and dev.is_delete = 0
<if test="devState!=null">
@@ -194,7 +202,15 @@
left join device_version dve on dev.device_version_id = dve.id
<where>
<if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
- mpt.organization_id = #{orgId}
+ (
+ 1 > 1
+ <if test="orgIds!=null and orgIds.size() > 0">
+ or mpt.organization_id in
+ <foreach collection="orgIds" item="tempOrgId" open="(" close=")" separator=",">
+ #{tempOrgId,jdbcType=INTEGER}
+ </foreach>
+ </if>
+ )
</if>
and dev.monitor_point_id = #{mpId}
and dev.is_delete = 0
@@ -206,7 +222,15 @@
left join device_version dve on dev.device_version_id = dve.id
<where>
<if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
- mpt.organization_id = #{orgId,jdbcType=VARCHAR}
+ (
+ 1 > 1
+ <if test="orgIds!=null and orgIds.size() > 0">
+ or mpt.organization_id in
+ <foreach collection="orgIds" item="tempOrgId" open="(" close=")" separator=",">
+ #{tempOrgId,jdbcType=INTEGER}
+ </foreach>
+ </if>
+ )
</if>
<![CDATA[
AND dev.longitude < #{mapBounds.Ge,jdbcType=NUMERIC}
@@ -228,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( * )
@@ -270,7 +295,6 @@
AND d.profession_id = #{professionId}
</if>
</select>
-
<select id="getDevicesByProfession" resultType="com.moral.entity.Device">
SELECT
*
@@ -308,4 +332,34 @@
AND d.profession_id = #{professionId}
</if>
</select>
+
+ <resultMap id="ResultMap" type="com.moral.entity.Device">
+ <id column="id" jdbcType="INTEGER" property="id" />
+ <result column="name" jdbcType="VARCHAR" property="name" />
+ <result column="address" jdbcType="VARCHAR" property="address" />
+ <result column="longitude" jdbcType="DOUBLE" property="longitude" />
+ <result column="latitude" jdbcType="DOUBLE" property="latitude" />
+ <result column="mac" jdbcType="VARCHAR" property="mac" />
+ <result column="operate_user_id" jdbcType="INTEGER" property="operateUserId" />
+ <result column="state" jdbcType="CHAR" property="state" />
+ <result column="is_delete" jdbcType="CHAR" property="isDelete" />
+ <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+ <result column="install_time" jdbcType="TIMESTAMP" property="installTime" />
+ <result column="monitor_point_id" jdbcType="INTEGER" property="monitorPointId" />
+ <result column="device_version_id" jdbcType="INTEGER" property="deviceVersionId" />
+ <result column="profession_id" jdbcType="INTEGER" property="professionId" />
+ </resultMap>
+
+ <select id="getDevicesByOrganizationId" resultMap="ResultMap">
+ SELECT
+ d.*
+ FROM
+ device d,
+ monitor_point mp
+ WHERE
+ d.monitor_point_id = mp.id
+ AND d.is_delete = 0
+ AND mp.is_delete = 0
+ AND mp.organization_id = #{organizationId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0