From 35bfe435d09808e451de0f766f7660f91bdd35be Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Thu, 04 Apr 2019 15:00:45 +0800 Subject: [PATCH] update --- src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java index 6c6bcea..8517875 100644 --- a/src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java +++ b/src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java @@ -91,4 +91,34 @@ } } + @Override + public Map getOverproofData(Map<String, Object> parameters) throws Exception { + getAllchildrenOrg(parameters); + ParameterUtils.getTimeType4Time(parameters); + ParameterUtils.getElementByType(parameters); + ParameterUtils.getStartAndEndByTime(parameters); + ParameterUtils.getRegionType4RegionCode(parameters); + List<Map<String, Object>> list = historyDailyMapper.getOverproofData(parameters); + Map<String, Map<String, Object>[]> resultMap = new HashMap<String, Map<String, Object>[]>(); + for (Map<String, Object> map : list) { + String name = map.get("name").toString(); + Integer deviceTech = Integer.valueOf(map.get("device_tech").toString()); + Map<String,Object>[] resultlist ; + if (resultMap.containsKey(name)) { + resultlist = resultMap.get(name); + } else { + resultlist = new HashMap[3]; + } + resultlist[deviceTech-1] = new HashMap<String,Object>() { + private static final long serialVersionUID = 1L; + { + put("avg", map.get("avg")); + put("limit", map.get("limit")); + } + }; + resultMap.put(name, resultlist); + } + return resultMap; + } + } -- Gitblit v1.8.0