From 10d4b885a9b2af2a38bb03249d7547283f948197 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 13 Sep 2021 13:15:18 +0800
Subject: [PATCH] screen-api                  增加获取无人机数据接口

---
 screen-api/src/main/java/com/moral/api/controller/UAVController.java |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 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 0342ed5..787b4f6 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
@@ -36,20 +36,30 @@
 public class UAVController {
 
     @Autowired
-    HistorySecondUavMapper historySecondUavMapper;
-    @Autowired
     HistorySecondUavService historySecondUavService;
+    @Autowired
+    HistorySecondUavMapper historySecondUavMapper;
+
     /**
-    * @Description: ������������id���mac���������������������������������
-            * @Param: []
+    * @Description: ������������������������������������������
+            * @Param: [batch]
             * @return: com.moral.constant.ResultMessage
             * @Author: ���������
-            * @Date: 2021/8/31
+            * @Date: 2021/9/13
             */
-    @RequestMapping("query")
-    public ResultMessage query(){
-        List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(new QueryWrapper<>());
+    @RequestMapping("queryDataByBatch")
+    public ResultMessage queryDataByBatch(String batch){
+        List<HistorySecondUav> historySecondUavs = historySecondUavService.queryDataByBatch(batch);
         return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),historySecondUavs);
+    }
+
+    @RequestMapping("test")
+    public ResultMessage test(String batch){
+        QueryWrapper<HistorySecondUav> wrapper = new QueryWrapper();
+        wrapper.select("value");
+        wrapper.eq("batch", "2021-07-08 01:00:00");
+        List<HistorySecondUav> datas = historySecondUavMapper.selectList(wrapper);
+        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),datas);
     }
 
 
@@ -71,6 +81,13 @@
     }
 
 
+    /**
+    * @Description: ���������������������������������������������
+            * @Param: [form]
+            * @return: com.moral.constant.ResultMessage
+            * @Author: ���������
+            * @Date: 2021/9/13
+            */
     @RequestMapping("queryTimeSlot")
     public ResultMessage queryTimeSlot(UAVQueryTimeSlotForm form){
         //������������������������

--
Gitblit v1.8.0