Browse Source

子系统连接状态加黑名单

menglu 3 years ago
parent
commit
928e003325

+ 1 - 1
ibms-data-sdk/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.persagy</groupId>
 	<artifactId>ibms-data-sdk</artifactId>
-	<version>0.0.7</version>
+	<version>0.0.8</version>
 
 	<repositories>
 		<repository>

+ 8 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/Constant.java

@@ -64,6 +64,7 @@ public class Constant {
 	public static Map<String, String> SceneCode2TabName = new ConcurrentHashMap<String, String>();
 
 	public static Map<String, Map<String, String>> info_replaceMap = new ConcurrentHashMap<String, Map<String, String>>();
+	public static Map<String, Boolean> subsystem_connect_status_excludeMap = new ConcurrentHashMap<String, Boolean>();
 
 	public static Map<String, Boolean> objType_hasRelation = new ConcurrentHashMap<String, Boolean>();
 	public static List<ConfigRelation> ConfigRelationList = new CopyOnWriteArrayList<ConfigRelation>();
@@ -242,6 +243,13 @@ public class Constant {
 					info_replaceMap.get(objType).put(from, to);
 				}
 
+				iter = document.selectNodes("/root/subsystem_connect_status_exclude").iterator();
+				while (iter.hasNext()) {
+					element = (Element) iter.next();
+					String ibmsSceneCode = element.attribute("ibmsSceneCode").getValue();
+					subsystem_connect_status_excludeMap.put(ibmsSceneCode, true);
+				}
+
 				iter = document.selectNodes("/root/ConfigRelation").iterator();
 				while (iter.hasNext()) {
 					element = (Element) iter.next();

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

@@ -576,6 +576,9 @@ public class RWDLoadUtil {
 				JSONObject sceneItem = (JSONObject) sceneArray.get(i);
 				String ibmsSceneCode = (String) sceneItem.get("id");
 				String name = (String) sceneItem.get("名称");
+				if (Constant.subsystem_connect_status_excludeMap.containsKey(ibmsSceneCode)) {
+					continue;
+				}
 				if (!subsystem_connect_statusMap.containsKey(ibmsSceneCode)) {
 					SceneDataObject sdoInner = new SceneDataObject(null, null, null, null, null, null, null);
 					{
@@ -972,7 +975,7 @@ public class RWDLoadUtil {
 						pointListItem.put("equipTypeName", equipTypeName);
 						pointListItem.put("infoCode", infoCode);
 						pointListItem.put("infoType", infoType);
-						pointListItem.put("isVisible", (infoType != null && infoType.equals("运行参数")||infoType.equals("设定参数")) ? true : false);
+						pointListItem.put("isVisible", (infoType != null && infoType.equals("运行参数") || infoType.equals("设定参数")) ? true : false);
 						pointListItem.put("isBatchControlParam", (isBatchControlParam != null && isBatchControlParam.equals("Y")) ? true : false);
 						pointListItem.put("isKeyPoint", (isKeyPoint != null && isKeyPoint.equals("Y")) ? true : false);
 						InfoPointListArray.add(pointListItem);

+ 10 - 0
ibms-data-sdk/src/main/resources/config.xml

@@ -38,10 +38,12 @@
 	<info_replace objType="building" from="localName" to="ibmsxianshimingcheng" />
 	<info_replace objType="floor" from="localId" to="ibmsxianshibianma" />
 	<info_replace objType="floor" from="localName" to="ibmsxianshimingcheng" />
+	<!-- 非万达用下面四行 -->
 	<info_replace objType="space" from="localId" to="ibmsxianshibianma" />
 	<info_replace objType="space" from="localName" to="ibmsxianshimingcheng" />
 	<info_replace objType="equipment" from="localId" to="ibmsxianshibianma" />
 	<info_replace objType="equipment" from="localName" to="ibmsxianshimingcheng" />
+	<!-- 万达用下面四行 -->
 	<!--
 	<info_replace objType="space" from="wD_huiyunbendibianma" to="ibmsxianshibianma" />
 	<info_replace objType="space" from="wD_huiyunbendimingcheng" to="ibmsxianshimingcheng" />
@@ -49,6 +51,14 @@
 	<info_replace objType="equipment" from="wD_huiyunbendimingcheng" to="ibmsxianshimingcheng" />
 	-->
 
+	<!-- 子系统连接状态里面,产品模块黑名单 -->
+	<!--
+	<subsystem_connect_status_exclude ibmsSceneCode="xfsxt" />
+	<subsystem_connect_status_exclude ibmsSceneCode="lcpd" />
+	<subsystem_connect_status_exclude ibmsSceneCode="led" />
+	<subsystem_connect_status_exclude ibmsSceneCode="rdsb" />
+	-->
+
 	<!-- 数据中台物理世界对象初始加载的关系,供SDK配置中使用 -->
 	<ConfigRelation graphCode="ArchSubset" relCode="Bd2Fl" objFrom="building" objTo="floor" nameInTo="所属建筑" multiplicityTo="1" />
 	<ConfigRelation graphCode="ArchSubset" relCode="Bd2Sp" objFrom="building" objTo="space" nameInTo="所属建筑" multiplicityTo="1" />