From ca66f2f175e6b66eda193ce58439515a9484e6b7 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 03 Sep 2019 13:44:06 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
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 9a83c24..3967ead 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1287,7 +1287,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