From 56eaf2d9ad4b5157d080ee76e2d2a925de60b83f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 01 Sep 2023 16:31:45 +0800
Subject: [PATCH] fix:测试提交
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 137d23c..31f57f0 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
@@ -99,20 +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) {
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);
- }//������������������
- return ResultMessage.ok(response);
+ //������������������
+ return ObjectUtils.isEmpty(response) ? ResultMessage.ok() : ResultMessage.ok(response);
}
@@ -218,6 +217,27 @@
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),map);
}
+
+ /**
+ * ���������������������
+ * @return
+ */
+ @PostMapping("dailyDustlds")
+ public ResultMessage dailyDustlds(HttpServletRequest request){
+// List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("files");
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+
+
+ Map<String, Object> map = dustldService.dailyDustlds(null,params);
+ if (ObjectUtils.isEmpty(map)){
+ return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
+ }
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),map);
+ }
+
+
+
+
/**
* ������������������
* @param id
--
Gitblit v1.8.0