完善excel过滤功能

ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDRepositoryUtil.java

@@ -242,6 +242,7 @@ public class RWDRepositoryUtil {
 								continue;
 							}
 							String SceneCode = SceneName2Code.get(SceneName);
+							log.warn("scan " + SceneCode + "\t" + parentPath + "'名称=" + SceneName);
 
 							if (!SceneVisible.containsKey(SceneCode)) {
 								continue;
@@ -305,13 +306,20 @@ public class RWDRepositoryUtil {
 								} else if (spInner2.propertyName.equals("系统概览")) {
 									if (spInner2.propertyValueType.equals("static") && spInner2.propertyValueSchema.equals("JSONArray")) {
 										gailan = spInner2;
-									} else {
+									} else if (spInner2.propertyValueType.equals("query") && spInner2.propertyValueSchema.equals("JSONArray")) {
 										for (SceneProperty spInner2_att : spInner2.query_attached) {
 											if (spInner2_att.propertyName.equals("设备类型")) {
 												equipType_gl = spInner2_att;
 												break;
 											}
 										}
+									} else if (spInner2.propertyValueType.equals("custom")) {
+										for (SceneProperty spInner2_att : spInner2.custom_object.propertyList) {
+											if (spInner2_att.propertyName.equals("设备类型")) {
+												equipType_gl = spInner2_att;
+												break;
+											}
+										}
 									}
 								}
 							}
@@ -388,6 +396,7 @@ public class RWDRepositoryUtil {
 				if (SceneCode.equals("sbzwy")) {
 					continue;
 				}
+				log.warn("scan " + SceneCode + "\t" + Path);
 				for (SceneObject soEquipType : equipType.static_array) {
 					SceneProperty spName = null;
 					SceneProperty spList = null;
@@ -398,9 +407,6 @@ public class RWDRepositoryUtil {
 							spName = spInner2;
 						}
 					}
-					if (spList == null) {
-						continue;
-					}
 					String ibmsSceneCode = null;
 					String ibmsClassCode = null;
 					if (spList != null && spList.propertyValueType.equals("query")) {
@@ -449,7 +455,7 @@ public class RWDRepositoryUtil {
 					}
 					boolean isVisible = SceneClassVisible.get(ibmsSceneCode).get(ibmsClassCode);
 					if (!isVisible) {
-						log.warn("info-point-new delete " + Path + "'名称=" + spName.static_value);
+						log.warn("info-point-new delete " + SceneName + " " + SceneCode + "\t" + Path + "'名称=" + spName.static_value);
 						soEquipType.allow_pass = "0";
 					}
 				}