1111

src/main/java/com/fdkankan/scene/config/WebConfig.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry){
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowedMethods("GET","POST","PUT","DELETE")
+                .allowedHeaders("*")
+                .allowCredentials(true)
+                .maxAge(168000);
+    }
+
+
+}

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

@@ -573,6 +573,10 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         if(hasKey){
             String sceneJson = redisUtil.get(key);
             sceneInfoVO = JSON.parseObject(sceneJson, SceneInfoVO.class);
+            sceneInfoVO.getControls().setShowRule(1);
+            sceneInfoVO.getControls().setShowFloorplan(0);
+            sceneInfoVO.getControls().setShowDollhouse(0);
+            sceneInfoVO.setFloorLogo("2");
         }else{
             Scene scene = sceneService.getOne(new LambdaQueryWrapper<Scene>().eq(Scene::getNum, num));
             sceneInfoVO = new SceneInfoVO();
@@ -584,7 +588,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             sceneInfoVO.setSceneFrom(scene.getScenefrom());
             sceneInfoVO.setModelKind(scene.getModelkind());
             sceneInfoVO.setFloorPlanAngle(Float.valueOf(scene.getFloorplanangle()));
-            SceneEditControlsVO sceneEditControlsBean = SceneEditControlsVO.builder()
+            sceneInfoVO.setFloorLogo("2");
+            SceneEditControlsVO sceneEditControlsBean = SceneEditControlsVO.builder().showRule(1).showFloorplan(0).showDollhouse(0)
                     .showDollhouse(1).showMap(1).showPanorama(1).showVR(1).showTitle(1).showFloorplan(1).build();
             sceneInfoVO.setControls(sceneEditControlsBean);
 

src/main/resources/application-test.yml

@@ -7,16 +7,16 @@ spring:
     password: IDCqawsed@123.
     driver-class-name: oracle.jdbc.OracleDriver
   redis:
-    host: 10.180.22.54
+#    host: 10.180.22.54
     # host: 120.24.144.164
-    port: 7000
+#    port: 7000
     timeout: 6000ms
     #    password: bgh0cae240
     password: Qwt@1620b!v
-    # cluster:
-    #   max-redirects: 3  # 获取失败 最大重定向次数
-    #   nodes:
-    #     - 120.25.146.52:6379
+    cluster:
+     max-redirects: 3  # 获取失败 最大重定向次数
+     nodes:
+       - 10.180.22.54:7000
     jedis:
       pool:
         max-active: 10  #连接池最大连接数（使用负值表示没有限制）