From 5367cf982379f91f81a9b8328f07714dbbf3045c Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 10 四月 2025 21:17:00 +0800
Subject: [PATCH] 完善test的配置
---
collect/src/main/java/com/qianwen/mdc/collect/handler/AlarmDataHandler.java | 6 +++
collect/src/main/resources/application-test.yml | 59 +++++++++++++++++++++++++++++
collect/src/main/resources/logback.xml | 2
3 files changed, 66 insertions(+), 1 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/handler/AlarmDataHandler.java b/collect/src/main/java/com/qianwen/mdc/collect/handler/AlarmDataHandler.java
index de40a7b..e0787bb 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/handler/AlarmDataHandler.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/handler/AlarmDataHandler.java
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.slf4j.Logger;
@@ -14,6 +15,8 @@
import com.qianwen.mdc.collect.dto.PackedTelemetryData;
import com.qianwen.mdc.collect.entity.iotdb.Alarm;
import com.qianwen.mdc.collect.service.AlarmService;
+
+import cn.hutool.core.util.ObjectUtil;
@Component
public class AlarmDataHandler implements TelemetryDataHandler {
@@ -31,6 +34,9 @@
}
List<Alarm> parseAlarm(PackedTelemetryData data){
+ if(ObjectUtil.isEmpty(data.getValue())) {
+ return Collections.emptyList();
+ }
List<Alarm> alarmList = new ArrayList<>();
//828d json鏁扮粍鏍煎紡[{"alarmNo":"8084"}]
JSONArray alarmArr = JSONArray.parseArray(data.getValue());
diff --git a/collect/src/main/resources/application-test.yml b/collect/src/main/resources/application-test.yml
new file mode 100644
index 0000000..7d98b7c
--- /dev/null
+++ b/collect/src/main/resources/application-test.yml
@@ -0,0 +1,59 @@
+spring:
+ redis:
+ database: 5 #5
+ host: 120.46.212.231
+ port: 6379
+ password: root
+ timeout: 3000
+ thymeleaf:
+ cache: false
+
+#MQTT-鏈嶅姟绔湴鍧�
+
+mqtt:
+ host: tcp://broker.emqx.io:1883
+ #username=admin #MQTT-鏈嶅姟绔敤鎴峰悕
+ #password=public #MQTT-鏈嶅姟绔瘑鐮�
+ cleansession: false #MQTT-鏄惁娓呯悊session
+ #MQTT-褰撳墠瀹㈡埛绔殑鍞竴鏍囪瘑
+ clientid: mqtt_publish
+ default_topic: TEST #褰撳墠瀹㈡埛绔殑榛樿涓婚(澶у鏁版椂鍊欐病浠�涔堢敤)
+ #杩炴帴瓒呮椂鏃堕棿
+ timeout: 3000
+ #蹇冭烦鏃堕棿
+ keepalive: 10
+ connectionTimeout: 3000 #杩炴帴瓒呮椂鏃堕棿
+ dataReceiveTopic: forward/testxx #浠巌ot骞冲彴鎺ユ敹mqtt閲囬泦鏁版嵁鐨則opic forward/test
+ # mysql
+datasource:
+ type: mysql
+ url: jdbc:mysql://120.46.212.231:3306/smartman?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+ port: 3306
+ username: qwmdc
+ password: Kknd_1234
+ driver-class-name: com.mysql.cj.jdbc.Driver
+#iotdb 浠ュ強鍏秊dbc涓�璧烽厤缃�
+iotdb:
+ driver: org.apache.iotdb.jdbc.IoTDBDriver
+ host: 120.46.212.231 #120.46.212.231 localhost 116.63.148.72
+ port: 6667
+ maxSize: 100
+ username: root
+ password: root
+
+xxl:
+ job:
+ admin:
+ ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
+ addresses: http://127.0.0.1:8080/xxl-job-admin
+ ### xxl-job executor address
+ executor:
+ appname: qwmdc-collect
+ ip:
+ port: 8802
+ ### xxl-job log path
+ logpath: /qwlogs/xxl-job/jobhandler
+ ### xxl-job log remain days
+ logretentiondays: 7
+ ### xxl-job, access token
+ accessToken:
\ No newline at end of file
diff --git a/collect/src/main/resources/logback.xml b/collect/src/main/resources/logback.xml
index 939d369..8c9a6d1 100644
--- a/collect/src/main/resources/logback.xml
+++ b/collect/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<!--瀹氫箟鏃ュ織鏂囦欢鐨勫瓨鍌ㄥ湴鍧� 鍕垮湪 LogBack 鐨勯厤缃腑浣跨敤鐩稿璺緞-->
- <property name="LOG_HOME" value="/var/log" />
+ <property name="LOG_HOME" value="/var/collect/logs" />
<!-- 鎺у埗鍙拌緭鍑� -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
--
Gitblit v1.9.3