chore:dev部分环境变化

cjl

2023-08-09 0730075ce71bd7aaedf6b6f43880a434fce7f1b8

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

@@ -18,9 +18,8 @@
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,7 +96,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<>();
@@ -126,7 +122,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 +137,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 +154,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 +176,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 +196,7 @@
            historySecondCruiserService.insertHistorySecond(data);
            ack.acknowledge();
        } catch (Exception e) {
            log.error("param{}" + msg);
            log.error("param{}" + e);
        }
    }
}