xiewj преди 1 година
родител
ревизия
77a759a35c
променени са 1 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 5 5
      720yun_fd_consumer/gis_consumer/src/main/java/com/gis/listener/SceneListener.java

+ 5 - 5
720yun_fd_consumer/gis_consumer/src/main/java/com/gis/listener/SceneListener.java

@@ -3,6 +3,7 @@ package com.gis.listener;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gis.constant.CmdConstant;
@@ -408,15 +409,14 @@ public class SceneListener {
 
 
 
-        JSONObject SomeDataSceneDataJsonObject = JSONObject.parseObject(someDataSceneDatContent);
         JSONArray scenesJson = new JSONArray();
         for (Map<String, Object> scene : scenes) {
-            JSONObject newData =SomeDataSceneDataJsonObject;
-            newData.putAll(scene);
-            scenesJson.add(newData);
+            JSONObject SomeDataSceneDataJsonObject = JSONObject.parseObject(someDataSceneDatContent);
+            SomeDataSceneDataJsonObject.putAll(scene);
+            scenesJson.add(JSON.toJSON(SomeDataSceneDataJsonObject));
         }
         jsonObject.remove("scenes");
-        jsonObject.put("scenes", scenesJson);
+        jsonObject.put("scenes",JSON.toJSON(scenesJson));
 
         try {
             fileAndOssUtil.upload(jsonObject.toJSONString().getBytes(), ossKeyPath);