From d4a2ee43f5d6c7a8209d7356002ce5a3191d9b3e Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Thu, 09 Nov 2017 11:22:27 +0800
Subject: [PATCH] task数据库没有的设备造成异常处理
---
src/main/java/com/moral/monitor/controller/ScreenController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/ScreenController.java b/src/main/java/com/moral/monitor/controller/ScreenController.java
index cba3498..b4e0675 100644
--- a/src/main/java/com/moral/monitor/controller/ScreenController.java
+++ b/src/main/java/com/moral/monitor/controller/ScreenController.java
@@ -178,10 +178,10 @@
@RequestMapping(value = "/alarm-levels", method = RequestMethod.GET)
public Map<String,Object> getAlarmLevels(HttpServletRequest request){
- Map<String,Object> result = new HashMap<String, Object>();
+ Map<String,Object> result = new LinkedHashMap<String, Object>();
try {
InputStreamReader reader = new InputStreamReader(resource.getInputStream());
- result = new JSONReader(reader).readObject(new TypeReference<Map<String,Object>>(){});
+ result = new JSONReader(reader).readObject(new TypeReference<LinkedHashMap<String,Object>>(){});
} catch (IOException e) {
e.printStackTrace();
result.put("msg", "���������������������������������������������������"+e.getMessage());
--
Gitblit v1.8.0