#update
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
package com.maibu.controller;
|
||||
|
||||
import com.fastbee.common.core.domain.AjaxResult;
|
||||
import com.fastbee.common.utils.json.JsonUtils;
|
||||
import com.fastbee.dto.IoTDACommandDTO;
|
||||
import com.fastbee.dto.IoTDARuleDTO;
|
||||
import com.fastbee.service.IoTDADeviceService;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.dto.IoTDACommandDTO;
|
||||
import com.maibu.dto.IoTDARuleDTO;
|
||||
import com.maibu.service.IoTDADeviceService;
|
||||
import com.maibu.utils.json.JsonUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
|
||||
@@ -3,12 +3,12 @@ package com.maibu.init;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.fastbee.entity.IoTDADeviceSecret;
|
||||
import com.fastbee.mapper.IoTDADeviceSecretMapper;
|
||||
import com.fastbee.memory.IotGlobalMemory;
|
||||
import com.fastbee.utils.IoTDAAMQClient;
|
||||
import com.fastbee.utils.IoTDAMqttClient;
|
||||
import com.huaweicloud.sdk.iotda.v5.model.QueryDeviceSimplify;
|
||||
import com.maibu.entity.IoTDADeviceSecret;
|
||||
import com.maibu.mapper.IoTDADeviceSecretMapper;
|
||||
import com.maibu.memory.IotGlobalMemory;
|
||||
import com.maibu.utils.IoTDAAMQClient;
|
||||
import com.maibu.utils.IoTDAMqttClient;
|
||||
import io.vertx.core.Vertx;
|
||||
import io.vertx.core.VertxOptions;
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.maibu.mapper;
|
||||
|
||||
import com.fastbee.entity.IoTDADeviceSecret;
|
||||
import com.fastbee.framework.mybatis.mapper.BaseMapperX;
|
||||
import com.maibu.entity.IoTDADeviceSecret;
|
||||
import com.maibu.mybatis.mapper.BaseMapperX;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.maibu.memory;
|
||||
|
||||
|
||||
import com.fastbee.utils.IoTDAAMQClient;
|
||||
import com.fastbee.utils.IoTDAMqttClient;
|
||||
import com.maibu.utils.IoTDAAMQClient;
|
||||
import com.maibu.utils.IoTDAMqttClient;
|
||||
import io.vertx.core.Vertx;
|
||||
import lombok.Data;
|
||||
import org.slf4j.Logger;
|
||||
@@ -23,7 +23,7 @@ public class IotGlobalMemory {
|
||||
*/
|
||||
public static Vertx vertx;
|
||||
|
||||
public static Map<String,IoTDAMqttClient> ioTDAMqttClientMap = new ConcurrentHashMap<>();
|
||||
public static Map<String, IoTDAMqttClient> ioTDAMqttClientMap = new ConcurrentHashMap<>();
|
||||
|
||||
public static IoTDAAMQClient ioTDAAMQClient;
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@ package com.maibu.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.fastbee.dto.IoTDACommandDTO;
|
||||
import com.fastbee.dto.IoTDARuleDTO;
|
||||
import com.fastbee.entity.IoTDADeviceSecret;
|
||||
import com.fastbee.mapper.IoTDADeviceSecretMapper;
|
||||
import com.fastbee.memory.IotGlobalMemory;
|
||||
import com.fastbee.utils.IoTDAMqttClient;
|
||||
import com.huaweicloud.sdk.iotda.v5.model.*;
|
||||
import com.maibu.dto.IoTDACommandDTO;
|
||||
import com.maibu.dto.IoTDARuleDTO;
|
||||
import com.maibu.entity.IoTDADeviceSecret;
|
||||
import com.maibu.mapper.IoTDADeviceSecretMapper;
|
||||
import com.maibu.memory.IotGlobalMemory;
|
||||
import com.maibu.utils.IoTDAMqttClient;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.maibu.utils;
|
||||
|
||||
import com.fastbee.common.utils.json.JsonUtils;
|
||||
import com.huaweicloud.sdk.core.auth.BasicCredentials;
|
||||
import com.huaweicloud.sdk.core.auth.ICredential;
|
||||
import com.huaweicloud.sdk.core.exception.ConnectionException;
|
||||
@@ -9,6 +8,7 @@ import com.huaweicloud.sdk.core.exception.ServiceResponseException;
|
||||
import com.huaweicloud.sdk.core.region.Region;
|
||||
import com.huaweicloud.sdk.iotda.v5.*;
|
||||
import com.huaweicloud.sdk.iotda.v5.model.*;
|
||||
import com.maibu.utils.json.JsonUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
package com.maibu.utils;
|
||||
|
||||
import com.fastbee.common.NettyCacheKey;
|
||||
import com.fastbee.common.core.redis.RedisCache;
|
||||
import com.fastbee.common.utils.spring.SpringUtils;
|
||||
import com.fastbee.dto.NettyDevice;
|
||||
import com.fastbee.iot.domain.DeviceRunningStatusHistory;
|
||||
import com.fastbee.iot.domain.DeviceStatusRecordDTO;
|
||||
import com.fastbee.manager.DeviceSessionManager;
|
||||
import com.huaweicloud.sdk.iot.device.IoTDevice;
|
||||
import com.huaweicloud.sdk.iot.device.client.listener.CommandListener;
|
||||
import com.huaweicloud.sdk.iot.device.client.requests.CommandRsp;
|
||||
import com.huaweicloud.sdk.iot.device.client.requests.DeviceMessage;
|
||||
import com.huaweicloud.sdk.iot.device.client.requests.ServiceProperty;
|
||||
import com.huaweicloud.sdk.iot.device.transport.ActionListener;
|
||||
import com.maibu.common.NettyCacheKey;
|
||||
import com.maibu.core.redis.RedisCache;
|
||||
import com.maibu.domain.DeviceRunningStatusHistory;
|
||||
import com.maibu.domain.DeviceStatusRecordDTO;
|
||||
import com.maibu.dto.NettyDevice;
|
||||
import com.maibu.manager.DeviceSessionManager;
|
||||
import com.maibu.utils.spring.SpringUtils;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
Reference in New Issue
Block a user