Browse Source

调整ibms路径

menglu 3 years ago
parent
commit
3a75a8ed5f

+ 4 - 8
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDDownloadUtil.java

@@ -371,10 +371,6 @@ public class RWDDownloadUtil {
 			if (!root.exists()) {
 				root.mkdir();
 			}
-			File object = new File(path + Constant.getSeperator() + "object");
-			if (!object.exists()) {
-				object.mkdir();
-			}
 		}
 
 		log.debug("Download ibms physical world begin " + path);
@@ -388,7 +384,7 @@ public class RWDDownloadUtil {
 			JSONObject resultJSON = JSON.parseObject(post_result);
 			classArray = resultJSON.getJSONArray("Content");
 			classArray = classArray == null ? new JSONArray() : classArray;
-			FileUtil.Save(path + Constant.getSeperator() + "classArray.json", FastJsonUtil.toFormatString(classArray));
+			FileUtil.Save(path + Constant.getSeperator() + "groupArray.json", FastJsonUtil.toFormatString(classArray));
 		}
 		Map<String, Map<String, List<String>>> idListMapMap = new HashMap<String, Map<String, List<String>>>();
 		for (int i = 0; i < classArray.size(); i++) {
@@ -406,7 +402,7 @@ public class RWDDownloadUtil {
 			idListMap.get(ibmsClassCode).add(logicalGroupingId);
 		}
 		for (String ibmsSceneCode : idListMapMap.keySet()) {
-			File sceneDir = new File(path + Constant.getSeperator() + "object" + Constant.getSeperator() + ibmsSceneCode);
+			File sceneDir = new File(path + Constant.getSeperator() + ibmsSceneCode);
 			if (!sceneDir.exists()) {
 				sceneDir.mkdir();
 			}
@@ -427,8 +423,8 @@ public class RWDDownloadUtil {
 					infoArray.addAll(Content);
 				}
 				infoArray = infoArray == null ? new JSONArray() : infoArray;
-				FileUtil.Save(path + Constant.getSeperator() + "object" + Constant.getSeperator() + ibmsSceneCode + Constant.getSeperator()
-						+ ibmsClassCode + ".json", FastJsonUtil.toFormatString(infoArray));
+				FileUtil.Save(path + Constant.getSeperator() + ibmsSceneCode + Constant.getSeperator() + ibmsClassCode + ".json",
+						FastJsonUtil.toFormatString(infoArray));
 			}
 		}
 		log.debug("Download ibms physical world finish " + path);

+ 9 - 5
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java

@@ -560,7 +560,7 @@ public class RWDLoadUtil {
 	public static void LoadIBMSPhysicalWorld(RepositoryImpl Repository) throws Exception {
 		String validPath = Constant.getLatestPath(Constant.ibms_physical_world, true);
 		{
-			JSONArray array = FastJsonReaderUtil.Instance().ReadJSONArray(new File(validPath + Constant.getSeperator() + "classArray.json"));
+			JSONArray array = FastJsonReaderUtil.Instance().ReadJSONArray(new File(validPath + Constant.getSeperator() + "groupArray.json"));
 			SceneDataSet SceneDataSet = new SceneDataSet(false);
 			SceneDataSet.set = RWDUtil.array2SDOList(array);
 			Repository.IBMSGroupArray = SceneDataSet;
@@ -718,10 +718,14 @@ public class RWDLoadUtil {
 							}
 						}
 						if (product.equals("ggzm")) {
-							String floorId = (String) level2_item.get("floorId").value_prim.value;
-							String floorName = (String) level2_item.get("floorName").value_prim.value;
-							itemInner.put("楼层编号", floorId);
-							itemInner.put("楼层名称", floorName);
+							SceneDataValue floorArray = SELTCC.get("所在楼层");
+							if (floorArray.value_array.set.size() == 1) {
+								SceneDataObject floor = floorArray.value_array.set.get(0);
+								String floorId = (String) floor.get("id").value_prim.value;
+								String floorName = (String) floor.get("localName").value_prim.value;
+								itemInner.put("楼层编号", floorId);
+								itemInner.put("楼层名称", floorName);
+							}
 						}
 					}
 					huiluArray.add(itemInner);