用户自定义平面图上传

4dkankan-center-scene/src/main/java/com/fdkankan/scene/bean/SceneJsonBean.java

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.bean;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fdkankan.scene.vo.SceneEditControlsVO;
@@ -172,7 +173,7 @@ public class SceneJsonBean {
     /**
      * 用户上传自定义平面图
      */
-    private JSONObject floorPlanUpload;
+    private JSONArray floorPlanUpload;
 
     /**
      * 是否保存导览

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -268,7 +268,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         SceneJsonBean sceneJson = new SceneJsonBean();
         BeanUtil.copyProperties(sceneEditInfoExt, sceneJson);
         BeanUtil.copyProperties(sceneEditInfo, sceneJson, "floorPlanUpload");
-        sceneJson.setFloorPlanUpload(this.Str2Json(sceneEditInfo.getFloorPlanUpload()));
+        sceneJson.setFloorPlanUpload(JSON.parseArray(sceneEditInfo.getFloorPlanUpload()));
         SceneEditControlsVO sceneEditControlsVO = BeanUtil.copyProperties(sceneEditControls, SceneEditControlsVO.class);
         sceneJson.setControls(sceneEditControlsVO);
         sceneJson.setNum(num);
@@ -545,7 +545,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         SceneInfoVO sceneInfoVO = new SceneInfoVO();
         BeanUtil.copyProperties(sceneEditInfoExt, sceneInfoVO);
         BeanUtil.copyProperties(sceneEditInfo, sceneInfoVO, "floorPlanUpload");
-        sceneInfoVO.setFloorPlanUpload(this.Str2Json(sceneEditInfo.getFloorPlanUpload()));
+        sceneInfoVO.setFloorPlanUpload(JSON.parseArray(sceneEditInfo.getFloorPlanUpload()));
         if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
             sceneInfoVO.setFloorPlanAngle(0f);
         }
@@ -576,13 +576,6 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         return sceneInfoVO;
     }
 
-    private JSONObject Str2Json(String str){
-        if(StrUtil.isEmpty(str)){
-            return null;
-        }
-        return JSON.parseObject(str);
-    }
-
     private void SortBoxVideos(SceneInfoVO sceneInfoVO){
         String boxVideos = sceneInfoVO.getBoxVideos();
         if(StrUtil.isEmpty(boxVideos)){

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.util.List;
@@ -187,7 +188,7 @@ public class SceneInfoVO {
     /**
      * 用户上传自定义平面图数据
      */
-    private JSONObject floorPlanUpload;
+    private JSONArray floorPlanUpload;
 
     /**
      * 是否保存导览