From a0341d4100c15c57fb645fd1f23225563e306712 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 28 Feb 2018 10:55:55 +0800
Subject: [PATCH] 设备和监控点 两模块修改，同步reids里的信息。数据字典功能添加

---
 src/main/java/com/moral/controller/ScreenController.java |   42 ++++++++++++++++++++++++++----------------
 1 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 88efaf1..eeac838 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,24 @@
 	 */
 	@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;
 		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 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;
 	}
 
 	/**
@@ -181,9 +188,10 @@
 	 * @param request
 	 *            the request
 	 * @return the average by all
+	 * @throws Exception 
 	 */
 	@GetMapping("all-average")
-	public Map<String, Object> getAllSensorAverageByDevice(HttpServletRequest request) {
+	public Map<String, Object> getAllSensorAverageByDevice(HttpServletRequest request) throws Exception {
 		Map<String, Object> parameters = getParametersStartingWith(request, null);
 		return historyService.getAllSensorAverageByDevice(parameters);
 	}
@@ -291,6 +299,8 @@
 		Account account = accountService.getAccountById(accountId);
 		String regionName = areaService.selectFullNameByCode(code);
 		if(account!=null&&regionName!=null){
+		    //������������
+            regionName = regionName.replace(" ","");
 			Object sensors = sensorService.queryAll();
 			JSONObject params = new JSONObject();
 			params.put("regionCode",code);

--
Gitblit v1.8.0