From 70830c5b2e96cc1c76d4adb88ddced55e7476547 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 28 Nov 2019 15:33:05 +0800
Subject: [PATCH] 大屏后台管理代码update
---
src/main/java/com/moral/controller/MobileController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index 7ce2738..23a1a9c 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -360,16 +360,18 @@
@GetMapping("mointorPointRank")
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "String")
+ @ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensor", value = "������", required = true, paramType = "query", dataType = "String")
})
- public ResultBean<Map<String, Object>> getMointorPointRank(HttpServletRequest request){
+ public ResultBean<List<Map<String, Object>>> getMointorPointRank(HttpServletRequest request){
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
String id = parameters.get("accountId").toString();
+ String sensor = parameters.get("sensor").toString();
Map<String, Object> account = accountService.getOrganizationIdByAccountId(id);
//������������id������������������������������
- System.out.println(account);
- historyService.getMointorPointRankByOrganizationId(account);
- return new ResultBean<Map<String, Object>>(account);
+ account.put("sensor", sensor);
+ List<Map<String, Object>> returnList = historyService.getMointorPointRankByOrganizationId(account);
+ return new ResultBean<List<Map<String, Object>>>(returnList);
}
}
--
Gitblit v1.8.0