From a8532c88680e4ab213c269ec91da5b223f62332f Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Feb 2018 14:12:26 +0800
Subject: [PATCH] 地图相关资源
---
src/main/java/com/moral/controller/ScreenController.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 88efaf1..e8bd1c8 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -6,7 +6,9 @@
import static com.moral.common.util.WebUtils.getParametersStartingWith;
import java.io.*;
+import java.lang.reflect.InvocationTargetException;
import java.util.*;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -19,7 +21,10 @@
import com.moral.entity.Device;
import com.moral.entity.MapBounds;
import com.moral.entity.MonitorPoint;
+import com.moral.entity.alarm.AlarmConfigValue;
+import com.moral.entity.alarm.AlarmSensorLevel;
import com.moral.service.*;
+import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.net.ftp.FTPClient;
@@ -46,7 +51,8 @@
//@CrossOrigin(origins = "*", maxAge = 3600)
public class ScreenController {
public static Logger log = Logger.getLogger(ScreenController.class);
-
+ @Resource
+ AlarmConfigService alarmConfigService;
@Resource
AreaService areaService;
@@ -128,23 +134,25 @@
*/
@SuppressWarnings("resource")
@GetMapping("alarm-levels")
- public Map<String, Object> getAlarmLevels(HttpServletRequest request,String orgId) {
- Map<String, Object> result = new LinkedHashMap<String, Object>();
- String key = levelKey + orgId;
+ public Object getAlarmLevels(HttpServletRequest request, Integer orgId) {
+ List<Map<String,Object>> sensorAlarmList = null;
+ AlarmConfigValue alarmConfigValue = null;
try {
- if (hasKey(redisTemplate, key)) {
- String levelConfigStr = get(redisTemplate, key);
- result = JSON.parseObject(levelConfigStr, new TypeReference<Map<String, Object>>() {});
- } else {
- InputStreamReader reader = new InputStreamReader(resource.getInputStream());
- result = new JSONReader(reader).readObject(new TypeReference<LinkedHashMap<String, Object>>() {});
- }
-
- } catch (IOException e) {
+ alarmConfigValue = alarmConfigService.queryValueByOrganizationId(orgId).get();
+ Map<String,AlarmSensorLevel> alarmLevelMap = alarmConfigValue.getAlarmLevels();
+ sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> {
+ AlarmSensorLevel alarmSensorLevel = alarmLevelMap.get(key);
+ JSONObject alarmSensorLevelMap = (JSONObject) JSON.toJSON(alarmSensorLevel);
+ alarmSensorLevelMap.put("key",key);
+ return alarmSensorLevelMap;
+ }).collect(Collectors.toList());
+ } catch (Exception e) {
e.printStackTrace();
- result.put("msg", "���������������������������������������������������" + e.getMessage());
+ Map<String, Object> err = new LinkedHashMap<String, Object>();
+ err.put("msg", "���������������������������������������������������" + e.getMessage());
+ return err;
}
- return result;
+ return sensorAlarmList;
}
/**
--
Gitblit v1.8.0