diff --git a/pom.xml b/pom.xml
index 6d8a31d..21ec64a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,7 @@
UTF-8
UTF-8
1.8
+ 2.4.0-hw-ei-312005
@@ -25,12 +26,6 @@
org.springframework.boot
- spring-boot-starter-tomcat
- 2.4.5
-
-
-
- org.springframework.boot
spring-boot-starter-web
2.4.5
@@ -56,18 +51,6 @@
- org.apache.httpcomponents
- httpclient
- 4.5.9
-
-
-
- org.apache.httpcomponents
- httpcore
- 4.4.8
-
-
-
org.apache.commons
commons-lang3
3.1
@@ -79,11 +62,6 @@
2.3.0
-
- org.postgresql
- postgresql
- 42.2.19
-
org.projectlombok
@@ -105,19 +83,11 @@
- redis.clients
- jedis
- 3.1.0
- jar
-
-
-
org.springframework.data
spring-data-redis
2.4.8
-
com.oracle.database.jdbc
ojdbc6
@@ -130,8 +100,71 @@
1.0.0
+
+ org.apache.kafka
+ kafka-clients
+ ${kafka.version}
+
+
+ xml-apis
+ xml-apis
+
+
+
+
+
+ xml-apis
+ xml-apis
+ 1.4.01
+
+
+
+ org.apache.kafka
+ kafka-streams
+ ${kafka.version}
+
+
+
+ org.apache.kafka
+ kafka-clients
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.apache.kafka
+ connect-json
+
+
+
+
+
+
+ bigdata
+ http://wlg1.artifactory.cd-cloud-artifact.tools.huawei.com/artifactory/cbu-maven-public/
+
+
+ huaweicloudsdk
+ https://mirrors.huaweicloud.com/repository/maven/huaweicloudsdk/
+
+ true
+
+
+ true
+
+
+
+
+ central
+ Maven Central
+ https://repo1.maven.org/maven2/
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 6d8a31d..21ec64a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,7 @@
UTF-8
UTF-8
1.8
+ 2.4.0-hw-ei-312005
@@ -25,12 +26,6 @@
org.springframework.boot
- spring-boot-starter-tomcat
- 2.4.5
-
-
-
- org.springframework.boot
spring-boot-starter-web
2.4.5
@@ -56,18 +51,6 @@
- org.apache.httpcomponents
- httpclient
- 4.5.9
-
-
-
- org.apache.httpcomponents
- httpcore
- 4.4.8
-
-
-
org.apache.commons
commons-lang3
3.1
@@ -79,11 +62,6 @@
2.3.0
-
- org.postgresql
- postgresql
- 42.2.19
-
org.projectlombok
@@ -105,19 +83,11 @@
- redis.clients
- jedis
- 3.1.0
- jar
-
-
-
org.springframework.data
spring-data-redis
2.4.8
-
com.oracle.database.jdbc
ojdbc6
@@ -130,8 +100,71 @@
1.0.0
+
+ org.apache.kafka
+ kafka-clients
+ ${kafka.version}
+
+
+ xml-apis
+ xml-apis
+
+
+
+
+
+ xml-apis
+ xml-apis
+ 1.4.01
+
+
+
+ org.apache.kafka
+ kafka-streams
+ ${kafka.version}
+
+
+
+ org.apache.kafka
+ kafka-clients
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.apache.kafka
+ connect-json
+
+
+
+
+
+
+ bigdata
+ http://wlg1.artifactory.cd-cloud-artifact.tools.huawei.com/artifactory/cbu-maven-public/
+
+
+ huaweicloudsdk
+ https://mirrors.huaweicloud.com/repository/maven/huaweicloudsdk/
+
+ true
+
+
+ true
+
+
+
+
+ central
+ Maven Central
+ https://repo1.maven.org/maven2/
+
+
+
+
diff --git a/src/main/java/com/casic/config/KafkaTopicConfig.java b/src/main/java/com/casic/config/KafkaTopicConfig.java
new file mode 100644
index 0000000..293f173
--- /dev/null
+++ b/src/main/java/com/casic/config/KafkaTopicConfig.java
@@ -0,0 +1,19 @@
+package com.casic.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Configuration
+public class KafkaTopicConfig {
+
+ @Value("${casic.data.topic}")
+ private String kafkaSendTopic;
+
+ @Value("${casic.alarm.topic}")
+ private String kafkaAlarmSendTopic;
+
+ @Value("${casic.data.kafka-Kerb-Url}")
+ private String kafkaKerbUrl;
+}
diff --git a/pom.xml b/pom.xml
index 6d8a31d..21ec64a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,7 @@
UTF-8
UTF-8
1.8
+ 2.4.0-hw-ei-312005
@@ -25,12 +26,6 @@
org.springframework.boot
- spring-boot-starter-tomcat
- 2.4.5
-
-
-
- org.springframework.boot
spring-boot-starter-web
2.4.5
@@ -56,18 +51,6 @@
- org.apache.httpcomponents
- httpclient
- 4.5.9
-
-
-
- org.apache.httpcomponents
- httpcore
- 4.4.8
-
-
-
org.apache.commons
commons-lang3
3.1
@@ -79,11 +62,6 @@
2.3.0
-
- org.postgresql
- postgresql
- 42.2.19
-
org.projectlombok
@@ -105,19 +83,11 @@
- redis.clients
- jedis
- 3.1.0
- jar
-
-
-
org.springframework.data
spring-data-redis
2.4.8
-
com.oracle.database.jdbc
ojdbc6
@@ -130,8 +100,71 @@
1.0.0
+
+ org.apache.kafka
+ kafka-clients
+ ${kafka.version}
+
+
+ xml-apis
+ xml-apis
+
+
+
+
+
+ xml-apis
+ xml-apis
+ 1.4.01
+
+
+
+ org.apache.kafka
+ kafka-streams
+ ${kafka.version}
+
+
+
+ org.apache.kafka
+ kafka-clients
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.apache.kafka
+ connect-json
+
+
+
+
+
+
+ bigdata
+ http://wlg1.artifactory.cd-cloud-artifact.tools.huawei.com/artifactory/cbu-maven-public/
+
+
+ huaweicloudsdk
+ https://mirrors.huaweicloud.com/repository/maven/huaweicloudsdk/
+
+ true
+
+
+ true
+
+
+
+
+ central
+ Maven Central
+ https://repo1.maven.org/maven2/
+
+
+
+
diff --git a/src/main/java/com/casic/config/KafkaTopicConfig.java b/src/main/java/com/casic/config/KafkaTopicConfig.java
new file mode 100644
index 0000000..293f173
--- /dev/null
+++ b/src/main/java/com/casic/config/KafkaTopicConfig.java
@@ -0,0 +1,19 @@
+package com.casic.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Configuration
+public class KafkaTopicConfig {
+
+ @Value("${casic.data.topic}")
+ private String kafkaSendTopic;
+
+ @Value("${casic.alarm.topic}")
+ private String kafkaAlarmSendTopic;
+
+ @Value("${casic.data.kafka-Kerb-Url}")
+ private String kafkaKerbUrl;
+}
diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java
index d126324..cb66285 100644
--- a/src/main/java/com/casic/config/task/TaskConfigurer.java
+++ b/src/main/java/com/casic/config/task/TaskConfigurer.java
@@ -22,10 +22,10 @@
@Override
public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
- TriggerTask triggrtTask = new TriggerTask(wellLocalData(),
- triggerContext -> new CronTrigger(timeConfig.getWellLocalTime()).nextExecutionTime(triggerContext));
- taskRegistrar.addTriggerTask(triggrtTask);
- triggrtTask = new TriggerTask(wellCoverData(),
+// TriggerTask triggrtTask = new TriggerTask(wellLocalData(),
+// triggerContext -> new CronTrigger(timeConfig.getWellLocalTime()).nextExecutionTime(triggerContext));
+// taskRegistrar.addTriggerTask(triggrtTask);
+ TriggerTask triggrtTask = new TriggerTask(wellCoverData(),
triggerContext -> new CronTrigger(timeConfig.getWellCoverTime()).nextExecutionTime(triggerContext));
taskRegistrar.addTriggerTask(triggrtTask);
triggrtTask = new TriggerTask(liquidData(),
diff --git a/pom.xml b/pom.xml
index 6d8a31d..21ec64a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,7 @@
UTF-8
UTF-8
1.8
+ 2.4.0-hw-ei-312005
@@ -25,12 +26,6 @@
org.springframework.boot
- spring-boot-starter-tomcat
- 2.4.5
-
-
-
- org.springframework.boot
spring-boot-starter-web
2.4.5
@@ -56,18 +51,6 @@
- org.apache.httpcomponents
- httpclient
- 4.5.9
-
-
-
- org.apache.httpcomponents
- httpcore
- 4.4.8
-
-
-
org.apache.commons
commons-lang3
3.1
@@ -79,11 +62,6 @@
2.3.0
-
- org.postgresql
- postgresql
- 42.2.19
-
org.projectlombok
@@ -105,19 +83,11 @@
- redis.clients
- jedis
- 3.1.0
- jar
-
-
-
org.springframework.data
spring-data-redis
2.4.8
-
com.oracle.database.jdbc
ojdbc6
@@ -130,8 +100,71 @@
1.0.0
+
+ org.apache.kafka
+ kafka-clients
+ ${kafka.version}
+
+
+ xml-apis
+ xml-apis
+
+
+
+
+
+ xml-apis
+ xml-apis
+ 1.4.01
+
+
+
+ org.apache.kafka
+ kafka-streams
+ ${kafka.version}
+
+
+
+ org.apache.kafka
+ kafka-clients
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.apache.kafka
+ connect-json
+
+
+
+
+
+
+ bigdata
+ http://wlg1.artifactory.cd-cloud-artifact.tools.huawei.com/artifactory/cbu-maven-public/
+
+
+ huaweicloudsdk
+ https://mirrors.huaweicloud.com/repository/maven/huaweicloudsdk/
+
+ true
+
+
+ true
+
+
+
+
+ central
+ Maven Central
+ https://repo1.maven.org/maven2/
+
+
+
+
diff --git a/src/main/java/com/casic/config/KafkaTopicConfig.java b/src/main/java/com/casic/config/KafkaTopicConfig.java
new file mode 100644
index 0000000..293f173
--- /dev/null
+++ b/src/main/java/com/casic/config/KafkaTopicConfig.java
@@ -0,0 +1,19 @@
+package com.casic.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Configuration
+public class KafkaTopicConfig {
+
+ @Value("${casic.data.topic}")
+ private String kafkaSendTopic;
+
+ @Value("${casic.alarm.topic}")
+ private String kafkaAlarmSendTopic;
+
+ @Value("${casic.data.kafka-Kerb-Url}")
+ private String kafkaKerbUrl;
+}
diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java
index d126324..cb66285 100644
--- a/src/main/java/com/casic/config/task/TaskConfigurer.java
+++ b/src/main/java/com/casic/config/task/TaskConfigurer.java
@@ -22,10 +22,10 @@
@Override
public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
- TriggerTask triggrtTask = new TriggerTask(wellLocalData(),
- triggerContext -> new CronTrigger(timeConfig.getWellLocalTime()).nextExecutionTime(triggerContext));
- taskRegistrar.addTriggerTask(triggrtTask);
- triggrtTask = new TriggerTask(wellCoverData(),
+// TriggerTask triggrtTask = new TriggerTask(wellLocalData(),
+// triggerContext -> new CronTrigger(timeConfig.getWellLocalTime()).nextExecutionTime(triggerContext));
+// taskRegistrar.addTriggerTask(triggrtTask);
+ TriggerTask triggrtTask = new TriggerTask(wellCoverData(),
triggerContext -> new CronTrigger(timeConfig.getWellCoverTime()).nextExecutionTime(triggerContext));
taskRegistrar.addTriggerTask(triggrtTask);
triggrtTask = new TriggerTask(liquidData(),
diff --git a/src/main/java/com/casic/dao/DayDataDao.java b/src/main/java/com/casic/dao/DayDataDao.java
index 11b5eaf..2674497 100644
--- a/src/main/java/com/casic/dao/DayDataDao.java
+++ b/src/main/java/com/casic/dao/DayDataDao.java
@@ -11,11 +11,16 @@
@Mapper
public interface DayDataDao {
- List