From f55f6e05bae945d275101592782fb3b8980d77cf Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Sun, 28 Jun 2020 15:26:47 +0800
Subject: [PATCH] update风速风向显示设置

---
 src/main/resources/mapper/DeviceMapper.xml |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 47 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 2932898..2d97897 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -216,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>
@@ -414,4 +414,50 @@
 			</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>
+
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0