From 4a41bd4e105385b5460e5a81c8b67e5f701a262b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 04 May 2018 08:55:13 +0800
Subject: [PATCH] 首页 工作台
---
src/main/java/com/moral/service/impl/AlarmServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
index f04bc52..c07e707 100644
--- a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
@@ -1,14 +1,11 @@
package com.moral.service.impl;
import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import javax.annotation.Resource;
+import com.moral.entity.charts.TimeUnits;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -25,7 +22,18 @@
@Resource
private HistoryMinutelyService historyMinutelyService;
+ @Override
+ public List<Map> countByTimes(Date start, Date end, TimeUnits timeUnits){
+ String format = null;
+ if(timeUnits!=null){
+ switch (timeUnits){
+ case MONTH: format = "%Y-%m";
+ case DAY: format = "%Y-%m-%d";
+ }
+ }
+ return alarmMapper.countByTimes(start, end, format);
+ }
@Override
public Map getPieData(Map<String, Object> parameters) {
Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
@@ -67,7 +75,11 @@
String[] split = sensor.split("-");
if (key.equals(split[0]) && !"0".equals(alarmData.get(key).toString())) {
Map<String, Object> map = new HashMap<String, Object>();
- map.put("name", split[1]);
+ if (parameters.containsKey("description")) {
+ map.put("name", split[3]);
+ } else {
+ map.put("name", split[1]);
+ }
map.put("value", alarmData.get(key));
list.add(map);
}
--
Gitblit v1.8.0