From 0670dde143770e6b9f3a3a91e1768e5acd504126 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 07 Aug 2020 18:02:41 +0800
Subject: [PATCH] update
---
src/main/resources/mapper/DeviceMapper.xml | 85 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 83 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 5680b8d..a7d881e 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -45,6 +45,8 @@
<result column="device_tech" property="deviceTech" jdbcType="TINYINT" />
<result column="device_cat" property="deviceCat" jdbcType="TINYINT" />
<result column="device_source" property="deviceSource" jdbcType="VARCHAR" />
+ <result column="ext_c" property="extC" jdbcType="VARCHAR" />
+ <result column="ext_d" property="extD" jdbcType="VARCHAR" />
</association>
</resultMap>
@@ -214,7 +216,7 @@
</where>
</select>
<select id="selectByOrgIdAndMpId" resultMap="BaseResultMap">
- SELECT dev.*,dve.version as device_version_value from device dev
+ SELECT dev.*,dve.version as device_version_value,mpt.* from device dev
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>
@@ -394,7 +396,9 @@
mpt.province_code,
dp.device_tech,
dp.device_cat,
- dp.device_source
+ dp.device_source,
+ dp.ext_c,
+ dp.ext_d
from device dev
left join operate_user ouser on dev.operate_user_id = ouser.id
left join device_version dvn on dev.device_version_id = dvn.id
@@ -410,4 +414,81 @@
</if>
)
</select>
+
+ <select id="getLimitDataByDevice" resultType="String">
+ SELECT limit_val FROM view_device_density WHERE mac = #{mac}
+ </select>
+
+ <select id="getMacsByOrganizationId" resultType="string">
+ SELECT d.mac
+ FROM monitor_point mp, device d
+ WHERE mp.id = d.monitor_point_id
+ AND mp.organization_id IN
+ <foreach collection="organizationIdList" index="index" item="organizationId" open="(" separator="," close=")">
+ #{organizationId}
+ </foreach>
+ AND d.is_delete = '0'
+ </select>
+
+ <select id="getDeviceById1" resultType="com.moral.entity.Device">
+ SELECT d.* FROM `device` as d,monitor_point as mp,device_property as dp where d.monitor_point_id=mp.id and d.id=dp.id and dp.device_tech=1 and d.monitor_point_id=#{id}
+ </select>
+ <select id="getDeviceById2" resultType="com.moral.entity.Device">
+ SELECT d.* FROM `device` as d,monitor_point as mp,device_property as dp where d.monitor_point_id=mp.id and d.id=dp.id and dp.device_tech=2 and d.monitor_point_id=#{id}
+ </select>
+ <select id="getDeviceById3" resultType="com.moral.entity.Device">
+ SELECT d.* FROM `device` as d,monitor_point as mp,device_property as dp where d.monitor_point_id=mp.id and d.id=dp.id and dp.device_tech=3 and d.monitor_point_id=#{id}
+ </select>
+
+ <select id="getHasWindDirAndWindSpeedDeviceVersion" resultType="integer">
+ SELECT id from
+ device_version
+ where id in
+ (SELECT s.device_version_id
+ from
+ (SELECT device_version_id
+ from
+ device_version_sensor
+ WHERE sensor_Id in
+ (SELECT id from
+ sensor
+ where
+ sensor_key='e18' or sensor_key='e23')) s
+ GROUP BY s.device_version_id
+ HAVING count(1)=2)
+ and is_delete=0;
+ </select>
+
+ <select id="selectDevicesAll" parameterType="java.util.Map" resultType="com.moral.entity.Device">
+ SELECT dev.id,dev.mac,dev.device_version_id deviceVersionId from device dev
+ left join monitor_point mpt on dev.monitor_point_id = mpt.id
+ <where>
+ <if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(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>
+ <if test="regionCode != null">
+ AND mpt.${regionType}_code = #{regionCode}
+ </if>
+ AND dev.is_delete =0
+ </where>
+ </select>
+
+ <select id="getDeviceListByMonitorPointIds" resultType="com.moral.entity.Device">
+ select * from device where monitor_point_id in
+ <foreach item="item" collection="list" index="index" open="(" separator="," close=")">#{item}</foreach>
+ </select>
+
+ <select id="selectAllFieldByMac" resultType="java.util.Map">
+ SELECT *
+ FROM device
+ WHERE mac = #{mac}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0