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

src/main/java/com/fdkankan/ucenter/service/ISceneProService.java

@@ -88,7 +88,7 @@ public interface ISceneProService extends IService<ScenePro> {
 
     Integer getSceneSourceByNum(String sceneNum);
 
-    List<SimpleSceneVo> getSimpleSceneVo(Long cameraId);
+    List<SimpleSceneVo> getSimpleSceneVo(CameraDetail cameraDetail);
 
     Long getCountByCameraId(Long cameraId,Boolean stauts);
 

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

@@ -264,9 +264,6 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         if (!"aws".equals(NacosProperty.uploadType) && cameraType.getIsLaser() == 1) {
             return -1L;
         }
-        if (cameraDetail.getCompanyId() != null && cameraDetail.getCompanyId() == 26L) {
-            return -1L;
-        }
         UserIncrement userIncrement = userIncrementService.getByCameraId(cameraDetail.getCameraId());
         if(userIncrement != null && userIncrement.getIsExpired() == 0){
             IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
@@ -290,9 +287,6 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         if (!"aws".equals(NacosProperty.uploadType) && cameraType.getIsLaser() == 1) {
             return true;
         }
-        if (detailEntity.getCompanyId() != null && detailEntity.getCompanyId() == 26L) {
-            return true;
-        }
         UserIncrement userIncrement = userIncrementService.getByCameraId(detailEntity.getCameraId());
         if(userIncrement == null || userIncrement.getIsExpired() == 1){
             return checkSpace(detailEntity,null,cameraType,true);
@@ -307,9 +301,6 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         if (!"aws".equals(NacosProperty.uploadType) && cameraType.getIsLaser() == 1) {
             return true;
         }
-        if (detailEntity.getCompanyId() != null && detailEntity.getCompanyId() == 26L) {
-            return true;
-        }
         if("SP".equals(detailEntity.getUnit())){
             if(incrementType!=null && incrementType.getCameraSpace() == -1){
                 return true;

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

@@ -285,7 +285,7 @@ public class SceneCommonService {
         CameraType cameraType = cameraTypeService.getByCameraType(cameraDetail.getType());
 
         Boolean checkSpace = cameraDetailService.checkSpace(cameraDetail,cameraType);
-        if(!checkSpace){
+        if(!checkSpace && location != 7){
             List<String> panoNumList = new ArrayList<>();
             if(location != null && location == 7){
                 panoNumList.add(scenePlus.getNum());

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

@@ -217,7 +217,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Override
     public void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId) {
 
-        List<SimpleSceneVo> voList = this.getSimpleSceneVo(cameraId);
+        List<SimpleSceneVo> voList = this.getSimpleSceneVo(cameraDetail);
         if(voList .size() <=0){
             return;
         }
@@ -1068,9 +1068,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
 
     @Override
-    public List<SimpleSceneVo> getSimpleSceneVo(Long cameraId) {
+    public List<SimpleSceneVo> getSimpleSceneVo(CameraDetail cameraDetail) {
         List<SimpleSceneVo> voList = new ArrayList<>();
-        List<ScenePro> proList = this.getListByCameraId(cameraId);
+        List<ScenePro> proList = this.getListByCameraId(cameraDetail.getCameraId());
         for (ScenePro scenePro : proList) {
             if(scenePro.getStatus() !=-2){
                 continue;
@@ -1084,12 +1084,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             sceneVo.setVersion("v3");
             voList.add(sceneVo);
         }
-        List<ScenePlus> plusList = scenePlusService.getListByCameraId(cameraId);
+        List<ScenePlus> plusList = scenePlusService.getListByCameraId(cameraDetail.getCameraId());
         List<Long> plusIds = plusList.stream().map(ScenePlus::getId).collect(Collectors.toList());
         HashMap<Long, ScenePlusExt> plusMap = scenePlusExtService.getByPlusIds(plusIds);
         for (ScenePlus scenePlus : plusList) {
             ScenePlusExt ext = plusMap.get(scenePlus.getId());
-            if(ext == null || scenePlus.getSceneStatus() !=-2){
+            if(ext == null || scenePlus.getSceneStatus() !=-2 ||
+                    (cameraDetail.getCompanyId()!=null && cameraDetail.getCompanyId() == 26L && ext.getLocation() ==7)){
                 continue;
             }
             SimpleSceneVo sceneVo = new SimpleSceneVo();