|
|
@@ -2,17 +2,13 @@ package com.usky.cdi.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-<<<<<<< Updated upstream
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.usky.cdi.domain.DmpDevice;
|
|
|
import com.usky.cdi.domain.DmpProduct;
|
|
|
import com.usky.cdi.mapper.DmpDeviceMapper;
|
|
|
import com.usky.cdi.mapper.DmpProductMapper;
|
|
|
-import com.usky.cdi.service.config.mqtt.MqttGateway;
|
|
|
-=======
|
|
|
//import com.usky.cdi.service.config.mqtt.MqttGateway;
|
|
|
import com.usky.cdi.service.config.mqtt.MqttOutConfig;
|
|
|
->>>>>>> Stashed changes
|
|
|
import com.usky.cdi.service.enums.EnvMonitorMqttTopic;
|
|
|
import com.usky.cdi.service.util.DeviceDataQuery;
|
|
|
import com.usky.cdi.service.util.SnowflakeIdGenerator;
|
|
|
@@ -24,12 +20,9 @@ import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-<<<<<<< Updated upstream
|
|
|
import javax.annotation.PostConstruct;
|
|
|
|
|
|
-=======
|
|
|
import javax.annotation.Resource;
|
|
|
->>>>>>> Stashed changes
|
|
|
import java.time.Instant;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.ZoneId;
|
