111

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

@@ -26,6 +26,7 @@ import com.fdkankan.scene.service.*;
 import com.fdkankan.scene.vo.*;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -55,6 +56,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<SceneEditInfoMapper, S
 //    private int maxCheckTimes;
 //    @Value("${ecs.checkFile.waitTime:1000}")
 //    private int waitTime;
+    @Value("${tieta.device-address:#{null}}")
+    private String deviceAddress;
 //
     @Autowired
     private SceneEditControlsService sceneEditControlsService;
@@ -441,6 +444,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<SceneEditInfoMapper, S
                 }
                 sceneInfo.setEntityList(roomList);
         }
+        sceneInfo.setDeviceAddress(deviceAddress);
 
         return sceneInfo;
     }

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

@@ -287,6 +287,8 @@ public class SceneInfoVO {
 
 //    private Map<String, String> mapping;
 
+    private String deviceAddress;
+
 
 
 

src/main/resources/application-dev.yml

@@ -46,6 +46,7 @@ tieta:
   serverName: scene
   checkToken:
     syscode: CHNTZCGL_ZCSZHGL
+  device-address: http://10.180.145.97:5068
 
 redis:
   host: http://10.180.22.54:8081

src/main/resources/application-preprod.yml

@@ -47,6 +47,7 @@ tieta:
   serverName: scene
   checkToken:
     syscode: CHNTZCGL_ZCSZHGL
+  device-address: http://10.161.32.174:5068
 
 redis:
   host: http://10.34.53.34:8081

src/main/resources/application-prod.yml

@@ -47,9 +47,10 @@ tieta:
   serverName: scene
   checkToken:
     syscode: CHNTZCGL_ZCSZHGL
+  device-address: http://10.161.32.174:5068
 
 redis:
-  host: http://192.168.53.243:8081
+  host: http://3d.chinatowercom.cn:5068
 
 tlog:
   enable-invoke-time-print: true

src/main/resources/application-test.yml

@@ -47,6 +47,7 @@ tieta:
   serverName: scene
   checkToken:
     syscode: CHNTZCGL_ZCSZHGL
+  device-address: http://10.190.134.142:5068
 
 redis:
   host: http://10.190.22.99:8081