旧版相机入库数据兼容

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -2,9 +2,7 @@ package com.fdkankan.contro.mq.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.ZipUtil;
 import cn.hutool.extra.qrcode.QrCodeUtil;
 import cn.hutool.extra.qrcode.QrConfig;
 import cn.hutool.http.ContentType;
@@ -12,7 +10,6 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.*;
 import com.fdkankan.common.util.FileUtils;
@@ -39,7 +36,6 @@ import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHeaders;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -49,10 +45,8 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.Map.Entry;
-import java.util.stream.Collectors;
 
 
 /**

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -254,11 +254,13 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
         Camera camera = cameraService.getBySnCode(mac);
         if(Objects.isNull(camera)){
-            cameraService.getOne(new LambdaQueryWrapper<Camera>()
+            camera = cameraService.getOne(new LambdaQueryWrapper<Camera>()
                     .like(Camera::getChildName, mac)
                     .or().like(Camera::getSnCode, mac)
                     .or().like(Camera::getWifiName, mac));
-            throw new BusinessException(ErrorCode.FAILURE_CODE_7010);
+            if(Objects.isNull(camera)){
+                throw new BusinessException(ErrorCode.FAILURE_CODE_7010);
+            }
         }
         CameraDetail cameraDetail = cameraDetailService.getByCameraId(camera.getId());
         if(Objects.isNull(cameraDetail)){