From 1babbf1c0b2bc8d27f2874c85369e394b545594a Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 11 May 2020 11:24:00 +0800
Subject: [PATCH] add轨迹信息显示按秒级显示,update轨迹数据先从history表查询,update报表单位问题
---
src/main/resources/mapper/DeviceMapper.xml | 376 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 346 insertions(+), 30 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index fbe298a..c2c17b5 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -1,33 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.mapper.DeviceMapper">
- <resultMap id="BaseResultMap" type="com.moral.entity.Device">
- <id column="id" jdbcType="INTEGER" property="id" />
- <result column="name" jdbcType="VARCHAR" property="name" />
- <result column="address" jdbcType="VARCHAR" property="address" />
- <result column="longitude" jdbcType="REAL" property="longitude" />
- <result column="latitude" jdbcType="REAL" property="latitude" />
- <result column="mac" jdbcType="VARCHAR" property="mac" />
- <result column="operate_user_id" jdbcType="INTEGER" property="operateUserId" />
- <result column="state" jdbcType="CHAR" property="state" />
- <result column="is_delete" jdbcType="CHAR" property="isDelete" />
- <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
- <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" />
- <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" />
- </association>
- <association property="deviceVersion" javaType="com.moral.entity.DeviceVersion">
- <result column="device_version_id" property="id" jdbcType="INTEGER" />
- <result column="device_version_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>
- </resultMap>
+ <resultMap id="ResultMap" type="com.moral.entity.Device">
+ <id column="id" jdbcType="INTEGER" property="id" />
+ <result column="name" jdbcType="VARCHAR" property="name" />
+ <result column="address" jdbcType="VARCHAR" property="address" />
+ <result column="longitude" jdbcType="DOUBLE" property="longitude" />
+ <result column="latitude" jdbcType="DOUBLE" property="latitude" />
+ <result column="mac" jdbcType="VARCHAR" property="mac" />
+ <result column="operate_user_id" jdbcType="INTEGER" property="operateUserId" />
+ <result column="state" jdbcType="CHAR" property="state" />
+ <result column="is_delete" jdbcType="CHAR" property="isDelete" />
+ <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+ <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" />
+ </resultMap>
+
+ <resultMap id="BaseResultMap" type="com.moral.entity.Device" extends="ResultMap">
+ <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" />
+ </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" />
+ </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" />
+ <result column="province_code" property="provinceCode" 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>
+
+ <resultMap id="PropertyResultMap" type="com.moral.entity.Device" extends="BaseResultMap">
+ <association property="deviceProperty" javaType="com.moral.entity.DeviceProperty">
+ <result column="id" property="id" jdbcType="INTEGER" />
+ <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>
+
+ <resultMap id="BaseResultWithOrgIdsMap" type="com.moral.entity.Device" extends="BaseResultMap">
+ <collection property="organizationIds" column="id" select="selectOrganizationIds"></collection>
+ </resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
@@ -61,6 +86,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.*,
@@ -81,7 +118,7 @@
</if>
)
</select>
- <select id="getDeviceStatesByAccount" resultType="map">
+ <select id="getDeviceStatesByAccount" resultType="java.util.Map">
SELECT
COUNT( d.state ) count,
d.state
@@ -98,8 +135,7 @@
</if>
GROUP BY d.state
</select>
-
- <select id="getSensorsByDevice" resultType="map">
+ <select id="getSensorsByDevice" resultType="java.util.Map">
SELECT
s.`key`,
s.`name`
@@ -114,4 +150,284 @@
ORDER BY
s.id
</select>
+ <select id="getDeviceVersionIdByMonitorPoint" resultType="java.util.Map">
+ SELECT
+ device_version_id deviceVersionId
+ FROM
+ device
+ WHERE
+ monitor_point_id = #{monitorPoint}
+ GROUP BY
+ device_version_id
+ </select>
+ <select id="getDeviceVersionIdByAreaCode" resultType="java.lang.Integer">
+ 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() > 0">
+ AND mp.organization_id IN
+ <foreach collection="orgIds" open="(" separator="," close=")" item="listItem">
+ #{listItem}
+ </foreach>
+ </if>
+ </select>
+ <select id="getDeviceMacByMonitorPointAndDeviceVersion" resultType="java.lang.String">
+ SELECT
+ mac
+ FROM
+ device
+ WHERE
+ 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
+ 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>
+ <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>
+ and dev.is_delete = 0
+ <if test="devState!=null">
+ and dev.state = #{devState}
+ </if>
+ <if test="name!=null and ''!=name">
+ and
+ (
+ dev.name like CONCAT('%',#{name},'%')
+ or dev.mac like CONCAT('%',#{name},'%')
+ or mpt.name like CONCAT('%',#{name},'%')
+ )
+ </if>
+ </where>
+ </select>
+ <select id="selectByOrgIdAndMpId" resultMap="BaseResultMap">
+ 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>
+ <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>
+ and dev.monitor_point_id = #{mpId}
+ and dev.is_delete = 0
+ </where>
+ </select>
+ <select id="selectByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
+ SELECT dev.*,dve.version as device_version_value 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>
+ <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>
+ <![CDATA[
+ AND dev.longitude < #{mapBounds.Ge,jdbcType=NUMERIC}
+ AND dev.longitude > #{mapBounds.Le,jdbcType=NUMERIC}
+ AND dev.latitude < #{mapBounds.Fe,jdbcType=NUMERIC}
+ AND dev.latitude > #{mapBounds.Ke,jdbcType=NUMERIC}
+ ]]>
+ <if test="regionCode != null">
+ AND mpt.${regionType}_code = #{regionCode}
+ </if>
+ AND dev.is_delete =0
+ </where>
+ </select>
+ <!-- resultMap������ -->
+ <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
+ dev.*,
+ mpt.name as monitor_point_name,
+ pro.name as profession_name,
+ dvn.version as device_version_value
+ from device dev
+ left join device_version dvn on dev.device_version_id = dvn.id
+ 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}
+ limit 0,1
+ </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>
+ <if test="townCode != null">
+ AND mp.town_code = #{townCode}
+ </if>
+ <if test="villageCode != null">
+ AND mp.village_code = #{villageCode}
+ </if>
+ )
+ <if test="professionId != null">
+ AND d.profession_id = #{professionId}
+ </if>
+ </select>
+ <select id="getDevicesByProfession" resultType="com.moral.entity.Device">
+ SELECT
+ *
+ 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>
+ <if test="monitorPointId != null">
+ AND mp.id = #{monitorPointId}
+ </if>
+ <if test="townCode != null">
+ AND mp.town_code = #{townCode}
+ </if>
+ <if test="villageCode != null">
+ AND mp.village_code = #{villageCode}
+ </if>
+ )
+ <if test="professionId != null">
+ AND d.profession_id = #{professionId}
+ </if>
+ </select>
+
+ <select id="getDevicesByOrganizationId" resultMap="ResultMap">
+ SELECT
+ d.*
+ FROM
+ device d,
+ monitor_point mp
+ WHERE
+ d.monitor_point_id = mp.id
+ AND d.is_delete = 0
+ AND mp.is_delete = 0
+ AND mp.organization_id = #{organizationId}
+ </select>
+
+
+ <select id="getDevicesStateByRegion" resultType="map">
+ SELECT
+ d.id deviceId,d.mac,d.state,d.name deviceName,
+ mp.id,mp.name
+ FROM
+ device d ,
+ monitor_point mp
+ <where>
+ d.monitor_point_id = mp.id
+ AND d.is_delete = 0
+ AND mp.is_delete = 0
+ AND mp.${regionType}_code = #{regionCode}
+ <if test="orgIds != null and orgIds.size > 0">
+ AND mp.organization_id IN
+ <foreach collection="orgIds" open="(" separator="," close=")" item="listItem">
+ #{listItem}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+ <select id="getDeviceList" resultMap="PropertyResultMap">
+ select
+ dev.*,
+ ouser.name as operate_user_name,
+ dvn.name as device_version_name,
+ mpt.name as monitor_point_name,
+ mpt.province_code,
+ dp.device_tech,
+ dp.device_cat,
+ 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
+ left join monitor_point mpt on dev.monitor_point_id = mpt.id
+ left join device_property dp on dev.id = dp.id
+ where dev.id in (
+ select id from device
+ <if test="_parameter != null">
+ <include refid="Example_Where_Clause" />
+ </if>
+ <if test="orderByClause != null">
+ order by ${orderByClause}
+ </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>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0