From 2ddf896f0edfa33e5421a7e34018e2d8f93684e6 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Tue, 14 Nov 2017 13:10:29 +0800
Subject: [PATCH] 校准值
---
src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java b/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
index b31ba9e..0859574 100644
--- a/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.moral.monitor.dao.JobDao;
import com.moral.monitor.service.RedisService;
@@ -38,6 +39,9 @@
return "static_equ_"+mac;
}
public void setStaticEqu(String mac,Map<String,Object> equMap) {
+ if(mac==null) {
+ throw new RuntimeException("Value for mac cannot be null");
+ }
RedisUtil.set(redis, getStaticEquKey(mac),JSON.toJSONString(equMap));
}
public Map<String,Object> getStaticEqu(String mac) {
@@ -47,18 +51,18 @@
if(StringUtils.isEmpty(staticEquJson)) {
equMap = jobDao.findEquWithAdjustsByMac(mac);
if(equMap!=null) {
- //���������������adjust������������
+ //list���map���������������adjust������������,
List<Map<String,Object>> adjustList = (List<Map<String, Object>>) equMap.get(ADJUSTS);
- List<Object> adjustListWithData = new ArrayList<Object>();
+ Map<String,String> adjustMap = new HashMap();
//list to map
for(Map<String,Object> adjust:adjustList) {
- if(adjust.get("value")!=null) {
+ if(adjust.get("value")!=null&&Float.parseFloat(adjust.get("value").toString())!=0.0) {
//������������������
- adjustListWithData.add(adjust);
+ adjustMap.put(adjust.get("key").toString(), adjust.get("value").toString());
}
}
- equMap.put(ADJUSTS,adjustListWithData);
- setStaticEqu(mac,equMap);
+ equMap.put(ADJUSTS,adjustMap);
+ setStaticEqu(mac,equMap);
}
}else {
equMap = JSON.parseObject(staticEquJson,new TypeReference<Map<String,Object>>(){});
@@ -70,20 +74,12 @@
*/
public Map<String,Float> getAdjustsByMac(String mac){
Map<String,Object> equMap = getStaticEqu(mac);
+ Object adjusts = equMap.get(ADJUSTS);
Map<String,Float> adjustMap = null;
- if(equMap!=null) {
- List<Map<String,Object>> adjustList = (List<Map<String, Object>>) equMap.get(ADJUSTS);
- if(adjustList!=null) {
- adjustMap = new HashMap<String, Float>();
- //list to map
- for(Map<String,Object> adjust:adjustList) {
- if(adjust.get("value")!=null) {
- adjustMap.put(adjust.get("key").toString(), Float.valueOf(adjust.get("value").toString()));
- }
- }
- }
- }
- return adjustMap;
+ if(adjusts!=null&&adjusts instanceof JSONObject) {
+ adjustMap = ((JSONObject)adjusts).toJavaObject(new TypeReference<Map<String,Float>>(){});
+ }
+ return adjustMap;
}
//���������state_������ID_������ID_���������ID_mac
private String getEquStateKey(String mac) {
--
Gitblit v1.8.0