From 6fe3e9841f25481cf78bd1f102886d4ce35e9e17 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 28 Jul 2023 13:38:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-api/src/main/java/com/moral/api/controller/UAVController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/UAVController.java b/screen-api/src/main/java/com/moral/api/controller/UAVController.java
index bf614b4..0c2c67d 100644
--- a/screen-api/src/main/java/com/moral/api/controller/UAVController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/UAVController.java
@@ -86,6 +86,16 @@
ArrayList<Double> flyLatList = new ArrayList<>();
//������
ArrayList<Double> flyLonList = new ArrayList<>();
+// String mac ="p5dnd7a0243591";
+// String time1 ="2023-07-19 14:14:08";
+// String time2 ="2023-07-19 14:35:29";
+//
+//// List<UAVResultDTO> uavResultDTOS = historySecondUavMapper.reList(map);
+// QueryWrapper<HistorySecondUav> queryWrapper = new QueryWrapper<>();
+// queryWrapper.select("value");
+// queryWrapper.eq("mac",mac);
+// queryWrapper.between("time",time1,time2);
+// List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(queryWrapper);
List<HistorySecondUav> historySecondUavs = historySecondUavMapper.reList(params);
if (ObjectUtils.isEmpty(historySecondUavs)){
return new ResultMessage(ResponseCodeEnum.TARGET_IS_NULL,"null");
--
Gitblit v1.8.0