From d24f1e1af1a5949ef8ba128fea3783210f04df98 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 05 Jul 2023 09:19:08 +0800
Subject: [PATCH] 日报月报

---
 screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index 54d7ade..2f52e18 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
@@ -31,4 +31,30 @@
         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>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0