Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-10-10 f0837ee21f7650d4413830d4ee90da02bcdd6d36

 screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java

@@ -1,6 +1,10 @@
/*
package com.moral.api.kafka.consumer;

import com.alibaba.fastjson.JSON;
import com.moral.api.service.*;
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;
import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,13 +18,8 @@
import java.util.Iterator;
import java.util.Map;

import com.alibaba.fastjson.JSON;
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;

/*
 * 普通设备消费者
 * */

@Component
@Slf4j
public class DeviceConsumer {
@@ -36,9 +35,6 @@

    @Autowired
    private RedisTemplate redisTemplate;

    @Autowired
    private HistorySecondSpecialService historySecondSpecialService;

    @Autowired
    private HistorySecondCruiserService historySecondCruiserService;
@@ -61,7 +57,7 @@
            }

            //数据过滤
            data.remove("time");
//            data.remove("time");
            data.remove("entryTime");
            Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
            Map<String, Object> newMap = new HashMap<>();
@@ -100,8 +96,27 @@
            }

            //数据过滤
            data.remove("time");
//            data.remove("time");
            data.remove("entryTime");
            Map<String, Object> deviceByMac = deviceService.getDeviceByMac(mac.toString());
            HashMap<String, Object> map = (HashMap<String, Object>) deviceByMac.get("organization");
            String id = map.get("id").toString();
            if (id.equals("71")){
                log.warn(id, msg);
                ack.acknowledge();
                return;
            }
//            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//            String format = dateFormat.format(new Date().getTime());
//            //获取年份
//            String substring = format.substring(0, 4);
//
//            String substring1 = time.toString().substring(0, 4);
//
//            String replace = time.toString().replace(substring1, substring);
//
//            data.put("DataTime",replace);

            Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
            Map<String, Object> newMap = new HashMap<>();
            Map.Entry<String, Object> next;
@@ -126,7 +141,7 @@

    //秒数据，修改设备状态，缓存最新秒数据
    @KafkaListener(topics = KafkaConstants.TOPIC_SECOND, containerFactory = "stateListenerContainerFactory")
    public void listenSecond(ConsumerRecord<String, String> record) {
    public void listenSecond(ConsumerRecord<String, String> record, Acknowledgment ack) {
        String msg = record.value();
        try {
            Map<String, Object> data = JSON.parseObject(msg, Map.class);
@@ -141,13 +156,14 @@
            data.remove("entryTime");

            //数据校准
            data = deviceService.adjustDeviceData(data);
            data = deviceService.adjustDeviceData(data,"0");
            //存入redis
            data.put("DataTime", time);
            redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data);
            //判断并修改设备状态
            data.put("mac", mac);
            deviceService.judgeDeviceState(data);
            ack.acknowledge();
        } catch (Exception e) {
            log.error("param{}" + msg);
        }
@@ -157,7 +173,6 @@
    @KafkaListener(topics = KafkaConstants.UAV_TOPIC_SECOND, groupId = KafkaConstants.GROUP_INSERT, containerFactory = "insertListenerContainerFactory")
    public void listenSecondSpecial(ConsumerRecord<String, String> record, Acknowledgment ack) {
        String msg = record.value();
        System.out.println(msg);
        try {
            Map<String, Object> data = JSON.parseObject(msg, Map.class);
            Object mac = data.get("mac");
@@ -180,7 +195,7 @@
    }

    //走航车秒数据
    @KafkaListener(topics = KafkaConstants.CRUISER_TOPIC_SECOND, groupId = KafkaConstants.GROUP_INSERT, containerFactory = "insertListenerContainerFactory")
    @KafkaListener(topics = KafkaConstants.CRUISER_TOPIC_SECOND, containerFactory = "insertListenerContainerFactory")
    public void listenSecondCruiser(ConsumerRecord<String, String> record, Acknowledgment ack) {
        String msg = record.value();
        try {
@@ -200,7 +215,8 @@
            historySecondCruiserService.insertHistorySecond(data);
            ack.acknowledge();
        } catch (Exception e) {
            log.error("param{}" + msg);
            log.error("param{}" + e);
        }
    }
}
*/