From d32fa50fca18a3fff89b9ec22deaa3d964ddd19b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Jun 2018 12:34:27 +0800
Subject: [PATCH] 大屏布局监控点 返回配置数据
---
src/main/resources/mapper/DeviceMapper.xml | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index be3deb8..dec7671 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -171,13 +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">
@@ -251,6 +259,12 @@
<if test="areaCode != null">
AND mp.area_code = #{areaCode}
</if>
+ <if test="townCode != null">
+ AND mp.town_code = #{townCode}
+ </if>
+ <if test="villageCode != null">
+ AND mp.village_code = #{villageCode}
+ </if>
)
<if test="professionId != null">
AND d.profession_id = #{professionId}
@@ -283,6 +297,12 @@
<if test="monitorPointId != null">
AND mp.id = #{monitorPointId}
</if>
+ <if test="townCode != null">
+ AND mp.town_code = #{townCode}
+ </if>
+ <if test="villageCode != null">
+ AND mp.village_code = #{villageCode}
+ </if>
)
<if test="professionId != null">
AND d.profession_id = #{professionId}
--
Gitblit v1.8.0