From eb48246d98cdf77e7ef65b64a2349d2974c6538a Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 03 Nov 2017 15:02:35 +0800
Subject: [PATCH] 更新 代码
---
src/main/java/com/moral/monitor/controller/ScreenController.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 111 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/ScreenController.java b/src/main/java/com/moral/monitor/controller/ScreenController.java
index 1461e55..cba3498 100644
--- a/src/main/java/com/moral/monitor/controller/ScreenController.java
+++ b/src/main/java/com/moral/monitor/controller/ScreenController.java
@@ -1,6 +1,9 @@
package com.moral.monitor.controller;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -9,23 +12,33 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.util.WebUtils;
+import com.alibaba.fastjson.JSONReader;
+import com.alibaba.fastjson.TypeReference;
import com.moral.monitor.entity.AccountEntity;
import com.moral.monitor.service.ScreenService;
+import com.moral.monitor.util.BusinessException;
import com.moral.monitor.util.Crypto;
+import com.moral.monitor.util.WebUtils;
@RestController
@RequestMapping(value = "screen")
@CrossOrigin(origins = "*", maxAge = 3600)
public class ScreenController {
+ /** The screen service. */
@Autowired
- private ScreenService screenService;
+ private ScreenService screenService;
+
+ @Value(value="classpath:system/alarmLevels.json")
+ private Resource resource;
+
/**
* Screen login.
*
@@ -65,25 +78,114 @@
resultMap.put("accountId", accountId);
return resultMap;
}
-
+
+ /**
+ * Gets the month data by equipment.
+ *
+ * @param request the request
+ * @return the month data by equipment
+ */
@RequestMapping(value = "/month", method = RequestMethod.GET)
public Map<String, Object> getMonthDataByEquipment(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
- Map<String, Object> result = screenService.getMonthDataByEquipment(parameters);
+ Map<String, Object> result = new LinkedHashMap<String, Object>();
+ try {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ if (!(parameters.containsKey("mac") && parameters.containsKey("macKey"))) {
+ result.put("msg", "���������������������");
+ } else {
+ result = screenService.getMonthDataByEquipment(parameters);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ result.put("msg", "���������������������������������������������������"+e.getMessage());
+ }
return result;
}
+ /**
+ * Gets the average by all.
+ *
+ * @param request the request
+ * @return the average by all
+ */
@RequestMapping(value = "/all-average", method = RequestMethod.GET)
public Map<String, Object> getAverageByAll(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
- Map<String, Object> result = screenService.getAverageByAll(parameters);
+ Map<String, Object> result = new LinkedHashMap<String, Object>();
+ try {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ if (!(parameters.containsKey("areaCode") && parameters.containsKey("accountId"))) {
+ result.put("msg", "���������������������");
+ } else {
+ result = screenService.getAverageByAll(parameters);
+ }
+ } catch (BusinessException be) {
+ be.printStackTrace();
+ result.put("msg", be.getMessage());
+ } catch (Exception e) {
+ e.printStackTrace();
+ result.put("msg", "���������������������������������������������������"+e.getMessage());
+ }
return result;
}
+ /**
+ * Gets the equipment states.
+ *
+ * @param request the request
+ * @return the equipment states
+ */
@RequestMapping(value = "/equipment-state", method = RequestMethod.GET)
public Map<String, Object> getEquipmentStates(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
- Map<String, Object> result = screenService.getEquipmentStates(parameters);
+ Map<String, Object> result = new LinkedHashMap<String, Object>();
+ try {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ if (!parameters.containsKey("accountId")) {
+ result.put("msg", "���������������������");
+ } else {
+ result = screenService.getEquipmentStates(parameters);
+ }
+ } catch (BusinessException be) {
+ be.printStackTrace();
+ result.put("msg", be.getMessage());
+ } catch (Exception e) {
+ e.printStackTrace();
+ result.put("msg", "���������������������������������������������������"+e.getMessage());
+ }
+ return result;
+ }
+
+
+ @RequestMapping(value = "/sensor-average", method = RequestMethod.GET)
+ public Map<String, Object> getAverageBySensor(HttpServletRequest request) {
+ Map<String, Object> result = new HashMap<String, Object>();
+ try {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ if (!(parameters.containsKey("areaCode") && parameters.containsKey("accountId") && parameters.containsKey("macKey"))) {
+ result.put("msg", "���������������������");
+ } else {
+ result = screenService.getAverageBySensor(parameters);
+ }
+ } catch (BusinessException be) {
+ be.printStackTrace();
+ result.put("msg", be.getMessage());
+ } catch (Exception e) {
+ e.printStackTrace();
+ result.put("msg", "���������������������������������������������������"+e.getMessage());
+ }
+ return result;
+ }
+
+
+ @RequestMapping(value = "/alarm-levels", method = RequestMethod.GET)
+ public Map<String,Object> getAlarmLevels(HttpServletRequest request){
+ Map<String,Object> result = new HashMap<String, Object>();
+ try {
+ InputStreamReader reader = new InputStreamReader(resource.getInputStream());
+ result = new JSONReader(reader).readObject(new TypeReference<Map<String,Object>>(){});
+ } catch (IOException e) {
+ e.printStackTrace();
+ result.put("msg", "���������������������������������������������������"+e.getMessage());
+ }
return result;
}
}
--
Gitblit v1.8.0