Merge branch 'feature-bcgn' into test

src/main/java/com/fdkankan/scene/bean/SceneJsonBean.java

@@ -240,5 +240,7 @@ public class SceneJsonBean {
 
     private String orientation;
 
+    private JSONObject iconSize;
+
 
 }

src/main/java/com/fdkankan/scene/entity/ScenePlusExt.java

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.entity;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -178,4 +179,12 @@ public class ScenePlusExt implements Serializable {
      */
     @TableField("is_obj")
     private Integer isObj;
+
+    /**
+     * 图标大小（拜城公安需求）
+     */
+    @TableField("icon_size")
+    private JSONObject iconSize;
+
+
 }

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -129,6 +129,11 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         if(Objects.isNull(scenePlus)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
+
+        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+        scenePlusExt.setIconSize(param.getIconSize());
+        scenePlusExtService.updateById(scenePlusExt);
+
         SceneEditInfo sceneEditInfoDb = this.getByScenePlusId(scenePlus.getId());
         SceneEditControls sceneEditControlsDb = null;
         if(Objects.nonNull(sceneEditInfoDb)){
@@ -244,6 +249,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         sceneJson.setSceneKind(scenePlusExt.getSceneKind());
         sceneJson.setModelKind(scenePlusExt.getModelKind());
         sceneJson.setOrientation(scenePlusExt.getOrientation());
+        sceneJson.setIconSize(scenePlusExt.getIconSize());
         if(StrUtil.isNotEmpty(scenePlusExt.getVideos())){
             sceneJson.setVideos(scenePlusExt.getVideos());
         }
@@ -501,6 +507,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         sceneInfoVO.setSns(JSON.parseObject(sceneEditInfoExt.getSnsInfo()));
         sceneInfoVO.setStarted(JSON.parseObject(sceneEditInfoExt.getStarted()));
         sceneInfoVO.setOrientation(scenePlusExt.getOrientation());
+        sceneInfoVO.setIconSize(scenePlusExt.getIconSize());
 
         this.SortBoxVideos(sceneInfoVO);
 

src/main/java/com/fdkankan/scene/vo/SceneEditInfoParamVO.java

@@ -86,5 +86,7 @@ public class SceneEditInfoParamVO extends BaseSceneParamVO{
 
     private Integer floorLogoType;
 
+    private JSONObject iconSize;
+
 
 }

src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

@@ -268,4 +268,6 @@ public class SceneInfoVO {
 
     private String orientation;
 
+    private JSONObject iconSize;
+
 }