From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/impl/AlarmServiceImpl.java | 48 ++++++++++++------------------------------------
1 files changed, 12 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
index 8b2e03c..3386740 100644
--- a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
@@ -1,23 +1,20 @@
package com.moral.service.impl;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
+import com.moral.entity.charts.TimeUnits;
import com.moral.mapper.AlarmMapper;
import com.moral.service.AlarmService;
import com.moral.service.HistoryMinutelyService;
@Service
-@SuppressWarnings({ "rawtypes", "unchecked" })
+@SuppressWarnings({ "rawtypes" })
public class AlarmServiceImpl implements AlarmService {
@Resource
@@ -25,38 +22,17 @@
@Resource
private HistoryMinutelyService historyMinutelyService;
-
- @Override
- public Map getPieData(Map<String, Object> parameters) {
- try {
- historyMinutelyService.convertQueryParam(parameters);
- } catch (ParseException e) {
- e.printStackTrace();
- }
- List<Map<String, Object>> alarmDatas = alarmMapper.getAlarmData(parameters);
- Map<String, List> resultMap = new LinkedHashMap<String, List>();
- for (Map<String, Object> alarmData : alarmDatas) {
- String name = alarmData.remove("name").toString();
- alarmData.remove("sum");
- for (Map.Entry<String, Object> entry : alarmData.entrySet()) {
- String key = entry.getKey();
- Object value = entry.getValue().toString();
- if (!"0".equals(value)) {
- List list;
- Map<String, Object> map = new HashMap<String, Object>();
- if (ObjectUtils.isEmpty(resultMap.get(key))) {
- list = new ArrayList();
- } else {
- list = resultMap.get(key);
- }
- map.put("name", name);
- map.put("value", value);
- list.add(map);
- resultMap.put(key, list);
- }
+ @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 resultMap;
+
+ return alarmMapper.countByTimes(start, end, format);
}
}
--
Gitblit v1.8.0