From b8e86e2b44b796ced6f8fa557dfee532749dcc6c Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Wed, 15 Nov 2017 17:25:02 +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 | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/ScreenController.java b/src/main/java/com/moral/monitor/controller/ScreenController.java
index b4e0675..4f6fe2d 100644
--- a/src/main/java/com/moral/monitor/controller/ScreenController.java
+++ b/src/main/java/com/moral/monitor/controller/ScreenController.java
@@ -9,11 +9,14 @@
import javax.servlet.http.HttpServletRequest;
+import com.alibaba.fastjson.JSON;
+import com.moral.monitor.util.RedisUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.Resource;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -37,7 +40,12 @@
private ScreenService screenService;
@Value(value="classpath:system/alarmLevels.json")
- private Resource resource;
+ private Resource resource;
+
+ @javax.annotation.Resource
+ RedisTemplate<String, String> redisTemplate;
+
+ private String levelKey = "alarm_level_config";
/**
* Screen login.
@@ -180,8 +188,13 @@
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>>(){});
+ if(RedisUtil.hasKey(redisTemplate, levelKey)) {
+ String levelConfigStr = RedisUtil.get(redisTemplate, levelKey);
+ result = JSON.parseObject(levelConfigStr, new TypeReference<Map<String, Object>>() {});
+ } else {
+ 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());
--
Gitblit v1.8.0