moral.git - Gitblit

			@@ -38,7 +38,7 @@
			<select id="getArea" resultType="com.moral.api.pojo.dto.Wind.WindData">
			SELECT
			d.longitude AS longitude,
			d.latitude AS latitude,
			d.latitude AS latitude,d.mac,
			CASE WHEN
			h.value->'$.a01007' = 0 THEN 0.1 ELSE h.value->'$.a01007' END AS windSpeed,
			h.value->'$.a01008' AS windDir
			@@ -50,6 +50,12 @@
			<foreach item="monitorPointId" collection="monitorPointIds" index="index" open="(" separator="," close=")">
			#{monitorPointId}
			</foreach>
			<if test="macs != null and macs.size!= 0">
			and h.mac in
			<foreach collection="macs" item="id" index="index" open="(" close=")" separator=",">
			#{id}
			</foreach>
			</if>
			AND h.time = #{time}
			</select>

			@@ -99,12 +105,27 @@
			<if test="mac != null and mac != ''">
			and mac = #{mac}
			</if>
			<if test="startDate!=null and startDate!='' ">
			and time BETWEEN #{startDate} and #{endDate}

			and time BETWEEN #{startDate} and #{endDate}

			order by time desc
			</select>

			<select id="listLikeResult" resultType="com.moral.api.entity.HistoryHourly">
			SELECT mac,time,value,version FROM history_hourly${table}
			WHERE 1 =1
			<if test="macs != null and macs.size!=0">
			and mac in
			<foreach collection="macs" item="id" index="index" open="(" close=")" separator=",">
			#{id}
			</foreach>
			</if>
			<if test="time!=null and time!='' ">
			and time =#{time} and limit 1
			<if test="mac != null and mac != ''">
			and mac = #{mac}
			</if>

			and time like concat(#{time},'%')

			order by time desc
			</select>
			</mapper>