From c95b4b1890598b1e451fa593c173d37952cff58d Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 16 Nov 2017 11:14:21 +0800
Subject: [PATCH] 接口拆分

---
 src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 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 d51d0a1..f490486 100644
--- a/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java
+++ b/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java
@@ -25,9 +25,7 @@
     @Resource
     RedisTemplate<String, String> redisTemplate;
 
-    private Logger logger = LoggerFactory.getLogger(StopStateCheck.class);
-
-    private int waits = 10000;
+    private int waits = 15000;
 
     public void check() {
 
@@ -40,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()) {
@@ -51,15 +49,11 @@
                 String key = "state_" + orgId + "_" + areaCode + "_" + monitorpointId + "_" + mac;
                 String state_json = RedisUtil.get(redisTemplate, key);
 
-                System.out.println("++++++++++++++++++++");
-                System.out.println(key + " => " + state_json);
-                logger.error(key + " => " + state_json);
-
                 //������������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()) {

--
Gitblit v1.8.0