From 477b3197e1ded6920461094a8f449d99e5c67f9d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 03 Aug 2021 17:47:33 +0800
Subject: [PATCH] 更改请求方式
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 3 ++-
screen-api/src/main/java/com/moral/api/controller/WebController.java | 11 +++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/WebController.java b/screen-api/src/main/java/com/moral/api/controller/WebController.java
index 0e5b460..4f3ecfc 100644
--- a/screen-api/src/main/java/com/moral/api/controller/WebController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/WebController.java
@@ -117,14 +117,13 @@
* @param request ������������
* @return ������������������������������������
*/
- @GetMapping("getMacSensors")
+ @PostMapping("getMacSensors")
@ApiOperation(value = "������������mac������������������", notes = "������������mac������������������")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
- @ApiImplicitParam(name = "macs", value = "������mac���������������������", required = true, paramType = "query", dataType = "String")
+ @ApiImplicitParam(name = "macs", value = "������mac���������������������", required = true, paramType = "query", dataType = "List")
})
- public ResultMessage getMacSensors(HttpServletRequest request) {
- Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ public ResultMessage getMacSensors(@RequestBody Map<String,Object> params) {
if (!params.containsKey("macs")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
@@ -142,8 +141,8 @@
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
@ApiImplicitParam(name = "macs", value = "������mac���������������������", required = true, paramType = "body", dataType = "String"),
@ApiImplicitParam(name = "sensorCode", value = "������code", required = true, paramType = "body", dataType = "String"),
- @ApiImplicitParam(name = "type", value = "���������������������day���,������month���,������year���", required = true, paramType = "body", dataType = "String"),
- @ApiImplicitParam(name = "times", value = "���������������������2021-07-29������������2021-07������������2021������������������������", required = true, paramType = "body", dataType = "String")
+ @ApiImplicitParam(name = "type", value = "���������������������day���,������month���,������year���", required = true, paramType = "body", dataType = "List"),
+ @ApiImplicitParam(name = "times", value = "���������������������2021-07-29������������2021-07������������2021������������������������", required = true, paramType = "body", dataType = "List")
})
public ResultMessage getTrendChartData(@RequestBody Map<String,Object> params) {
if (!params.containsKey("macs") || !params.containsKey("sensorCode") || !params.containsKey("type") || !params.containsKey("times")) {
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 133b8ae..e4439d4 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -57,7 +57,8 @@
@Override
public Map<String, Object> getSensorsByMac(Map<String, Object> params) {
- String[] macs = params.get("macs").toString().split(",");
+ //������mac
+ List<String> macs = (List<String>) params.remove("macs");
List<Map<String, Object>> elementLists = new ArrayList<>();
for (String mac : macs) {
--
Gitblit v1.8.0