From 999d8a80d9a1c1f20033c29e7e2a08951766bee8 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Mon, 13 Nov 2017 16:16:34 +0800
Subject: [PATCH] Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git
---
src/main/java/com/moral/monitor/controller/ScreenController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/ScreenController.java b/src/main/java/com/moral/monitor/controller/ScreenController.java
index ab993be..b4e0675 100644
--- a/src/main/java/com/moral/monitor/controller/ScreenController.java
+++ b/src/main/java/com/moral/monitor/controller/ScreenController.java
@@ -177,10 +177,15 @@
@RequestMapping(value = "/alarm-levels", method = RequestMethod.GET)
- public Map<String,Map<String,Double>> getAlarmLevels(HttpServletRequest request) throws IOException {
- InputStreamReader reader=new InputStreamReader(resource.getInputStream());
- JSONReader jsonReader = new JSONReader(reader);
- Map<String,Map<String,Double>> result= jsonReader.readObject(new TypeReference<Map<String,Map<String,Double>>>(){});
+ public Map<String,Object> getAlarmLevels(HttpServletRequest request){
+ Map<String,Object> result = new LinkedHashMap<String, Object>();
+ try {
+ InputStreamReader reader = new InputStreamReader(resource.getInputStream());
+ result = new JSONReader(reader).readObject(new TypeReference<LinkedHashMap<String,Object>>(){});
+ } catch (IOException e) {
+ e.printStackTrace();
+ result.put("msg", "���������������������������������������������������"+e.getMessage());
+ }
return result;
}
}
--
Gitblit v1.8.0