From 2bfc4ed9012c5cae2a01bc67bdce68eeb59dc0b8 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 03 Sep 2019 13:38:19 +0800
Subject: [PATCH] 完善排名
---
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 1 -
src/main/java/com/moral/controller/ScreenController.java | 9 ++++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 68612a4..2dec9b4 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1290,7 +1290,14 @@
Map<String, Object> account = accountService.getOrganizationIdByAccountId(id);
//������������id������������������������������
account.put("sensor", sensor);
- List<Map<String, Object>> returnList = historyService.getMointorPointRankByOrganizationId(account);
+ List<Map<String, Object>> rankList = historyService.getMointorPointRankByOrganizationId(account);
+ List<Map<String, Object>> returnList = new ArrayList<>();
+ for (Map<String, Object> map : rankList) {
+ boolean contains = map.containsKey("sensor");
+ if (contains) {
+ returnList.add(map);
+ }
+ }
return new ResultBean<List<Map<String, Object>>>(returnList);
}
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index 6238443..6a32a37 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -413,7 +413,6 @@
break;
}
}
- System.out.println(organizationIdList);
//������������id������������id
List<Map<String, Object>> monitorPointIdListMap = monitorPointMapper.getIdByOrganizationId(organizationIdList);
--
Gitblit v1.8.0