Merge remote-tracking branch 'origin/sp1.5.0' into test

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

@@ -286,11 +286,7 @@ public class SceneCommonService {
 
         Boolean checkSpace = cameraDetailService.checkSpace(cameraDetail,cameraType);
         if(!checkSpace && (location == null || location != 7)){
-            List<String> panoNumList = new ArrayList<>();
-            if(cameraDetail.getCompanyId()!= null && cameraDetail.getCompanyId() == 26L){
-                panoNumList.add(scenePlus.getNum());
-            }
-            sceneProService.lockOrUnLockScenes(new ArrayList<>(), Arrays.asList(newNum),-2,cameraType.getIsLaser(),panoNumList);
+            sceneProService.lockOrUnLockScenes(new ArrayList<>(), Arrays.asList(newNum),-2,cameraType.getIsLaser(),null);
         }
         cameraDetailService.addUsedSpace(cameraDetail,space);
 

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

@@ -282,11 +282,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 redisUtil.set(redisSceneLock,"1",60*60);
                 Boolean checkSpace = cameraDetailService.checkSpace(cameraDetail.getCameraId(),cameraType);
                 if(!checkSpace){
-                    List<String> panoNumList = new ArrayList<>();
-                    if(plusExt.getLocation() == 7){
-                        panoNumList.add(scenePlus.getNum());
-                    }
-                    sceneProService.lockOrUnLockScenes(new ArrayList<>(),Arrays.asList(scenePlus.getNum()),-2,cameraType.getIsLaser(),panoNumList);
+                    sceneProService.lockOrUnLockScenes(new ArrayList<>(),Arrays.asList(scenePlus.getNum()),-2,cameraType.getIsLaser(),null);
                 }
                 cameraDetailService.addUsedSpace(cameraDetail,plusExt.getSpace());
                 redisUtil.del(redisSceneLock);

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

@@ -269,9 +269,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     private void lockOrUnLockScenes(List<SimpleSceneVo> sceneVos, Integer payStatus,CameraType cameraType){
         List<String> v3NumList = sceneVos.stream().filter(e ->"v3".equals(e.getVersion())).map(SimpleSceneVo::getNum).collect(Collectors.toList());
         List<String> v4NumList = sceneVos.stream().filter(e ->"v4".equals(e.getVersion())).map(SimpleSceneVo::getNum).collect(Collectors.toList());
-        List<String> panoNumList = sceneVos.stream().filter(e ->"v4".equals(e.getVersion()) && e.getCompanyId() != null && e.getCompanyId() == 26L).map(SimpleSceneVo::getNum).collect(Collectors.toList());
-
-        lockOrUnLockScenes(v3NumList,v4NumList,payStatus,cameraType.getIsLaser(),panoNumList);
+        lockOrUnLockScenes(v3NumList,v4NumList,payStatus,cameraType.getIsLaser(),null);
     }
 
     private Long getSceneUnLockedIds(List<SimpleSceneVo> lockedIds ,List<SimpleSceneVo> list,Long beyondSpace,String unit){