From 49afd1f89423b359709083a0fd7008b0914c5597 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Mon, 06 Nov 2017 16:33:58 +0800
Subject: [PATCH] 设置6项数据.

---
 src/main/java/com/moral/monitor/listener/TaskListener.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index c0e8dee..1c47a31 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -146,7 +146,7 @@
     /*
      * ������������������������,���map���������������������������������
      */
-	@Value(value="alarmLevles.json")
+	@Value(value= "system/alarmLevels.json")
     public void setAlarmLevles(String path) throws IOException {
     	org.springframework.core.io.Resource resource  = new ClassPathResource(path);
     	InputStreamReader reader=new InputStreamReader(resource.getInputStream());
@@ -160,7 +160,7 @@
 			double level2 = levels.get("level2");
 			double level3 = levels.get("level3");
 			//������������������������������������������
-			if(level1!=0&&level2!=0&&level3!=0) {
+			if(levels.get("enable")!=null&&levels.get("enable")==1) {
 				//������������������
 				Double arr[] = {0.0,level1,level2,level3};
 				alarmLevles.put(key, arr);

--
Gitblit v1.8.0