解封场景

src/main/java/com/fdkankan/ucenter/common/OssPath.java

@@ -4,6 +4,8 @@ public class OssPath {
 
     public final static String houseTypePath = "scene_edit_data/%s/user/houseType.json";
     public final static String v3_statusPath = "data/data%s/status.json";
+    public final static String v3_scenePath = "data/data%s/scene.json";
     public final static String v4_statusPath = "scene_view_data/%s/data/status.json";
+    public final static String v4_scenePath = "scene_view_data/%s/data/scene.json";
     public final static String localStatusPath = System.getProperty("java.io.tmpdir") +"status.json";   //获取临时文件目录
 }

src/main/java/com/fdkankan/ucenter/controller/TestController.java

@@ -117,7 +117,7 @@ public class TestController extends BaseController {
     }
 
     public static void main(String[] args) {
-        System.out.println(SecurityUtil.MD5("\u00155EAAMBC"));
+        System.out.println(SecurityUtil.MD5("EFG?\u0015\u001A\u001F\u0015\u001A"));
     }
 
 }

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

@@ -62,7 +62,7 @@ public class DownService implements IDownService {
         Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : plus.getSceneSource();
         isObj = isObj == null ?0 :isObj;
 
-        log.info("checkDownLoad--sceneType:{},isObj:{}",sceneType,isObj);
+        //log.info("checkDownLoad--sceneType:{},isObj:{}",sceneType,isObj);
         if(sceneType == 4 && isObj !=1){ //深时场景
             return SSCheckDownload(sceneNum);
         }
@@ -133,7 +133,7 @@ public class DownService implements IDownService {
 
         isObj = isObj == null ?0 :isObj;
 
-        log.info("down--sceneType:{},isObj:{}",sceneType,isObj);
+        //log.info("down--sceneType:{},isObj:{}",sceneType,isObj);
         if(sceneType == 4 && isObj !=1){ //深时场景
             return SSDownload(sceneNum,userName);
         }
@@ -209,7 +209,7 @@ public class DownService implements IDownService {
 
         isObj = isObj == null ?0 :isObj;
 
-        log.info("downloadProcess--sceneType:{},isObj:{}",sceneType,isObj);
+        //log.info("downloadProcess--sceneType:{},isObj:{}",sceneType,isObj);
         if(sceneType == 4 && isObj !=1){ //深时场景
             return SSDownloadProcess(sceneNum);
         }

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

@@ -305,6 +305,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
                 if(scenePlus.getPayStatus() == -2){
                     sceneProService.updateOssStatus(String.format(OssPath.v4_statusPath,scenePlus.getNum()),-2);
+                    sceneProService.updateOssStatus(String.format(OssPath.v4_scenePath,scenePlus.getNum()),-2);
                 }
 
                 log.info("复制场景结束-{}", new Date());

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

@@ -271,7 +271,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         List<Long> lockedIds = new ArrayList<>();
 
-        if(totalSpace == -1 && payStatus == 1){
+        if(totalSpace == -1){
             List<Long> collect = list.stream().map(ScenePro::getId).collect(Collectors.toList());
             List<Long> collect2 = plusList.stream().map(ScenePlus::getId).collect(Collectors.toList());
             lockedIds.addAll(collect);
@@ -283,7 +283,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         Long beyondSpace =  0L;
         Long accumulateSpace = 0L;
         if(payStatus == 1){
-            beyondSpace =  totalSpace - cameraDetail.getTotalSpace();
+            beyondSpace =  totalSpace - cameraDetail.getUsedSpace();
             getScenePlusLockedIds(lockedIds, plusList, beyondSpace, accumulateSpace);
             getSceneLockedIds(lockedIds,list,beyondSpace,accumulateSpace);
         }else {
@@ -357,9 +357,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         List<ScenePlus> plusList = scenePlusService.list(pluWr);
         for (ScenePro scenePro : proList) {
             this.updateOssStatus(String.format(OssPath.v3_statusPath,scenePro.getNum()),payStatus);
+            this.updateOssStatus(String.format(OssPath.v3_scenePath,scenePro.getNum()),payStatus);
+
         }
         for (ScenePlus scenePlus : plusList) {
             this.updateOssStatus(String.format(OssPath.v4_statusPath,scenePlus.getNum()),payStatus);
+            this.updateOssStatus(String.format(OssPath.v4_scenePath,scenePlus.getNum()),payStatus);
+
         }
 
     }
@@ -823,6 +827,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 cameraDetailService.updateById(cameraDetail);
                 if(oldScene.getPayStatus() == -2){
                     this.updateOssStatus(String.format(OssPath.v3_statusPath,oldScene.getNum()),-2);
+                    this.updateOssStatus(String.format(OssPath.v3_scenePath,oldScene.getNum()),-2);
                 }
                 log.info("复制场景结束-{}", new Date());
                 if(oldScene.getSceneSource() == 4){  //深时复制