From 4fb2ce2dc95e4044d4d1f3e76dcf68bf842ae9b0 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Sun, 24 Jun 2018 12:56:21 +0800
Subject: [PATCH] 更新完整json
---
src/main/java/com/moral/controller/ScreenController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 5320d6c..66467dd 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -155,7 +155,7 @@
* @return the alarm levels
*/
@GetMapping("alarm-levels")
- public Object getAlarmLevels(HttpServletRequest request, Optional<Integer> orgId, Optional<Integer> mpId) {
+ public Object getAlarmLevels(HttpServletRequest request, Optional<Integer> orgId, Optional<Integer> mpId,Optional<String> mac) {
List<Map<String,Object>> sensorAlarmList = null;
try {
AlarmConfig alarmConfig = null;
@@ -163,6 +163,8 @@
alarmConfig = alarmConfigService.queryValueByOrganizationId(orgId.get()).get();
}else if(mpId.isPresent()){
alarmConfig = alarmConfigService.queryByMonitorPointId(mpId.get()).get();
+ } else if(mac.isPresent() ){
+ alarmConfig = alarmConfigService.queryByDeviceMac(mac.get()).get();
}
//���������������
if(alarmConfig.getValue()!=null&&alarmConfig.getValue().getAlarmLevels()!=null){
@@ -585,7 +587,7 @@
InputStreamReader reader = null;
Map<String,Object> map = null;
try {
- reader = new InputStreamReader(resource.getInputStream());
+ reader = new InputStreamReader(resource.getInputStream(),"UTF-8");
map = new JSONReader(reader).readObject(new TypeReference<Map<String,Object>>() {});
} catch (IOException e) {
e.printStackTrace();
--
Gitblit v1.8.0