From e77cdf62567ba92d2d3131da20429dcbfc3b7ea2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 31 Aug 2023 16:11:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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 05f2f72..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
@@ -108,12 +108,10 @@
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);
}
@@ -219,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