1、随心装场景默认关闭标尺功能

2、升级spring-web.jar版本

pom.xml

@@ -54,6 +54,18 @@
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-web</artifactId>
             <version>3.0.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-web</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>5.2.16.RELEASE</version>
         </dependency>
 
         <dependency>

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

@@ -509,6 +509,11 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         this.setExtData(sceneInfoVO, scenePlus.getCameraId());
 
+        //随心装特殊要求，由于随心装场景无法提供vision2.txt，故默认随心装场景关闭标尺功能
+        if(SceneFrom.SXZ.code().equals(scenePlusExt.getSceneFrom())){
+            sceneInfoVO.getControls().setShowScale(CommonStatus.NO.code().intValue());
+        }
+
         return sceneInfoVO;
     }
 
@@ -620,6 +625,11 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             controls.setShowBillboardTitle(CommonStatus.YES.code().intValue());
         }
 
+        //随心装特殊要求，由于随心装场景无法提供vision2.txt，故默认随心装场景关闭标尺功能
+        if(SceneFrom.SXZ.code().equals(scenePlusExt.getSceneFrom())){
+            controls.setShowScale(CommonStatus.NO.code().intValue());
+        }
+
         return sceneInfoVO;
     }