From 6006fe5d31237a7b45214b81069c17c2d155e9fb Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 22 May 2018 09:37:14 +0800
Subject: [PATCH] 地图相关资源
---
src/main/resources/mapper/DeviceMapper.xml | 14 +++++++-------
src/main/resources/mapper/MonitorPointMapper.xml | 6 ++++++
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index a3ac636..b9d9f2b 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -175,17 +175,17 @@
mpt.organization_id = #{orgId}
</if>
and dev.is_delete = 0
- and (
- <![CDATA[
- 1 <> 1
- ]]>
+ <if test="devState!=null">
+ and dev.state = #{devState}
+ </if>
<if test="name!=null and ''!=name">
- or dev.name like CONCAT('%',#{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">
diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index 0660abd..ed57416 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -121,4 +121,10 @@
<select id="selectOrganizationIds" parameterType="integer" resultType="integer">
call proc_organizationIds_GetByMonitorPointId(#{id,jdbcType=NUMERIC})
</select>
+ <select id="selectVersionsById" parameterType="integer" resultType="integer">
+ select version from device_version dve
+ right join device dev on dve.id = dev.device_version_id
+ right join monitor_point mpt on mpt.id = dev.monitor_point_id
+ where mpt.id = #{id} ORDER BY version DESC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0