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/MonitorPointMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index c1d3c7d..8c39e82 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -9,6 +9,7 @@
<result column="province_code" jdbcType="INTEGER" property="provinceCode"/>
<result column="city_code" jdbcType="INTEGER" property="cityCode"/>
<result column="area_code" jdbcType="INTEGER" property="areaCode"/>
+ <result column="town_code" jdbcType="INTEGER" property="townCode"/>
<result column="organization_id" jdbcType="INTEGER" property="organizationId"/>
<result column="address" jdbcType="VARCHAR" property="address"/>
<result column="is_delete" jdbcType="CHAR" property="isDelete"/>
@@ -172,6 +173,9 @@
and o.id=mp.organization_id
and a.id=#{id};
</select>
+ <select id="byIdGetMonitorPoint" resultType="com.moral.entity.MonitorPoint" resultMap="BaseResultMap">
+ SELECT * FROM `monitor_point` where id=#{id}
+ </select>
<select id="getFirstMonitorPointByAreaCode" resultType="com.moral.entity.MonitorPoint" resultMap="BaseResultMap">
select * from monitor_point where area_code=#{areaCode} limit 0,1
@@ -185,9 +189,8 @@
resultMap="BaseResultMap">
select * from monitor_point where province_code=#{provinceCode} limit 0,1
</select>
-
- <select id="getMonitorList" resultMap="BaseResultMap">
- select * from monitor_point
+ <select id="getMonitorPointIds" resultType="java.lang.Integer">
+ select id from monitor_point
where
<if test="areaCode != null">
area_code = #{areaCode}
@@ -196,5 +199,8 @@
<if test="cityCode != null">
city_code = #{cityCode}
</if>
+ <if test="provinceCode != null">
+ province_code = #{provinceCode}
+ </if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0