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 | 66 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 2579c96..4c54351 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -7,7 +7,6 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.net.InetAddress;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -18,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;
@@ -56,7 +56,7 @@
import com.moral.entity.alarm.AlarmSensorLevel;
import com.moral.service.AccountService;
import com.moral.service.AlarmConfigService;
-import com.moral.service.AlarmService;
+import com.moral.service.AlarmDailyService;
import com.moral.service.AreaService;
import com.moral.service.DeviceService;
import com.moral.service.HistoryMinutelyService;
@@ -114,7 +114,7 @@
private String levelKey = "alarm_";
@Resource
- private AlarmService alarmService;
+ private AlarmDailyService alarmDailyService;
/**
* Screen login. ������������
*
@@ -277,13 +277,9 @@
ftpClient.connect(ip, port);
ftpClient.login(userName, userPwd);
ftpClient.changeWorkingDirectory(path);
- //ftpClient.enterRemotePassiveMode();
- //ftpClient.enterLocalPassiveMode();
- ftpClient.enterLocalActiveMode();
- //ftpClient.enterRemoteActiveMode(InetAddress.getByName(ip), port);
+ ftpClient.enterLocalPassiveMode();
+ //ftpClient.enterLocalActiveMode();
-
- System.out.println("==================================================1");
InputStream ins = ftpClient.retrieveFileStream(fileName);
BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));
String line;
@@ -301,8 +297,18 @@
ftpClient.logout();
ftpClient.disconnect();
}
- System.out.println("==================================================2");
- System.out.println(content);
+
+// String urlStr = "http://www.7drlb.com/apps/Version.xml";
+// URL realUrl = new URL(urlStr);
+// URLConnection connection = realUrl.openConnection();
+// connection.connect();
+// StringBuffer result = new StringBuffer();
+// BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "utf-8"));
+// String line;
+// while ((line = in.readLine()) != null) {
+// result.append(line);
+// }
+// String content = result.toString();
SAXReader saxReader = new SAXReader();
Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));
@@ -485,8 +491,44 @@
parameters.remove("organizationId");
}
}
- Map pieData = alarmService.getPieData(parameters);
+ Map pieData = alarmDailyService.getPieData(parameters);
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