From 64cba3bb63c533f018bb890932fe43bae532bd6e Mon Sep 17 00:00:00 2001 From: "1049970895@qniao.cn" <1049970895> Date: Mon, 3 Jul 2023 08:57:23 +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 --- .../rc/RootCloudIotDataReceiptedEvent.java | 1 - .../iot/rc/CloudBoxEventSourceMocker.java | 6 --- .../iot/rc/RootCloudIotDataFormatterJob.java | 37 +++---------------- ...taReceiptedEventDeserializationSchema.java | 2 - .../src/test/java/com/qniao/iot/rc/Body.java | 1 - .../iot/rc/CloudBoxDataHistoryEvent.java | 2 - .../com/qniao/iot/rc/CloudBoxEventJob1.java | 4 +- .../com/qniao/iot/rc/EsRestClientService.java | 1 - .../test/java/com/qniao/iot/rc/TestDemo.java | 3 -- 9 files changed, 9 insertions(+), 48 deletions(-) diff --git a/root-cloud-event/src/main/java/com/qniao/iot/rc/RootCloudIotDataReceiptedEvent.java b/root-cloud-event/src/main/java/com/qniao/iot/rc/RootCloudIotDataReceiptedEvent.java index 504e0b1..a83eb23 100644 --- a/root-cloud-event/src/main/java/com/qniao/iot/rc/RootCloudIotDataReceiptedEvent.java +++ b/root-cloud-event/src/main/java/com/qniao/iot/rc/RootCloudIotDataReceiptedEvent.java @@ -1,7 +1,6 @@ package com.qniao.iot.rc; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/root-cloud-mocker/src/main/java/com/qniao/iot/rc/CloudBoxEventSourceMocker.java b/root-cloud-mocker/src/main/java/com/qniao/iot/rc/CloudBoxEventSourceMocker.java index f305896..d245234 100644 --- a/root-cloud-mocker/src/main/java/com/qniao/iot/rc/CloudBoxEventSourceMocker.java +++ b/root-cloud-mocker/src/main/java/com/qniao/iot/rc/CloudBoxEventSourceMocker.java @@ -1,22 +1,16 @@ package com.qniao.iot.rc; import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.db.Db; -import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.clients.producer.RecordMetadata; -import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.serialization.ByteArraySerializer; import org.apache.kafka.common.serialization.StringSerializer; import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.Arrays; -import java.util.List; import java.util.Properties; import java.util.concurrent.Future; diff --git a/root-cloud-statistics/src/main/java/com/qniao/iot/rc/RootCloudIotDataFormatterJob.java b/root-cloud-statistics/src/main/java/com/qniao/iot/rc/RootCloudIotDataFormatterJob.java index 4ec1f5d..aff767a 100644 --- a/root-cloud-statistics/src/main/java/com/qniao/iot/rc/RootCloudIotDataFormatterJob.java +++ b/root-cloud-statistics/src/main/java/com/qniao/iot/rc/RootCloudIotDataFormatterJob.java @@ -29,16 +29,10 @@ import com.qniao.iot.rc.event.MachineIotDataReceivedEventSerializationSchema; import com.qniao.iot.rc.event.RootCloudIotDataReceiptedEventDeserializationSchema; import com.qniao.iot.rc.until.SnowFlake; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.functions.MapFunction; -import org.apache.flink.api.common.functions.RichFilterFunction; import org.apache.flink.api.common.functions.RichMapFunction; import org.apache.flink.api.common.serialization.SimpleStringEncoder; -import org.apache.flink.api.common.state.ValueState; -import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.MemorySize; import org.apache.flink.connector.base.DeliveryGuarantee; import org.apache.flink.connector.kafka.sink.KafkaRecordSerializationSchema; @@ -48,42 +42,23 @@ import org.apache.flink.connector.kafka.source.enumerator.initializer.OffsetsIni import org.apache.flink.core.fs.Path; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.streaming.api.CheckpointingMode; -import org.apache.flink.streaming.api.datastream.DataStreamSource; import org.apache.flink.streaming.api.datastream.SingleOutputStreamOperator; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import org.apache.flink.streaming.api.functions.KeyedProcessFunction; import org.apache.flink.streaming.api.functions.sink.filesystem.BucketAssigner; import org.apache.flink.streaming.api.functions.sink.filesystem.OutputFileConfig; import org.apache.flink.streaming.api.functions.sink.filesystem.StreamingFileSink; import org.apache.flink.streaming.api.functions.sink.filesystem.bucketassigners.SimpleVersionedStringSerializer; import org.apache.flink.streaming.api.functions.sink.filesystem.rollingpolicies.DefaultRollingPolicy; -import org.apache.flink.util.Collector; -import org.apache.http.HttpHost; -import org.apache.http.auth.AuthScope; -import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.CredentialsProvider; -import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.consumer.OffsetResetStrategy; import org.apache.kafka.common.config.SaslConfigs; -import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.RestClient; -import org.elasticsearch.client.RestHighLevelClient; -import org.elasticsearch.client.indices.GetIndexRequest; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.rest.RestStatus; -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.math.BigDecimal; -import java.time.*; + +import java.time.Duration; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; -import java.util.*; +import java.util.Properties; /** * @author Lzk diff --git a/root-cloud-statistics/src/main/java/com/qniao/iot/rc/event/RootCloudIotDataReceiptedEventDeserializationSchema.java b/root-cloud-statistics/src/main/java/com/qniao/iot/rc/event/RootCloudIotDataReceiptedEventDeserializationSchema.java index 00a52ee..4ff025f 100644 --- a/root-cloud-statistics/src/main/java/com/qniao/iot/rc/event/RootCloudIotDataReceiptedEventDeserializationSchema.java +++ b/root-cloud-statistics/src/main/java/com/qniao/iot/rc/event/RootCloudIotDataReceiptedEventDeserializationSchema.java @@ -1,7 +1,5 @@ package com.qniao.iot.rc.event; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.util.ByteUtil; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; diff --git a/root-cloud-statistics/src/test/java/com/qniao/iot/rc/Body.java b/root-cloud-statistics/src/test/java/com/qniao/iot/rc/Body.java index d916d3f..287d939 100644 --- a/root-cloud-statistics/src/test/java/com/qniao/iot/rc/Body.java +++ b/root-cloud-statistics/src/test/java/com/qniao/iot/rc/Body.java @@ -2,7 +2,6 @@ package com.qniao.iot.rc; import lombok.Data; -import java.io.Serializable; import java.math.BigDecimal; @Data diff --git a/root-cloud-statistics/src/test/java/com/qniao/iot/rc/CloudBoxDataHistoryEvent.java b/root-cloud-statistics/src/test/java/com/qniao/iot/rc/CloudBoxDataHistoryEvent.java index 988c5a1..ea50423 100644 --- a/root-cloud-statistics/src/test/java/com/qniao/iot/rc/CloudBoxDataHistoryEvent.java +++ b/root-cloud-statistics/src/test/java/com/qniao/iot/rc/CloudBoxDataHistoryEvent.java @@ -1,10 +1,8 @@ package com.qniao.iot.rc; -import com.fasterxml.jackson.annotation.JsonAutoDetect; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; @Data public class CloudBoxDataHistoryEvent implements Serializable { diff --git a/root-cloud-statistics/src/test/java/com/qniao/iot/rc/CloudBoxEventJob1.java b/root-cloud-statistics/src/test/java/com/qniao/iot/rc/CloudBoxEventJob1.java index be6b9d1..acc9454 100644 --- a/root-cloud-statistics/src/test/java/com/qniao/iot/rc/CloudBoxEventJob1.java +++ b/root-cloud-statistics/src/test/java/com/qniao/iot/rc/CloudBoxEventJob1.java @@ -9,7 +9,9 @@ import java.sql.PreparedStatement; import java.sql.Timestamp; import java.util.List; import java.util.Map; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; public class CloudBoxEventJob1 { diff --git a/root-cloud-statistics/src/test/java/com/qniao/iot/rc/EsRestClientService.java b/root-cloud-statistics/src/test/java/com/qniao/iot/rc/EsRestClientService.java index 773fbe1..2bf0df5 100644 --- a/root-cloud-statistics/src/test/java/com/qniao/iot/rc/EsRestClientService.java +++ b/root-cloud-statistics/src/test/java/com/qniao/iot/rc/EsRestClientService.java @@ -18,7 +18,6 @@ import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.sort.SortOrder; - import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/root-cloud-statistics/src/test/java/com/qniao/iot/rc/TestDemo.java b/root-cloud-statistics/src/test/java/com/qniao/iot/rc/TestDemo.java index aff9165..f7268c1 100644 --- a/root-cloud-statistics/src/test/java/com/qniao/iot/rc/TestDemo.java +++ b/root-cloud-statistics/src/test/java/com/qniao/iot/rc/TestDemo.java @@ -1,10 +1,7 @@ package com.qniao.iot.rc; -import cn.hutool.core.lang.UUID; import cn.hutool.core.util.RandomUtil; -import java.time.Duration; - public class TestDemo { public static void main(String[] args) {