From 1975c595cea467a97bd3ac34571d5051405a12a7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 10 May 2018 09:27:05 +0800
Subject: [PATCH] 地图 相关修改
---
src/main/java/com/moral/controller/ScreenController.java | 15 +++++++++++++++
1 files changed, 15 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..3f7967d 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,18 @@
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();
+ ResultBean<Map<String,AlarmSensorLevel>> resultBean = new ResultBean();
+ resultBean.setCode(ResultBean.SUCCESS);
+ resultBean.setData(alarmConfig.getValue().getAlarmLevels());
+ return resultBean;
+ }
}
--
Gitblit v1.8.0