fix bug

sxz-base/src/main/java/com/fdkk/sxz/util/readFloorplan.java

@@ -196,7 +196,7 @@ public class readFloorplan {
             start.put("parent", startParent);
 
             JSONObject endParent = end.getJSONObject("parent");
-            if (!endParent.isEmpty()) {
+            if (ObjectUtil.isNotNull(endParent) && !endParent.isEmpty()) {
                 endParent.put(wallId, "end");
             } else {
                 endParent = new JSONObject();

sxz-core/src/main/java/com/fdkk/sxz/other/mq/TopicRabbitConfig.java

@@ -14,35 +14,35 @@ import java.util.Map;
 public class TopicRabbitConfig {
 
 
-    public final static String CHANGE = "topic.chang";
+    public final static String CHANGE = "topic.chang.dev";
     //灯光预览
-    public final static String LIGHT = "topic.light";
+    public final static String LIGHT = "topic.light.dev";
 
     ////图片渲染
     //public final static String MODEL_CREAT_THUM = "topic.modelCreatThum";
 
     //上传模型
-    public final static String MODEL = "topic.model";
+    public final static String MODEL = "topic.model.dev";
     //上传模型处理业务
-    public final static String MODEL_BIZ = "topic.modelBiz";
+    public final static String MODEL_BIZ = "topic.modelBiz.dev";
 
     //"更新模型库，syncmodel
-    public final static String SYNCMODEL = "topic.syncmodel";
+    public final static String SYNCMODEL = "topic.syncmodel.dev";
 
     //上传后提交模型
-    public final static String ADDMODEL = "topic.addModel";
+    public final static String ADDMODEL = "topic.addModel.dev";
 
     //处理
-    public final static String MVIEW = "delay.mview";
+    public final static String MVIEW = "delay.mview.dev";
 
     /**
      * 普通交换机
      */
-    public final static String TOPICE = "topicExchange";
+    public final static String TOPICE = "topicExchange.dev";
     /**
      * 延迟消息交换机
      */
-    public final static String DELAY_EXCHANGE = "delay.exchange";
+    public final static String DELAY_EXCHANGE = "delay.exchange.dev";
 
     @Bean
     public CustomExchange delayMessageExchange() {

sxz-core/src/main/java/com/fdkk/sxz/webApi/controller/ImportDataController.java

@@ -633,11 +633,11 @@ public class ImportDataController extends BaseController {
             Map<String, Double> map = null;
             Boolean isV2 = FileUtils.downLoadFromUrl("https://4dkk.4dage.com/data/data" + num + "/houst_floor.json?t=" + System.currentTimeMillis(),
                     "floor.json", basePath);
-            ImportDataController.log.info("下载V2版本houst_floor,状态={}", isV2);
+            ImportDataController.log.info("下载V2版本houst_floor-{},状态={}", num, isV2);
             if (!isV2) {
                 boolean isV1 = FileUtils.downLoadFromUrl("https://4dkk.4dage.com/data/data" + num + "/floor.json?t=" + System.currentTimeMillis(),
                         "floor.json", basePath);
-                ImportDataController.log.info("下载V1版本floor,状态={}", isV1);
+                ImportDataController.log.info("下载V1版本floor-{},状态={}", num, isV1);
             }
             ConvertCadKjl cad = new ConvertCadKjl();
             String data = FileUtils.readFile(basePath + File.separator + "floor.json");