修改json格式

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

@@ -24,27 +24,27 @@ public class ReadFloorplan {
     public static void main(String args[]) {
 
         try {
-            ReadFloorplan m_readFloorplan = new ReadFloorplan();
-            JSONObject cad = m_readFloorplan.readFile(m_readFloorplan.filePath);
-            JSONArray floors = cad.getJSONArray("floors");
-            floors = m_readFloorplan.analysisCad(floors);
-            JSONObject data = new JSONObject();
-            data.put("floors", floors);
-            data.put("version", ReadFloorplan.version);
-            ReadFloorplan.writeFile(ReadFloorplan.outputPath, data.toString());
-            System.out.println();
+            //ReadFloorplan m_readFloorplan = new ReadFloorplan();
+            //JSONObject cad = m_readFloorplan.readFile(m_readFloorplan.filePath);
+            //JSONArray floors = cad.getJSONArray("floors");
+            //floors = m_readFloorplan.analysisCad(floors);
+            //JSONObject data = new JSONObject();
+            //data.put("version", ReadFloorplan.version);
+            //ReadFloorplan.writeFile(ReadFloorplan.outputPath, data.toString());
+            //System.out.println();
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    public JSONObject analysisCadJsonObj(JSONArray floors) {
-
-        JSONArray jsonArray = analysisCad(floors);
-        JSONObject V2data = new JSONObject();
-        V2data.put("floors", jsonArray);
-        V2data.put("version", ReadFloorplan.version);
-        return V2data;
+    public void analysisCadJsonObj(JSONArray floors, JSONObject resultJson) {
+        try {
+            JSONArray jsonArray = analysisCad(floors);
+            resultJson.put("floors", jsonArray);
+            resultJson.put("version", ReadFloorplan.version);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public JSONArray analysisCad(JSONArray floors) {

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

@@ -648,8 +648,9 @@ public class ImportDataController extends BaseController {
                 ReadFloorplan m_readFloorplan = new ReadFloorplan();
                 JSONObject V2cad = m_readFloorplan.readFile(basePath + File.separator + "floor.json");
                 JSONArray floors = V2cad.getJSONArray("floors");
-                JSONObject V2data = m_readFloorplan.analysisCadJsonObj(floors);
-                resultJson.put("floors", V2data);
+                // resultJson.put("floors", V2data);交给下面的方法处理
+                m_readFloorplan.analysisCadJsonObj(floors, resultJson);
+
             } else {
                 if (StrUtil.isNotEmpty(data)) {
                     inputJson = JSON.parseObject(data);