From 8a44b29fc5599fd92a9b583a07a16952bc6adfd8 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 08 Jun 2018 13:06:36 +0800
Subject: [PATCH] 添加微信接口
---
src/main/java/com/moral/controller/AlarmController.java | 62 -------------------------------
1 files changed, 0 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/moral/controller/AlarmController.java b/src/main/java/com/moral/controller/AlarmController.java
index d026fa0..a76d137 100644
--- a/src/main/java/com/moral/controller/AlarmController.java
+++ b/src/main/java/com/moral/controller/AlarmController.java
@@ -38,66 +38,4 @@
public ResultBean<List<Map>> countByTimes(Date start, Date end,@RequestParam(value = "timeUnits")Optional<TimeUnits> timeUnits){
return new ResultBean<>(alarmService.countByTimes(start,end,timeUnits.isPresent()?timeUnits.get():null));
}
- /**
- *
- * @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().getValue();
- 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;
- }
}
--
Gitblit v1.8.0