Merge remote-tracking branch 'origin/master' into obt

# Conflicts:
#	src/main/java/com/fdkankan/contro/service/impl/ScenePlusServiceImpl.java

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -696,7 +696,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             firmwareVersion.put("version", jsonObject.getString("version"));
         }
 
-        String sceneUrl = mainUrl + sceneProNewUrl;
+        String sceneUrl = mainUrl + "/" + sceneProNewUrl;
         String buildType = "V3";
         //13表示转台
         Long cameraType = 13L;
@@ -730,7 +730,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if(scenePlusVO != null){
             JSONObject statusJson = new JSONObject();
             //临时将-2改成1，app还没完全更新
-            statusJson.put("status", scenePlusVO.getSceneStatus() == -2? 1 : scene.getSceneStatus());
+            statusJson.put("status", !ObjectUtils.isEmpty(scenePlusVO.getSceneStatus()) && scenePlusVO.getSceneStatus() == -2? 1 : scene.getSceneStatus());
             statusJson.put("webSite", scenePlusVO.getWebSite());
             statusJson.put("sceneNum", scenePlusVO.getNum());
             statusJson.put("thumb", scenePlusVO.getThumb());

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

@@ -77,8 +77,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
             log.info("该场景不属于八目相机无法重置容量，场景码为：" + num);
             return ResultData.error(ErrorCode.FAILURE_CODE_5057);
         }
-
-        if(!ObjectUtils.isEmpty(scenePlusExt.getSpace())){
+        if(!ObjectUtils.isEmpty(scenePlusExt) && !ObjectUtils.isEmpty(scenePlusExt.getSpace())){
             cameraDetailService.updateCameraDetailByCameraIdAndSpace(scenePlus.getCameraId(), -scenePlusExt.getSpace());
         }