From f07e90248c565330e5219d3aed095f55e10904db Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Mon, 27 Nov 2017 16:07:16 +0800
Subject: [PATCH] mac转小写
---
src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java b/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java
index 8e3656d..88ae8b9 100644
--- a/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java
+++ b/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java
@@ -7,6 +7,8 @@
import javax.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.data.redis.core.RedisTemplate;
import com.alibaba.fastjson.JSON;
@@ -23,7 +25,7 @@
@Resource
RedisTemplate<String, String> redisTemplate;
- private int waits = 10000;
+ private int waits = 30000;
public void check() {
@@ -36,7 +38,7 @@
if(StringUtils.isEmpty(static_equ_json)) {
//���������������������������
jobDao.updateStateByMac(mac, 4);
- return;
+ continue;
}
Map<String,String> seJSON = JSON.parseObject(static_equ_json,new TypeReference<Map<String,String>>() {});
if(!seJSON.isEmpty()) {
@@ -46,11 +48,12 @@
String key = "state_" + orgId + "_" + areaCode + "_" + monitorpointId + "_" + mac;
String state_json = RedisUtil.get(redisTemplate, key);
+
//������������state���null���������������������������������������������������
if(StringUtils.isEmpty(state_json)) {
- //���������������������������
- jobDao.updateStateByMac(mac, 4);
- return;
+ //���������������������������
+ jobDao.updateStateByMac(mac, 4);
+ continue;
}
Map<String,String> stateJSON = JSON.parseObject(state_json,new TypeReference<Map<String,String>>() {});
if(!stateJSON.isEmpty()) {
@@ -58,10 +61,12 @@
if(time + waits < new Date().getTime()) {
jobDao.updateStateByMac(mac, 4);
}
- } else {
+ }
+ else {
jobDao.updateStateByMac(mac, 4);
}
- } else {
+ }
+ else {
jobDao.updateStateByMac(mac, 4);
}
}
--
Gitblit v1.8.0