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

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

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

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

@@ -269,7 +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.getLocation() != null && e.getLocation() == 7).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);
     }
@@ -1082,6 +1082,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             sceneVo.setCreateTime(DateUserUtil.getDate(scenePro.getCreateTime()).getTime());
             sceneVo.setSpace(scenePro.getSpace());
             sceneVo.setVersion("v3");
+            sceneVo.setCompanyId(cameraDetail.getCompanyId());
             voList.add(sceneVo);
         }
         List<ScenePlus> plusList = scenePlusService.getListByCameraId(cameraDetail.getCameraId());
@@ -1097,7 +1098,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             sceneVo.setId(scenePlus.getId());
             sceneVo.setNum(scenePlus.getNum());
             sceneVo.setPayStatus(scenePlus.getPayStatus());
-
             String time = ext.getAlgorithmTime();
             if(ext.getAlgorithmTime() == null){
                 time = ext.getCreateTime();
@@ -1106,7 +1106,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             sceneVo.setSpace(ext.getSpace());
             sceneVo.setVersion("v4");
             sceneVo.setLocation(ext.getLocation());
-
+            sceneVo.setCompanyId(cameraDetail.getCompanyId());
             voList.add(sceneVo);
         }
         return voList;

src/main/java/com/fdkankan/ucenter/vo/response/SimpleSceneVo.java

@@ -19,4 +19,5 @@ public class SimpleSceneVo {
     private Long space = 0L;
     private String version;
     private Integer location;
+    private Long companyId;
 }