From f9abb9474b09cf37ac4bbd6a65ea6229ebc06214 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 10 May 2018 14:20:43 +0800
Subject: [PATCH] 报警阀值 获取

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

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 4da099f..4c54351 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -17,6 +17,7 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.moral.entity.alarm.AlarmConfig;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.log4j.Logger;
@@ -494,4 +495,40 @@
 		List<Map<String, Object>> list = (List<Map<String, Object>>) pieData.get(sensorKey);
 		return new ResultBean<List<Map<String, Object>>>(list);
 	}
+
+	/**
+	 * ������������������
+	 * @param mpid
+	 * @return
+	 */
+	@GetMapping("getalevels")
+	public ResultBean<Map<String,AlarmSensorLevel>> getAlarmLevelByMonitorPointId(int mpid){
+		AlarmConfig alarmConfig = alarmConfigService.queryByMonitorPointId(mpid).get();
+        Map<String,AlarmSensorLevel> alarmSensorLevelMap = alarmConfig.getValue().getAlarmLevels();
+        // ������������������������������������������������������
+        if(alarmConfig.getId()!=null){
+            AlarmConfigValue defaultAlarmValue = alarmConfigService.getDefaultAlarmConfigValue();
+            Map<String,AlarmSensorLevel> defaultSensorLevelMap = defaultAlarmValue.getAlarmLevels();
+            Map<String,AlarmSensorLevel> alarmSensorLevelMapNotZO = alarmSensorLevelMap.entrySet().stream().collect(
+                    HashMap::new,
+                    (map,entry) -> {
+                        AlarmSensorLevel alarmSensorLevel = entry.getValue();
+                        if(alarmSensorLevel.isEnable()||alarmSensorLevel.isDegressEnable()){
+                            map.put(entry.getKey(),entry.getValue());
+                        }
+                    },
+                    (oMap,nMap) -> {
+                        oMap.putAll(nMap);
+                    }
+            );
+            // ������������������������������������
+            defaultSensorLevelMap.putAll(alarmSensorLevelMapNotZO);
+            alarmSensorLevelMap = defaultSensorLevelMap;
+        }
+
+		ResultBean<Map<String,AlarmSensorLevel>> resultBean = new ResultBean();
+		resultBean.setCode(ResultBean.SUCCESS);
+		resultBean.setData(alarmSensorLevelMap);
+		return resultBean;
+	}
 }

--
Gitblit v1.8.0