소스 검색

增加zkt查询

menglu 3 년 전
부모
커밋
564c3546ea

+ 12 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java

@@ -32,6 +32,11 @@ public class RWDLoadUtil {
 
 		{
 			JSONArray classArray = FastJsonReaderUtil.Instance().ReadJSONArray(new File(validPath + Constant.getSeperator() + "classArray.json"));
+			{
+				SceneDataSet SceneDataSet = new SceneDataSet(false);
+				SceneDataSet.set = RWDUtil.array2SDOList(classArray);
+				Repository.classArray = SceneDataSet;
+			}
 			for (int i = 0; i < classArray.size(); i++) {
 				JSONObject classItem = (JSONObject) classArray.get(i);
 				String objType = (String) classItem.get("objType");
@@ -484,8 +489,13 @@ public class RWDLoadUtil {
 
 		String objectPath = validPath + Constant.getSeperator() + "object";
 		{
-			Map<String, Map<String, SceneDataSet>> objectArrayDicZKT = new HashMap<String, Map<String, SceneDataSet>>();
 			JSONArray classArray = FastJsonReaderUtil.Instance().ReadJSONArray(new File(validPath + Constant.getSeperator() + "classArray.json"));
+			{
+				SceneDataSet SceneDataSet = new SceneDataSet(false);
+				SceneDataSet.set = RWDUtil.array2SDOList(classArray);
+				Repository.classArrayZKT = SceneDataSet;
+			}
+			Map<String, Map<String, SceneDataSet>> objectArrayDicZKT = new HashMap<String, Map<String, SceneDataSet>>();
 			for (int i = 0; i < classArray.size(); i++) {
 				JSONObject classItem = (JSONObject) classArray.get(i);
 				String ibmsSceneCode = (String) classItem.get("ibmsSceneCode");
@@ -512,7 +522,7 @@ public class RWDLoadUtil {
 					SceneDataObject sdo = Repository.id2sdv.get(id);
 					SceneDataSet.set.add(sdo);
 				}
-				mapInner.put(code, SceneDataSet);
+				mapInner.put(ibmsClassCode, SceneDataSet);
 			}
 			Repository.objectArrayDicZKT = objectArrayDicZKT;
 		}

+ 8 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RepositoryImpl.java

@@ -21,10 +21,12 @@ public class RepositoryImpl extends RepositoryBase {
 	public Map<String, String> code2objTypeMap = new HashMap<String, String>();
 
 	// 对象类型下属信息点
+	public SceneDataSet classArray = new SceneDataSet(false);
 	public Map<String, SceneDataSet> infoArrayDic = new HashMap<String, SceneDataSet>();
 	// 对象类型到对象实例清单
 	public Map<String, SceneDataSet> objectArrayDic = new HashMap<String, SceneDataSet>();
 	// 对象类型到对象实例清单
+	public SceneDataSet classArrayZKT = new SceneDataSet(false);
 	public Map<String, Map<String, SceneDataSet>> objectArrayDicZKT = new HashMap<String, Map<String, SceneDataSet>>();
 	// 所有对象实例清单
 	public SceneDataSet objectArrayAll = new SceneDataSet(false);
@@ -49,7 +51,9 @@ public class RepositoryImpl extends RepositoryBase {
 
 	public SceneDataSet ParseSource(JSONObject descSet, String Source) {
 		SceneDataSet result = null;
-		if (Source.equals("rwd")) {
+		if (Source.equals("class")) {
+			result = this.classArray;
+		} else if (Source.equals("rwd")) {
 			String rwd = (descSet.get("rwd")).toString();
 			if (rwd.equals("object")) {
 				if (descSet.containsKey("objType")) {
@@ -97,7 +101,9 @@ public class RepositoryImpl extends RepositoryBase {
 				result = new SceneDataSet(false);
 				result.setRowChange(false);
 			}
-		} else if (Source.equals("zkt")) {
+		} else if (Source.equals("zkt-class")) {
+			result = this.classArrayZKT;
+		} else if (Source.equals("zkt-object")) {
 			String ibmsSceneCode = (descSet.get("ibmsSceneCode")).toString();
 			String ibmsClassCode = (descSet.get("ibmsClassCode")).toString();
 			result = this.objectArrayDicZKT.get(ibmsSceneCode).get(ibmsClassCode);