From 02ea120b387d2ef492250e686b94a381897526f2 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 13 Aug 2020 10:28:43 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/controller/AlarmController.java | 76 +++++--------------------------------
1 files changed, 11 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/moral/controller/AlarmController.java b/src/main/java/com/moral/controller/AlarmController.java
index 1287f2d..bb5a793 100644
--- a/src/main/java/com/moral/controller/AlarmController.java
+++ b/src/main/java/com/moral/controller/AlarmController.java
@@ -1,26 +1,25 @@
package com.moral.controller;
import com.alibaba.fastjson.JSON;
+import com.moral.common.bean.ResultBean;
import com.moral.entity.Alarm;
import com.moral.entity.Device;
import com.moral.entity.Sensor;
import com.moral.entity.alarm.AlarmConfig;
import com.moral.entity.alarm.AlarmConfigValue;
-import com.moral.service.AlarmConfigService;
-import com.moral.service.DeviceService;
-import com.moral.service.HistoryService;
-import com.moral.service.SensorService;
+import com.moral.entity.charts.TimeUnits;
+import com.moral.service.*;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.util.*;
@RestController
@RequestMapping("alarm")
@@ -34,63 +33,10 @@
HistoryService historyService;
@Resource
AlarmConfigService alarmConfigService;
- /**
- *
- * @param alarm
- * @return
- */
- @RequestMapping(value = "/alarm-show", method = RequestMethod.GET)
- public ModelAndView alarmShow(Alarm alarm){
- ModelAndView model = new ModelAndView();
- if (alarm.getMac()!=null&&alarm.getState()!=null
- &&alarm.getJson()!=null&&alarm.getTime()!=null){
- model.setViewName("/alarm/device-data");
- Device device = deviceService.getDeviceByMac(alarm.getMac());
- if(!CollectionUtils.isEmpty(device.getOrganizationIds())){
- List<Sensor> sensorList = sensorService.queryByVersionId(device.getDeviceVersionId()).getData();
- String data = historyService.queryValueByMacAndTime(alarm.getMac(),alarm.getTime());
- AlarmConfigValue alarmConfigValue = alarmConfigService.queryValueByOrganizationId(device.getOrganizationIds().get(0)).get();
- if(device!=null
- &&!CollectionUtils.isEmpty(sensorList)
- &&!StringUtils.isEmpty(data)
- &&alarmConfigValue!=null
- &&alarmConfigValue.getAlarmLevels()!=null){
- Map<String,Object> params = new HashMap<>();
- model.addObject("alarm",JSON.toJSON(alarm));
- model.addObject("device",JSON.toJSON(device));
- model.addObject("sensors",JSON.toJSON(sensorList));
- model.addObject("data",JSON.toJSON(data));
- model.addObject("alarmLevels",JSON.toJSON(alarmConfigValue.getAlarmLevels()));
- }
- else{
- StringBuilder message = new StringBuilder();
- message.append("some params is null,alarm:");
- message.append(JSON.toJSON(alarm));
- message.append(",device:");
- message.append(JSON.toJSON(device));
- message.append(",sensorList:");
- message.append(JSON.toJSON(sensorList));
- message.append(",data:");
- message.append(JSON.toJSON(data));
- logger.warn(message.toString());
- model.setViewName("403");
- }
- }else{
- StringBuilder message = new StringBuilder();
- message.append("some params is null,alarm:");
- message.append(JSON.toJSON(alarm));
- message.append(",device:");
- message.append(JSON.toJSON(device));
- logger.warn(message.toString());
- model.setViewName("403");
- }
-
- }else{
- StringBuilder message = new StringBuilder();
- message.append("some params is null,alarm:");
- message.append(JSON.toJSON(alarm));
- model.setViewName("403");
- }
- return model;
+ @Resource
+ AlarmService alarmService;
+ @RequestMapping(value = "/count-by-times", method = RequestMethod.GET)
+ public ResultBean<List<Map>> countByTimes(Date start, Date end,@RequestParam(value = "timeUnits")Optional<TimeUnits> timeUnits) throws ParseException {
+ return new ResultBean<>(alarmService.countByTimes(start,end,timeUnits.isPresent()?timeUnits.get():null));
}
}
--
Gitblit v1.8.0