微调

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java

@@ -1,17 +1,13 @@
 package com.njcn.access.service.impl;
 
 import cn.hutool.core.util.IdUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.tocrhz.mqtt.publisher.MqttPublisher;
 import com.njcn.access.enums.AccessEnum;
 import com.njcn.access.enums.AccessResponseEnum;
 import com.njcn.access.enums.TypeEnum;
 import com.njcn.access.param.DevAccessParam;
-import com.njcn.access.param.WgDeviceRegisterParam;
-import com.njcn.access.param.WgRegisterParam;
 import com.njcn.access.pojo.dto.AccessDto;
 import com.njcn.access.pojo.dto.ReqAndResDto;
-import com.njcn.access.pojo.po.CsGateway;
 import com.njcn.access.service.ICsDeviceService;
 import com.njcn.access.service.ICsGatewayService;
 import com.njcn.access.utils.MqttUtil;
@@ -24,7 +20,6 @@ import com.njcn.csdevice.pojo.param.CsLedgerParam;
 import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
 import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
-import com.njcn.csdevice.pojo.po.MqttUser;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.DicDataFeignClient;
@@ -38,7 +33,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -61,8 +55,6 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
 
     private final DictTreeFeignClient dictTreeFeignClient;
 
-    private final DicDataFeignClient dicDataFeignClient;
-
     private final CsLedgerFeignClient csLedgerFeignClient;
 
     private final CsLineFeignClient csLineFeignClient;
@@ -73,8 +65,6 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
 
     private final CsDeviceUserFeignClient csDeviceUserFeignClient;
 
-    private final ICsGatewayService csGatewayService;
-
     private final MqttPublisher publisher;
 
     private final RedisUtil redisUtil;
@@ -112,16 +102,6 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         }
         String devModel = dictData.getCode();
         zhiLianRegister(nDid,devModel);
-        try {
-            Thread.sleep(1000);
-            //这边使用redis缓存来判断装置是否连接MQTT或者是否出现异常
-            if (Objects.isNull(redisUtil.getObjectByKey(nDid))){
-                logger.error("装置注册失败,请核查!");
-                throw new BusinessException(AccessResponseEnum.REGISTER_ERROR);
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
     }
 
     @Override