From 2f701e2189b7cf22b3dd720b02952650ebed1919 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 02 Sep 2021 10:24:01 +0800
Subject: [PATCH] screen-api 修改logback
---
screen-api/src/main/resources/application-dev.yml | 4 ++--
screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml | 14 ++++++++++++++
screen-api/src/main/resources/logback-spring.xml | 2 +-
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 3 +++
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java b/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
index aa5bcc7..feee1cb 100644
--- a/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
@@ -7,6 +7,7 @@
import com.moral.api.websocket.SingleDeviceServer;
import com.moral.util.UnitConvertUtils;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.common.TopicPartition;
@@ -31,12 +32,14 @@
* @Version TODO
**/
@Component
+@Slf4j
public class SecondDataConsumer implements ConsumerSeekAware {
@KafkaListener(containerFactory = "secondDataListenerFactory",topics = "second_data")
public void listen(ConsumerRecord<String, String> record, Consumer consumer) throws Exception {
String messageStr = record.value();
Map<String, Object> message = (Map<String, Object>) JSON.parse(messageStr);
+ log.info(message.toString());
//long serverStartTime = System.currentTimeMillis();
CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets;
for (SingleDeviceServer socket : sockets) {
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index 1b9f8ad..e299b0c 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -106,8 +106,8 @@
retries: 0
servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
groupId:
- second-data: SecondsDataGroup
- cruiser-data: cruiserDataGroup
+ second-data: Dev_SecondsDataGroup
+ cruiser-data: Dev_CruiserDataGroup
mvc:
interceptor:
exclude:
diff --git a/screen-api/src/main/resources/logback-spring.xml b/screen-api/src/main/resources/logback-spring.xml
index efd0d87..d6e4dac 100644
--- a/screen-api/src/main/resources/logback-spring.xml
+++ b/screen-api/src/main/resources/logback-spring.xml
@@ -4,7 +4,7 @@
<springProperty scope="context" name="springAppName" source="spring.application.name"/>
<!-- ��������������������������������� -->
- <property name="LOG_FILE" value="home/moral/soft/log/${springAppName}"/>
+ <property name="LOG_FILE" value="/home/moral/soft/log/${springAppName}"/>
<!-- ������������������������������ -->
<property name="CONSOLE_LOG_PATTERN"
value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}) [%X{logseq}]{faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr([${springAppName}]){yellow} %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
diff --git a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
new file mode 100644
index 0000000..c237c8e
--- /dev/null
+++ b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.moral.api.mapper.HistorySecondUavMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.HistorySecondUav">
+ <result column="mac" property="mac" />
+ <result column="time" property="time" />
+ <result column="value" property="value" />
+ <result column="organization_id" property="organizationId" />
+ <result column="batch" property="batch" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0