From 9c83d6bf41457e97a343c867f5b5261f222c158d Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 31 Aug 2021 15:18:31 +0800
Subject: [PATCH] screen-api 添加获取无人机秒级mock数据接口
---
screen-api/src/main/java/com/moral/api/controller/SpecialDeviceController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/SpecialDeviceController.java b/screen-api/src/main/java/com/moral/api/controller/SpecialDeviceController.java
index ae6cf8d..784d432 100644
--- a/screen-api/src/main/java/com/moral/api/controller/SpecialDeviceController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/SpecialDeviceController.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,6 +33,16 @@
private SpecialDeviceService specialDeviceService;
/**
+ * @return ������������������������������������
+ */
+ @GetMapping("getCarsByOrg")
+ @ApiOperation(value = "������������������������������������������", notes = "���������������")
+ public ResultMessage getCarsInfo() {
+ List<Map<String, Object>> response = specialDeviceService.getCarsInfo();
+ return ResultMessage.ok(response);
+ }
+
+ /**
* @param request ������������
* @return ������������������������������������
*/
@@ -40,16 +51,15 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
@ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "sensorCode", value = "���������code", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "time", value = "���������2021-08-18", required = true, paramType = "query", dataType = "String")
})
public ResultMessage carTrajectory(HttpServletRequest request) {
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
- if (!params.containsKey("mac") || !params.containsKey("sensorCode") || !params.containsKey("time")) {
+ if (!params.containsKey("mac") || !params.containsKey("time")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
List<Map<String, Object>> response = specialDeviceService.carTrajectory(params);
- return ResultMessage.ok(response);
+ return ObjectUtils.isEmpty(response) ? ResultMessage.ok() : ResultMessage.ok(response);
}
}
--
Gitblit v1.8.0