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

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

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

@@ -293,11 +293,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

@@ -243,7 +243,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;
         }
@@ -295,9 +295,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());
-
-        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){
@@ -1094,9 +1092,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;
@@ -1108,21 +1106,22 @@ 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(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();
             sceneVo.setId(scenePlus.getId());
             sceneVo.setNum(scenePlus.getNum());
             sceneVo.setPayStatus(scenePlus.getPayStatus());
-
             String time = ext.getAlgorithmTime();
             if(ext.getAlgorithmTime() == null){
                 time = ext.getCreateTime();
@@ -1131,7 +1130,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;
 }