1

src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.ucenter.service.impl;
 
+import com.amazonaws.services.simpleworkflow.flow.annotations.NoWait;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -77,6 +78,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     IIncrementTypeService incrementTypeService;
     @Autowired
     ICameraTypeService cameraTypeService;
+    @Autowired
+    IInnerService innerService;
 
     @Override
     public Camera getBySnCode(String snCode) {
@@ -290,15 +293,27 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         if(user == null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3015,LoginConstant.FAILURE_MSG_3015);
         }
+
+
         String[] snCodeArr = snCodes.split(",");
         List<Long> cameraIds = new ArrayList<>();
         for (String wifiName : snCodeArr) {
-            Camera camera = null;
+            String snCode = null;
             if(wifiName.contains("_")){
-                camera = this.getByWfiName(wifiName);
+                snCode = wifiName.split("_")[1];
             }else {
-                camera = this.getBySnCode(wifiName);
+                snCode = wifiName;
             }
+            CameraInStoreParam param = new CameraInStoreParam();
+            param.setCameraType(cameraType);
+            param.setSnCode(snCode);
+            Camera camera = innerService.cameraInStore(param);
+//            Camera camera = null;
+//            if(wifiName.contains("_")){
+//                camera = this.getByWfiName(wifiName);
+//            }else {
+//                camera = this.getBySnCode(wifiName);
+//            }
 
             if(camera == null){
                 throw new BusinessException(AppConstant.FAILURE_CODE_4010, wifiName +"-"+ AppConstant.FAILURE_MSG_4010);