From ea1373d4e1511b620bb87872e692643e2edb81f8 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 12 Sep 2023 10:29:19 +0800
Subject: [PATCH] fix:升级语句优化
---
screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index 49a6cbc..441d95e 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
@@ -20,4 +20,51 @@
ORDER BY `time`
</select>
+ <select id="getCruiserData" resultType="java.util.Map">
+ SELECT
+ DATE_FORMAT(`time`, #{dateFormat}) AS `time`,
+ `value`
+ FROM `history_second_cruiser`
+ WHERE mac = #{mac}
+ AND `time` <![CDATA[>=]]> #{time1}
+ AND `time` <![CDATA[<=]]> #{time2}
+ AND organization_id = #{orgId}
+ </select>
+
+ <select id="getCruiserDataNewAvg" resultType="com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserListDTO">
+ select DATE_FORMAT(`time`, #{dateFormat}) AS time,value ->>'$.flylat' as flyLat,value ->>'$.flylon' as flyLon ,
+ value ->> #{type} as num
+ from history_second_cruiser
+ WHERE mac = #{mac}
+ AND `time` <![CDATA[>=]]> #{time1}
+ AND `time` <![CDATA[<=]]> #{time2}
+ AND organization_id = #{orgId}
+ order by time
+ </select>
+
+ <select id="getDaily" resultType="java.lang.String">
+ select AVG(JSON_EXTRACT(value,'$.dustld'))
+ from `history_second_cruiser`
+ WHERE mac = #{mac}
+ AND `time` <![CDATA[>=]]> #{time1}
+ AND `time` <![CDATA[<=]]> #{time2}
+ </select>
+
+ <select id="getDust" resultType="java.lang.Double">
+ select JSON_EXTRACT(value,'$.dustld')
+ from `history_second_cruiser`
+ WHERE mac = #{mac}
+ AND `time` <![CDATA[>=]]> #{start}
+ AND `time` <![CDATA[<=]]> #{end}
+ </select>
+
+
+ <select id="getAllCruiserData" resultType="java.util.Map">
+ SELECT
+ `value`
+ FROM `history_second_cruiser`
+ WHERE mac = #{mac}
+ AND `time` <![CDATA[>=]]> #{time1}
+ AND `time` <![CDATA[<=]]> #{time2}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0