info even

apq-pc-info/src/main/java/com/priusis/ApqInfoApplication.java

@@ -45,17 +45,22 @@ public class ApqInfoApplication {
 
         // 获取采集配置，数据上报频率 params == data
         ResponseEntity<MqttRpcDataMessage> forEntity = null;
+        Map<String, Integer> mapParams = null;
         try {
             forEntity = restTemplate.getForEntity("http://localhost:8765/rpc_cmd/info", MqttRpcDataMessage.class);
-        } catch (Exception e) {
-            log.error("采集数据异常", e);
-        }
-
             if (null != forEntity) {
                 MqttRpcDataMessage body = forEntity.getBody();
                 String params = body.getParams();
 
                 if (StrUtil.isNotBlank(params)) {
+                    mapParams = JSONUtil.toBean(params, Map.class);
+                }
+            }
+        } catch (Exception e) {
+            log.error("采集数据异常", e);
+        }
+
+
         String operatingSystem = "operatingSystem";
         String mac = "mac";
         String baseboard = "baseboard";
@@ -67,7 +72,6 @@ public class ApqInfoApplication {
         String diskCap = "diskCap";
 
         try {
-                    Map<String, Integer> mapParams = JSONUtil.toBean(params, Map.class);
             // 上报PC实时信息
             InetAddress inetAddress = InetAddress.getLocalHost();
             NetworkIF networkIF = new NetworkIF();
@@ -89,15 +93,13 @@ public class ApqInfoApplication {
         } catch (Exception e) {
             log.error("采集数据异常", e);
         }
-            } else {
-                log.info("未获取到采集配置，数据上报频率");
-            }
-        } else {
-            log.info("未获取到采集配置，数据上报频率");
-        }
     }
 
     private boolean isNeedCollection(boolean isNoneEven, String key, Map<String, Integer> mapParams) {
-        return mapParams.containsKey(key) && (!isNoneEven || mapParams.get(key) != 30);
+        if (null != mapParams && mapParams.containsKey(key)) {
+            return (!isNoneEven || mapParams.get(key) != 30);
+        } else {
+            return isNoneEven;
+        }
     }
 }