From 1975c595cea467a97bd3ac34571d5051405a12a7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 10 May 2018 09:27:05 +0800
Subject: [PATCH] 地图 相关修改

---
 src/main/resources/mapper/DeviceMapper.xml |   89 ++++++++++++++++++++++++++++++++++++++------
 1 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 8ce75ca..3fb35f3 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -15,6 +15,7 @@
     <result column="install_time" jdbcType="TIMESTAMP" property="installTime" />
     <result column="monitor_point_id" jdbcType="INTEGER" property="monitorPointId" />
     <result column="device_version_id" jdbcType="INTEGER" property="deviceVersionId" />
+	<result column="profession_id" jdbcType="INTEGER" property="professionId" />
 	  <association property="operateUser" javaType="com.moral.entity.OperateUser">
 		  <result column="operate_user_id" property="id" jdbcType="INTEGER" />
 		  <result column="operate_user_name" property="name" jdbcType="VARCHAR" />
@@ -27,6 +28,10 @@
 	  <association property="monitorPoint" javaType="com.moral.entity.MonitorPoint">
 		  <result column="monitor_point_id" property="id" jdbcType="INTEGER" />
 		  <result column="monitor_point_name" property="name" jdbcType="VARCHAR" />
+	  </association>
+	  <association property="profession" javaType="com.moral.entity.Profession">
+		  <result column="profession_id" property="id" jdbcType="INTEGER" />
+		  <result column="profession_name" property="name" jdbcType="VARCHAR" />
 	  </association>
   </resultMap>
 	<sql id="Example_Where_Clause">
@@ -62,6 +67,18 @@
     id, name, address, longitude, latitude, mac, operate_user_id, state, is_delete, create_time, 
     install_time, monitor_point_id, device_version_id
   </sql>
+	<select id="countByTimes"   resultType="java.util.Map">
+		select DATE_FORMAT(create_time,#{format}) as time, COUNT(*) as count from device
+		where create_time >= #{start}
+		and create_time
+		<![CDATA[
+		<=
+		]]> #{end}
+		and is_delete <![CDATA[
+		<>
+		]]> 1
+		GROUP BY DATE_FORMAT(create_time,#{format}) ;
+	</select>
   <select id="selectWithRelationData" parameterType="tk.mybatis.mapper.entity.Example" resultMap="BaseResultMap">
     select
 	dev.*,
@@ -116,22 +133,38 @@
 	</select>
 	<select id="getDeviceVersionIdByMonitorPoint" resultType="map">
 		SELECT
-		device_version_id deviceVersionId
+			device_version_id deviceVersionId
 		FROM
-		device
+			device
 		WHERE
-		monitor_point_id = #{monitorPoint}
+			monitor_point_id = #{monitorPoint}
 		GROUP BY
-		device_version_id
+			device_version_id
+	</select>
+	<select id="getDeviceVersionIdByAreaCode" resultType="int">
+		SELECT DISTINCT
+			d.device_version_id 
+		FROM
+			monitor_point mp,
+			device d 
+		WHERE
+			mp.area_code = #{areaCode} 
+			AND d.monitor_point_id = mp.id
+		<if test="orgIds != null and orgIds.size &gt; 0">
+			AND mp.organization_id IN
+			<foreach  collection="orgIds" open="(" separator="," close=")" item="listItem">
+				#{listItem}
+			</foreach>
+		</if>
 	</select>
 	<select id="getDeviceMacByMonitorPointAndDeviceVersion" resultType="string">
 		SELECT
-		mac
+			mac
 		FROM
-		device
+			device
 		WHERE
-		monitor_point_id = #{monitorPointId}
-		AND device_version_id = #{deviceVersionId}
+			monitor_point_id = #{monitorPointId}
+			AND device_version_id = #{deviceVersionId}
 	</select>
 	<select id="selectByOrgIdAndDevName" resultMap="BaseResultMap">
 		SELECT dev.*,dve.version as device_version_value from device dev
@@ -177,13 +210,43 @@
 		<collection property="organizationIds" column="id" select="selectOrganizationIds"></collection>
 	</resultMap>
 	<!-- resultMap������ -->
-	<select id="selectOrganizationIds" resultType="INTEGER">
-		call proc_organization_id_select(#{id,jdbcType=INTEGER});
+	<select id="selectOrganizationIds" resultType="java.lang.Integer">
+		call proc_organizationIds_GetByDeviceId(#{id,jdbcType=INTEGER});
 	</select>
 	<select id="selectWithOrgIdsByMac" parameterType="java.lang.String" resultMap="BaseResultWithOrgIdsMap">
 		select
-		id,device_version_id,mac,monitor_point_id
-		from device
-		where mac = #{mac,jdbcType=VARCHAR}
+		dev.*,
+		mpt.name as monitor_point_name,
+		pro.name as profession_name
+		from device dev
+        left join monitor_point  mpt on dev.monitor_point_id = mpt.id
+        left join profession  pro on pro.id = dev.profession_id
+		where dev.mac = #{mac,jdbcType=VARCHAR}
+	</select>
+
+	<select id="getDeviceCountByRegion" resultType="java.lang.Integer">
+		SELECT
+			COUNT( * ) 
+		FROM
+			device d 
+		WHERE
+			d.is_delete = 0 
+			AND d.monitor_point_id IN (
+				SELECT
+					mp.id 
+				FROM
+					monitor_point mp 
+				WHERE
+					mp.is_delete = 0 
+					<if test="provinceCode != null">
+					AND mp.province_code = #{provinceCode}
+					</if>
+					<if test="cityCode != null">
+					AND mp.city_code = #{cityCode}
+					</if>
+					<if test="areaCode != null">
+					AND mp.area_code = #{areaCode}
+					</if>
+			)
 	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0