From 9880d87f87b074b45150a66867c0d1870e6cb3e2 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 06 Aug 2020 14:31:13 +0800 Subject: [PATCH] update --- src/main/resources/mapper/DeviceMapper.xml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml index 5c53568..6e1dd54 100644 --- a/src/main/resources/mapper/DeviceMapper.xml +++ b/src/main/resources/mapper/DeviceMapper.xml @@ -440,5 +440,49 @@ 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> </mapper> \ No newline at end of file -- Gitblit v1.8.0