From a13506f193f38720ae2729f9c2ceb35bf9fdb898 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 28 Sep 2020 11:50:05 +0800
Subject: [PATCH] 更新获取风向和设备信息，添加经纬度，修改rabbit MQ代码。
---
src/main/resources/mapper/DeviceVersionMapper.xml | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/DeviceVersionMapper.xml b/src/main/resources/mapper/DeviceVersionMapper.xml
index bd180f5..05ece87 100644
--- a/src/main/resources/mapper/DeviceVersionMapper.xml
+++ b/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -1,4 +1,47 @@
<?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.DeviceVersionMapper">
+ <resultMap id="BaseResultMap" type="com.moral.entity.DeviceVersion">
+ <id column="id" jdbcType="INTEGER" property="id" />
+ <result column="name" jdbcType="VARCHAR" property="name" />
+ <result column="version" jdbcType="INTEGER" property="version" />
+ <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+ <result column="description" jdbcType="VARCHAR" property="description" />
+ </resultMap>
+ <select id="selectListByOrgId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+ SELECT
+ *
+ FROM
+ device_version dvn
+ WHERE
+ dvn.id IN (
+ SELECT DISTINCT
+ dev.device_version_id
+ FROM
+ device dev
+ WHERE
+ dev.monitor_point_id IN
+ (
+ SELECT id FROM monitor_point mpt
+ WHERE mpt.organization_id = #{orgId,jdbcType=INTEGER}
+ )
+ )
+ order by dvn.create_time desc
+ </select>
+ <select id="selectListByMpointId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+ SELECT
+ *
+ FROM
+ device_version dvn
+ WHERE
+ dvn.id IN (
+ SELECT DISTINCT
+ dev.device_version_id
+ FROM
+ device dev
+ WHERE
+ dev.monitor_point_id = #{mpointId,jdbcType=VARCHAR}
+ )
+ order by dvn.create_time desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0