用户自定义平面图上传

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

@@ -170,9 +170,9 @@ public class SceneJsonBean {
     private Float floorPlanCompass;
 
     /**
-     * 用户是否上传自定义平面图(0-否，1-是)
+     * 用户上传自定义平面图
      */
-    private Integer floorPlanUpload;
+    private JSONObject floorPlanUpload;
 
     /**
      * 是否保存导览

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneEditInfo.java

@@ -180,10 +180,10 @@ public class SceneEditInfo implements Serializable {
     private String loadingLogoFile;
 
     /**
-     * 用户是否上传自定义平面图(0-否，1-是)
+     * 用户上传自定义平面图数据
      */
     @TableField("floor_plan_upload")
-    private Integer floorPlanUpload;
+    private String floorPlanUpload;
 
     /**
      * 创建时间

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

@@ -267,7 +267,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         //生成sceneJson
         SceneJsonBean sceneJson = new SceneJsonBean();
         BeanUtil.copyProperties(sceneEditInfoExt, sceneJson);
-        BeanUtil.copyProperties(sceneEditInfo, sceneJson);
+        BeanUtil.copyProperties(sceneEditInfo, sceneJson, "floorPlanUpload");
+        sceneJson.setFloorPlanUpload(this.Str2Json(sceneEditInfo.getFloorPlanUpload()));
         SceneEditControlsVO sceneEditControlsVO = BeanUtil.copyProperties(sceneEditControls, SceneEditControlsVO.class);
         sceneJson.setControls(sceneEditControlsVO);
         sceneJson.setNum(num);
@@ -543,7 +544,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         SceneEditControls sceneEditControls = sceneEditControlsService.getBySceneEditId(sceneEditInfo.getId());
         SceneInfoVO sceneInfoVO = new SceneInfoVO();
         BeanUtil.copyProperties(sceneEditInfoExt, sceneInfoVO);
-        BeanUtil.copyProperties(sceneEditInfo, sceneInfoVO);
+        BeanUtil.copyProperties(sceneEditInfo, sceneInfoVO, "floorPlanUpload");
+        sceneInfoVO.setFloorPlanUpload(this.Str2Json(sceneEditInfo.getFloorPlanUpload()));
         if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
             sceneInfoVO.setFloorPlanAngle(0f);
         }
@@ -574,6 +576,13 @@ 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/SceneEditInfoParamVO.java

@@ -70,9 +70,9 @@ public class SceneEditInfoParamVO extends BaseSceneParamVO{
     private String loadingLogoFile;
 
     /**
-     * 用户是否上传自定义平面图(0-否，1-是)
+     * 用户上传自定义平面图数据
      */
-    private Integer floorPlanUpload;
+    private String floorPlanUpload;
 
     private SceneEditControlsParamVO controls;
 

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

@@ -185,9 +185,9 @@ public class SceneInfoVO {
     private Float floorPlanCompass;
 
     /**
-     * 用户是否上传自定义平面图(0-否，1-是)
+     * 用户上传自定义平面图数据
      */
-    private Integer floorPlanUpload;
+    private JSONObject floorPlanUpload;
 
     /**
      * 是否保存导览