From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/DeviceMapper.xml | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 4905b25..b9d9f2b 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -171,12 +171,21 @@
left join monitor_point mpt on dev.monitor_point_id = mpt.id
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}
- </if>
- <if test="devName!=null and ''!=devName">
- and dev.name like CONCAT('%',#{devName},'%')
+ <if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
+ mpt.organization_id = #{orgId}
</if>
+ and dev.is_delete = 0
+ <if test="devState!=null">
+ and dev.state = #{devState}
+ </if>
+ <if test="name!=null and ''!=name">
+ and
+ (
+ dev.name like CONCAT('%',#{name},'%')
+ or dev.mac like CONCAT('%',#{name},'%')
+ or mpt.name like CONCAT('%',#{name},'%')
+ )
+ </if>
</where>
</select>
<select id="selectByOrgIdAndMpId" resultMap="BaseResultMap">
@@ -188,6 +197,7 @@
mpt.organization_id = #{orgId}
</if>
and dev.monitor_point_id = #{mpId}
+ and dev.is_delete = 0
</where>
</select>
<select id="selectByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
@@ -204,6 +214,7 @@
AND dev.latitude < #{mapBounds.Fe,jdbcType=NUMERIC}
AND dev.latitude > #{mapBounds.Ke,jdbcType=NUMERIC}
]]>
+ AND dev.is_delete =0
</where>
</select>
<resultMap id="BaseResultWithOrgIdsMap" type="com.moral.entity.Device" extends="BaseResultMap">
@@ -222,6 +233,7 @@
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">
@@ -276,6 +288,9 @@
<if test="areaCode != null">
AND mp.area_code = #{areaCode}
</if>
+ <if test="monitorPointId != null">
+ AND mp.id = #{monitorPointId}
+ </if>
)
<if test="professionId != null">
AND d.profession_id = #{professionId}
--
Gitblit v1.8.0