Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-09-03 ca66f2f175e6b66eda193ce58439515a9484e6b7

Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

 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);

    }

    


 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);