From ff3af3a0dd0fe87a500c13e933bea1f553083508 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 21 Sep 2023 10:47:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/controller/UAVController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 2323049..8763106 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
@@ -26,14 +26,11 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.awt.geom.GeneralPath;
import java.awt.geom.Point2D;
+import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -135,5 +132,10 @@
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),vo);
}
+ @GetMapping("UAVTest")
+ public ResultMessage UAVTest(BigDecimal lat, BigDecimal lon, String batch){
+ historySecondUavService.UAVTest(lat, lon, batch);
+ return new ResultMessage();
+ }
}
--
Gitblit v1.8.0