From 357c72932115936e91bfdc234b8dda468c575241 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 01 Aug 2023 09:11:20 +0800
Subject: [PATCH] chore:测试提交修改无人机接口
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index f909ef0..4e852a2 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -18,6 +18,7 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.text.ParseException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -98,29 +99,19 @@
@ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "time1", value = "���������2021-08-18", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "time2", value = "���������2021-08-18", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "type", value = "������������", required = true, paramType = "query", dataType = "String")
+ @ApiImplicitParam(name = "type", value = "������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "range", value = "������", required = true, paramType = "query", dataType = "int")
})
public ResultMessage carTrajectoryNewAvg(HttpServletRequest request) {
- long stime = System.currentTimeMillis();
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
- if (!params.containsKey("mac") || !params.containsKey("time1")|| !params.containsKey("type")|| !params.containsKey("time2")) {
+ if (!params.containsKey("mac") || !params.containsKey("time1")||!params.containsKey("range")|| !params.containsKey("type")|| !params.containsKey("time2")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
List<HistorySecondCruiserResultDTO> response = specialDeviceService.carTrajectoryNewAvg(params);
- if(CollectionUtils.isEmpty(response)){
- return ObjectUtils.isEmpty(response) ? ResultMessage.ok() : ResultMessage.ok(response);
- }
- long etime = System.currentTimeMillis();
- Map<Integer,HistorySecondCruiserResultDTO> map = new HashMap<>();
- for(int i = 0 ;i<response.size();i++){
- map.put(i,response.get(i));
- }
//������������������
- System.out.printf("���������������%d ������.", (etime - stime));
- return ResultMessage.ok(map);
-
+ return ObjectUtils.isEmpty(response) ? ResultMessage.ok() : ResultMessage.ok(response);
}
--
Gitblit v1.8.0