From 364e110a9190e86b5e8cc8d5ea30da672ffbce2c Mon Sep 17 00:00:00 2001
From: "1049970895@qniao.cn" <1049970895>
Date: Thu, 18 Aug 2022 11:14:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/qniao/iot/IotMonitoringDataJob.java    | 13 -------------
 src/main/resources/META-INF/app.properties          |  2 +-
 src/test/java/Demo2.java                            |  6 +++---
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/qniao/iot/IotMonitoringDataJob.java b/src/main/java/com/qniao/iot/IotMonitoringDataJob.java
index 3228362..ec5dc96 100644
--- a/src/main/java/com/qniao/iot/IotMonitoringDataJob.java
+++ b/src/main/java/com/qniao/iot/IotMonitoringDataJob.java
@@ -1,9 +1,7 @@
 package com.qniao.iot;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.db.Db;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
@@ -43,7 +41,6 @@ import org.elasticsearch.client.*;
 import org.elasticsearch.client.indices.CreateIndexRequest;
 import org.elasticsearch.client.indices.CreateIndexResponse;
 import org.elasticsearch.client.indices.GetIndexRequest;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.rest.RestStatus;
@@ -51,10 +48,7 @@ import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.SortOrder;
-
-import java.io.IOException;
 import java.sql.Date;
-import java.sql.SQLException;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -79,13 +73,6 @@ public class IotMonitoringDataJob {
                 return requestConfigBuilder;
             }));
 
-    private final static String SQL = "select qmrs.machine_id, qmrs.iot_mac as machine_iot_mac, qmrs.status, qml.count_unit\n" +
-            "from qn_machine_realtime_state qmrs\n" +
-            "         LEFT JOIN (select example_id, count_unit from qn_machine_list where is_delete = 0) qml\n" +
-            "                   ON qmrs.iot_mac = qml.example_id\n" +
-            "where qmrs.iot_mac = ?\n" +
-            "  and qmrs.is_delete = 0";
-
     /**
      * 当前索引日期后缀
      */
diff --git a/src/main/resources/META-INF/app.properties b/src/main/resources/META-INF/app.properties
index f979514..d10864b 100644
--- a/src/main/resources/META-INF/app.properties
+++ b/src/main/resources/META-INF/app.properties
@@ -2,4 +2,4 @@ app.id=iot-device-monitoring-data
 
 # test 8.135.8.221
 # prod 47.112.164.224
-apollo.meta=http://8.135.8.221:5000
\ No newline at end of file
+apollo.meta=http://47.112.164.224:5000
\ No newline at end of file
diff --git a/src/test/java/Demo2.java b/src/test/java/Demo2.java
index 22243d9..e5fc9b8 100644
--- a/src/test/java/Demo2.java
+++ b/src/test/java/Demo2.java
@@ -22,8 +22,8 @@ public class Demo2 {
         System.out.println(reportDate);*/
 
 
-        Long a = 1660570366L;
-        System.out.println(StrUtil.toString(a).length());
-        System.out.println(a * 1000);
+        Long a = null;
+        long b = a;
+        System.out.println(b);
     }
 }