diff --git a/root-cloud-event/pom.xml b/root-cloud-event/pom.xml
index e02fc93..753e3b4 100644
--- a/root-cloud-event/pom.xml
+++ b/root-cloud-event/pom.xml
@@ -55,4 +55,25 @@
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 8
+ 8
+
+
+
+
+
+
+
+ maven-releases
+ Nexus releases Repository
+ http://120.78.76.88:8081/repository/maven-snapshots/
+
+
+
diff --git a/root-cloud-mocker/pom.xml b/root-cloud-mocker/pom.xml
index 526eea1..984a9fb 100644
--- a/root-cloud-mocker/pom.xml
+++ b/root-cloud-mocker/pom.xml
@@ -41,6 +41,13 @@
hutool-all
5.8.4
+
+
+
+ mysql
+ mysql-connector-java
+ 8.0.29
+
@@ -57,4 +64,12 @@
+
+
+
+ maven-releases
+ Nexus releases Repository
+ http://120.78.76.88:8081/repository/maven-snapshots/
+
+
diff --git a/root-cloud-mocker/src/main/java/com/qniao/iot/rc/RootCloudIotDataEventSourceMocker.java b/root-cloud-mocker/src/main/java/com/qniao/iot/rc/RootCloudIotDataEventSourceMocker.java
index 8b7009d..ec75f56 100644
--- a/root-cloud-mocker/src/main/java/com/qniao/iot/rc/RootCloudIotDataEventSourceMocker.java
+++ b/root-cloud-mocker/src/main/java/com/qniao/iot/rc/RootCloudIotDataEventSourceMocker.java
@@ -1,6 +1,7 @@
package com.qniao.iot.rc;
import cn.hutool.core.util.RandomUtil;
+import cn.hutool.db.Db;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.clients.producer.ProducerRecord;
@@ -14,7 +15,7 @@ import java.util.Properties;
public class RootCloudIotDataEventSourceMocker {
// 延迟:毫秒
- public static final long DELAY = 3000;
+ public static final long DELAY = 1000;
public static void main(String[] args) throws Exception {
// 创建kafka配置属性
@@ -25,14 +26,14 @@ public class RootCloudIotDataEventSourceMocker {
String topic = "root_cloud_iot_report_data_event";
+ String sql = "select mac from qn_equipment_information where is_delete = 0";
// 设备标识
- List assetIdList = Arrays.asList("10000","20000","30000","40000","50000","60000");
+ List assetIdList = Db.use().query(sql, String.class);
// 电源状态(0断电 1有电)
- List pwrStaList = Arrays.asList(1);
+ List pwrStaList = Arrays.asList(0, 1);
// 设备工作状态(0停机 1工作 2待机)
List accStaList = Arrays.asList(0, 1, 2);
-
// 循环发送事件
while (true) {
@@ -66,7 +67,7 @@ public class RootCloudIotDataEventSourceMocker {
private static Properties createKafkaProperties() {
Properties kafkaProps = new Properties();
- kafkaProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "172.19.124.230:9092");
+ kafkaProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "8.135.8.221:9092");
kafkaProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getCanonicalName());
kafkaProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, ByteArraySerializer.class.getCanonicalName());
return kafkaProps;
diff --git a/root-cloud-mocker/src/main/resources/db.setting b/root-cloud-mocker/src/main/resources/db.setting
new file mode 100644
index 0000000..3e3aa65
--- /dev/null
+++ b/root-cloud-mocker/src/main/resources/db.setting
@@ -0,0 +1,26 @@
+## db.setting文件
+
+url = jdbc:mysql://rm-wz9it4fs5tk7n4tm1zo.mysql.rds.aliyuncs.com:3306/cloud_print_cloud_factory?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useTimezone=true&serverTimezone=GMT%2B8&useSSL=false
+user = qn_cloudprint
+pass = qncloudprint5682
+
+# 是否在日志中显示执行的SQL
+showSql = true
+
+# 是否格式化显示的SQL
+formatSql = false
+
+# 是否显示SQL参数
+showParams = true
+
+# 打印SQL的日志等级,默认debug,可以是info、warn、error
+sqlLevel = debug
+
+# 初始化时建立物理连接的个数
+initialSize = 0
+
+# 最大连接池数量
+maxActive = 20
+
+# 最小连接池数量
+minIdle = 0
\ No newline at end of file
diff --git a/root-cloud-statistics/dependency-reduced-pom.xml b/root-cloud-statistics/dependency-reduced-pom.xml
new file mode 100644
index 0000000..1569da1
--- /dev/null
+++ b/root-cloud-statistics/dependency-reduced-pom.xml
@@ -0,0 +1,96 @@
+
+
+
+ iot-root-cloud-model-hw-formatter
+ com.qniao
+ 0.0.1-SNAPSHOT
+
+ 4.0.0
+ root-cloud-statistics
+ root-cloud-statistics
+
+
+
+ maven-compiler-plugin
+ 3.1
+
+ ${target.java.version}
+ ${target.java.version}
+
+
+
+ maven-shade-plugin
+ 3.1.1
+
+
+ package
+
+ shade
+
+
+
+
+ org.apache.flink:flink-shaded-force-shading
+ com.google.code.findbugs:jsr305
+ org.slf4j:*
+ org.apache.logging.log4j:*
+
+
+
+
+ *:*
+
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+
+
+
+
+
+
+ com.qniao.iot.rc.RootCloudIotDataFormatterJob
+
+
+
+
+
+
+
+
+
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+ 2.17.2
+ runtime
+
+
+ org.apache.logging.log4j
+ log4j-api
+ 2.17.2
+ runtime
+
+
+ org.apache.logging.log4j
+ log4j-core
+ 2.17.2
+ runtime
+
+
+
+
+ maven-releases
+ Nexus releases Repository
+ http://120.78.76.88:8081/repository/maven-snapshots/
+
+
+
+ 1.8
+ 2.17.2
+ 1.15.0
+ ${target.java.version}
+ UTF-8
+ ${target.java.version}
+
+
diff --git a/root-cloud-statistics/pom.xml b/root-cloud-statistics/pom.xml
index 0ed5a42..440d130 100644
--- a/root-cloud-statistics/pom.xml
+++ b/root-cloud-statistics/pom.xml
@@ -20,7 +20,7 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
com.qniao
- java-dependency
+ iot-root-cloud-model-hw-formatter
0.0.1-SNAPSHOT
@@ -133,6 +133,7 @@ under the License.
cn.hutool
hutool-all
+ 5.8.4
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 67fa675..2f82878 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
@@ -18,7 +18,6 @@
package com.qniao.iot.rc;
-import com.ctrip.framework.apollo.ConfigService;
import com.qniao.iot.machine.event.MachineIotDataReceivedEvent;
import com.qniao.iot.rc.config.ApolloConfig;
import com.qniao.iot.rc.constant.ConfigConstant;
@@ -28,7 +27,6 @@ import com.qniao.iot.rc.event.RootCloudIotDataReceiptedEventDeserializationSchem
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.java.utils.ParameterTool;
import org.apache.flink.connector.base.DeliveryGuarantee;
import org.apache.flink.connector.kafka.sink.KafkaRecordSerializationSchema;
import org.apache.flink.connector.kafka.sink.KafkaSink;
@@ -67,7 +65,7 @@ public class RootCloudIotDataFormatterJob {
.setBootstrapServers(ApolloConfig.get(ConfigConstant.SOURCE_KAFKA_BOOTSTRAP_SERVERS))
.setTopics(ApolloConfig.get(ConfigConstant.SOURCE_KAFKA_TOPICS))
.setGroupId(ApolloConfig.get(ConfigConstant.SOURCE_KAFKA_GROUPID))
- .setStartingOffsets(OffsetsInitializer.latest())
+ .setStartingOffsets(OffsetsInitializer.earliest())
.setValueOnlyDeserializer(new RootCloudIotDataReceiptedEventDeserializationSchema())
.build();
@@ -90,7 +88,7 @@ public class RootCloudIotDataFormatterJob {
.build()
).name("MachineIotDataReceivedEvent Sink");
- env.execute("Kafka Job");
+ env.execute("root cloud iot data formatter job");
}