From 9f965bfa801be97c4683ae53bcb4ce897228fd14 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 07 Jul 2023 15:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into cjl
---
screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index 2d3d74c..2f52e18 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
@@ -31,6 +31,16 @@
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'))
--
Gitblit v1.8.0