1

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -374,26 +374,24 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(cameraDetail == null){
             throw new BusinessException(ResultCode.CAMERA_SN_NOT_EXIST);
         }
+        Integer successNum = 1;
         HashSet<Long> cameraIds = new HashSet<>();
         if(StringUtils.isNotBlank(param.getNum())){
             moveScene(param.getNum(),camera,cameraDetail,cameraIds);
-            for (Long cameraId : cameraIds) {
-                this.lockOrUnLockBySpace(cameraId);
-            }
-            return 1;
-        }
-        Integer successNum = param.getNumList().size();
-        for (String num : param.getNumList()) {
-            try {
-                moveScene(num,camera,cameraDetail,cameraIds);
-                for (Long cameraId : cameraIds) {
-                    this.lockOrUnLockBySpace(cameraId);
+        }else {
+            successNum = param.getNumList().size();
+            for (String num : param.getNumList()) {
+                try {
+                    moveScene(num,camera,cameraDetail,cameraIds);
+                }catch (Exception e){
+                    successNum --;
+                    log.info("move-scene-error:num:{},errorNum:{},error:{}",num,successNum,e.getMessage());
                 }
-            }catch (Exception e){
-                successNum --;
-                log.info("move-scene-error:num:{},errorNum:{},error:{}",num,successNum,e.getMessage());
             }
         }
+        for (Long cameraId : cameraIds) {
+            this.lockOrUnLockBySpace(cameraId);
+        }
         return successNum;
     }