Jelajahi Sumber

逻辑编组增加id

menglu 3 tahun lalu
induk
melakukan
ddcddc58c4

+ 13 - 21
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/RestUtil.java

@@ -59,7 +59,7 @@ public class RestUtil {
 			}
 			return JSONObject.toJSONString(Content, SerializerFeature.WriteMapNullValue);
 		} catch (Exception e) {
-			log.error(e.getMessage(),e);
+			log.error(e.getMessage(), e);
 			result.put("Result", "failure");
 			result.put("Reason", LogUtil.GetExceptionStackTrace(e));
 		}
@@ -92,7 +92,7 @@ public class RestUtil {
 			String result = RestUtil.query(JSONObject.toJSONString(query_json_new, SerializerFeature.WriteMapNullValue));
 			return result;
 		} catch (Exception e) {
-			log.error(e.getMessage(),e);
+			log.error(e.getMessage(), e);
 			String error = LogUtil.GetExceptionStackTrace(e);
 			return error;
 		}
@@ -303,7 +303,7 @@ public class RestUtil {
 			Object valueJSON = ComputeUtil.getValueJSON(valueObject, read_level);
 			return JSONObject.toJSONString(valueJSON, SerializerFeature.WriteMapNullValue);
 		} catch (Exception e) {
-			log.error(e.getMessage(),e);
+			log.error(e.getMessage(), e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			return message;
@@ -323,20 +323,12 @@ public class RestUtil {
 	public static Object post(String[] valuePath) {
 		RepositoryImpl Repository = RepositoryContainer.instance;
 		try {
-			if (valuePath[valuePath.length - 1].equals("工单")) {
-				JSONObject work_order = FastJsonReaderUtil.Instance()
-						.ReadJSONObject(FileUtil.file("work_order_sample.json"));
-				JSONArray work_orders = new JSONArray();
-				work_orders.add(work_order);
-				return work_orders;
-			} else {
-				Object valueObject = ComputeUtil.getValueObject(Repository, valuePath);
-				RecursiveUtil.refreshObject(Repository, valueObject);
-				Object valueJSON = ComputeUtil.getValueJSON(valueObject);
-				return valueJSON;
-			}
+			Object valueObject = ComputeUtil.getValueObject(Repository, valuePath);
+			RecursiveUtil.refreshObject(Repository, valueObject);
+			Object valueJSON = ComputeUtil.getValueJSON(valueObject);
+			return valueJSON;
 		} catch (Exception e) {
-			log.error(e.getMessage(),e);
+			log.error(e.getMessage(), e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			return message;
@@ -389,7 +381,7 @@ public class RestUtil {
 				result.put("success_count", success_points.size());
 			}
 		} catch (Exception e) {
-			log.error(e.getMessage(),e);
+			log.error(e.getMessage(), e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			result.put("result", "failure");
@@ -411,7 +403,7 @@ public class RestUtil {
 			result.put("Content", Content);
 			result.put("Result", "success");
 		} catch (Exception e) {
-			log.error(e.getMessage(),e);
+			log.error(e.getMessage(), e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			result.put("Result", "failure");
@@ -489,7 +481,7 @@ public class RestUtil {
 			result.put("Content", parseArray);
 			result.put("Result", "success");
 		} catch (Exception e) {
-			log.error(e.getMessage(),e);
+			log.error(e.getMessage(), e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			result.put("Result", "failure");
@@ -541,7 +533,7 @@ public class RestUtil {
 			result.put("Content", datas);
 			result.put("Result", "success");
 		} catch (Exception e) {
-			log.error(e.getMessage(),e);
+			log.error(e.getMessage(), e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			result.put("Result", "failure");
@@ -695,7 +687,7 @@ public class RestUtil {
 			result.put("Content", datas);
 			result.put("Result", "success");
 		} catch (Exception e) {
-			log.error(e.getMessage(),e);
+			log.error(e.getMessage(), e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			result.put("Result", "failure");

+ 4 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java

@@ -619,6 +619,10 @@ public class RWDLoadUtil {
 		String validPath = Constant.getLatestPath(Constant.ibms_physical_world, true);
 		{
 			JSONArray array = FastJsonReaderUtil.Instance().ReadJSONArray(new File(validPath + Constant.getSeperator() + "groupArray.json"));
+			for (int i = 0; i < array.size(); i++) {
+				JSONObject arrayItem = array.getJSONObject(i);
+				arrayItem.put("id", arrayItem.get("logicalGroupingId"));
+			}
 			SceneDataSet SceneDataSet = new SceneDataSet(false);
 			SceneDataSet.set = RWDUtil.array2SDOList(array);
 			Repository.IBMSGroupArray = SceneDataSet;