Merge branch 'dev_upgrade' into dev_upgrade_plan6

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/HandlerMqttMessageImpl.java

@@ -71,7 +71,10 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
 
     @Value("${data.type.fireMonitor}")
     private String fireMonitor;
-
+    
+    @Value("${integrated3Dtype}")
+    private String integrated3Dtype;
+    
     @Autowired
     private WebMqttComponent webMqttComponent;
 
@@ -299,7 +302,8 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         PlanDetailVo planDetailVo = planDetailMapper.getPlanDetailByEquipmentId(equipment.getId());
         //3d页面打开且存在预案，套用之前数字源码启动逻辑 进行预案的启动
         
-        boolean isOnLine = this.getOpen3dUser();
+        boolean isOnLine = "web".equals(integrated3Dtype)?this.getOpen3dUser():true;
+        		//this.getOpen3dUser();
         log.info("isOnLine==="+isOnLine);
         log.info("planDetailVo==="+JSONObject.toJSONString(planDetailVo));
         if (planDetailVo != null && isOnLine) {

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

@@ -72,3 +72,5 @@ file.downLoad.url=http://172.16.11.201:9000/
 #规则ip配置，用于多网卡及docker镜像启动时添加
 rule.definition.local-ip=172.16.11.201
 
+#3Dtype 分为web和ue
+integrated3Dtype =web