From 97834eed504fa4d18bca16c24a4003f198ad6344 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 07 May 2018 22:05:48 +0800
Subject: [PATCH] test
---
src/main/resources/mapper/DeviceMapper.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 1bbef74..f9f17da 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -16,17 +16,17 @@
<result column="monitor_point_id" jdbcType="INTEGER" property="monitorPointId" />
<result column="device_version_id" jdbcType="INTEGER" property="deviceVersionId" />
<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" />
+ <result column="id" property="id" jdbcType="INTEGER" />
+ <result column="name" property="name" jdbcType="VARCHAR" />
</association>
<association property="deviceVersion" javaType="com.moral.entity.DeviceVersion">
- <result column="device_version_id" property="id" jdbcType="INTEGER" />
- <result column="device_version_value" property="version" jdbcType="INTEGER" />
- <result column="device_version_name" property="name" jdbcType="VARCHAR" />
+ <result column="id" property="id" jdbcType="INTEGER" />
+ <result column="version" property="version" jdbcType="INTEGER" />
+ <result column="name" property="name" jdbcType="VARCHAR" />
</association>
- <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 property="monitorpointDetail" javaType="com.moral.entity.MonitorPoint">
+ <result column="id" property="id" jdbcType="INTEGER" />
+ <result column="name" property="name" jdbcType="VARCHAR" />
</association>
</resultMap>
<sql id="Example_Where_Clause">
@@ -62,6 +62,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.*,
@@ -193,8 +205,8 @@
<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
@@ -202,4 +214,30 @@
from device
where 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