Kaynağa Gözat

优化打印信息

menglu 3 yıl önce
ebeveyn
işleme
b649536411

+ 0 - 3
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/data/SceneDataValue.java

@@ -25,9 +25,6 @@ public class SceneDataValue {
 		if (this.rel_property != null) {
 		if (this.rel_property != null) {
 			if (this.rel_property.propertyValueType.equals("query") || this.rel_property.propertyValueType.equals("static")
 			if (this.rel_property.propertyValueType.equals("query") || this.rel_property.propertyValueType.equals("static")
 					|| this.rel_property.propertyValueType.equals("deamon")) {
 					|| this.rel_property.propertyValueType.equals("deamon")) {
-				if (Repository.property2SDV.get(this.rel_property) == null) {
-					System.out.println();
-				}
 				Repository.property2SDV.get(this.rel_property).add(this);
 				Repository.property2SDV.get(this.rel_property).add(this);
 			}
 			}
 		}
 		}

+ 9 - 4
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ComputeUtil.java

@@ -135,14 +135,14 @@ public class ComputeUtil {
 		for (SceneProperty spInner : spList) {
 		for (SceneProperty spInner : spList) {
 			// 打印路径
 			// 打印路径
 			{
 			{
-				String path = getPath(Repository, spInner);
+				String path = getPropertyPath(Repository, spInner);
 				log.info("getPropertyBefore:" + path);
 				log.info("getPropertyBefore:" + path);
 			}
 			}
 			{
 			{
 				List<SceneProperty> beforeList = CheckUtil.getPropertyBefore(Repository, spInner);
 				List<SceneProperty> beforeList = CheckUtil.getPropertyBefore(Repository, spInner);
 				Repository.beforeDic.put(spInner, beforeList);
 				Repository.beforeDic.put(spInner, beforeList);
 				for (SceneProperty spInner2 : beforeList) {
 				for (SceneProperty spInner2 : beforeList) {
-					log.info(getPath(Repository, spInner2));
+					log.info(getPropertyPath(Repository, spInner2));
 				}
 				}
 			}
 			}
 		}
 		}
@@ -181,7 +181,7 @@ public class ComputeUtil {
 			log.info("********************************");
 			log.info("********************************");
 			for (SceneProperty spInner2 : spInnerList) {
 			for (SceneProperty spInner2 : spInnerList) {
 				Repository.property2lock.put(spInner2, new ReentrantLock(true));
 				Repository.property2lock.put(spInner2, new ReentrantLock(true));
-				log.info(getPath(Repository, spInner2));
+				log.info(getPropertyPath(Repository, spInner2));
 				if (!Repository.property2SDV.containsKey(spInner2)) {
 				if (!Repository.property2SDV.containsKey(spInner2)) {
 					Repository.property2SDV.put(spInner2, new ArrayList<SceneDataValue>());
 					Repository.property2SDV.put(spInner2, new ArrayList<SceneDataValue>());
 				}
 				}
@@ -193,7 +193,7 @@ public class ComputeUtil {
 		return spListList;
 		return spListList;
 	}
 	}
 
 
-	public static String getPath(Repository Repository, SceneProperty spInner) throws Exception {
+	public static String getPropertyPath(Repository Repository, SceneProperty spInner) throws Exception {
 		Object parentData = spInner;
 		Object parentData = spInner;
 		List<SceneProperty> tmpList = new ArrayList<SceneProperty>();
 		List<SceneProperty> tmpList = new ArrayList<SceneProperty>();
 		while (true) {
 		while (true) {
@@ -341,6 +341,11 @@ public class ComputeUtil {
 	}
 	}
 
 
 	public static void computeProperty(Repository Repository, SceneDataValue sv) throws Exception {
 	public static void computeProperty(Repository Repository, SceneDataValue sv) throws Exception {
+		String svPath = RecursiveUtil.getDataPath(sv);
+		log.info(svPath);
+		// if (svPath.equals("基础对象.设备.[电梯].设备类型.[直梯].清单.[Eq4403070003d6f62fb297c64106b3bd17517a5b7f0c].状态")) {
+		// System.out.println();
+		// }
 		SceneDataObject objectData = sv.parentObjectData;
 		SceneDataObject objectData = sv.parentObjectData;
 		SceneProperty sceneProperty = sv.rel_property;
 		SceneProperty sceneProperty = sv.rel_property;
 		if (sceneProperty.propertyValueType.equals("static")) {
 		if (sceneProperty.propertyValueType.equals("static")) {

+ 4 - 3
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RecursiveUtil.java

@@ -381,7 +381,6 @@ public class RecursiveUtil {
 		if (sv.rel_property != null && sv.rel_property.propertyValueType.equals("query")) {
 		if (sv.rel_property != null && sv.rel_property.propertyValueType.equals("query")) {
 			if (sv.value_object != null && sv.value_object.getRowChange() || sv.value_array != null && sv.value_array.getRowChange()
 			if (sv.value_object != null && sv.value_object.getRowChange() || sv.value_array != null && sv.value_array.getRowChange()
 					|| sv.value_prim != null && sv.value_prim.getRowChange()) {
 					|| sv.value_prim != null && sv.value_prim.getRowChange()) {
-				log.info(getPath(sv));
 				ReentrantLock lock = Repository.property2lock.get(sv.rel_property);
 				ReentrantLock lock = Repository.property2lock.get(sv.rel_property);
 				try {
 				try {
 					lock.lock();
 					lock.lock();
@@ -393,7 +392,7 @@ public class RecursiveUtil {
 		}
 		}
 	}
 	}
 
 
-	public static String getPath(Object sv) throws Exception {
+	public static String getDataPath(Object sv) throws Exception {
 		List<Object> list = new ArrayList<Object>();
 		List<Object> list = new ArrayList<Object>();
 		{
 		{
 			Object tmp = sv;
 			Object tmp = sv;
@@ -420,7 +419,9 @@ public class RecursiveUtil {
 				SceneDataObject tmpData = (SceneDataObject) tmp;
 				SceneDataObject tmpData = (SceneDataObject) tmp;
 				if (tmpData.myPropertyName == null) {
 				if (tmpData.myPropertyName == null) {
 					SceneDataValue sdvInner = tmpData.get("名称") != null ? tmpData.get("名称") : tmpData.get("id");
 					SceneDataValue sdvInner = tmpData.get("名称") != null ? tmpData.get("名称") : tmpData.get("id");
-					sb.append((sb.length() > 0 ? "." : "") + "[" + sdvInner.value_prim.value + "]");
+					if (sdvInner != null) {
+						sb.append((sb.length() > 0 ? "." : "") + "[" + (sdvInner.value_prim == null ? "null" : sdvInner.value_prim.value) + "]");
+					}
 				} else {
 				} else {
 					sb.append((sb.length() > 0 ? "." : "") + tmpData.myPropertyName);
 					sb.append((sb.length() > 0 ? "." : "") + tmpData.myPropertyName);
 				}
 				}