kaiyu
2021-09-02 2f701e2189b7cf22b3dd720b02952650ebed1919
screen-api
修改logback
1 files added
3 files modified
23 ■■■■ changed files
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java 3 ●●●●● patch | view | raw | blame | history
screen-api/src/main/resources/application-dev.yml 4 ●●●● patch | view | raw | blame | history
screen-api/src/main/resources/logback-spring.xml 2 ●●● patch | view | raw | blame | history
screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml 14 ●●●●● patch | view | raw | blame | history
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) {
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:
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}"/>
screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
New file
@@ -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>