瀏覽代碼

加载设备有bug,修复

menglu 3 年之前
父節點
當前提交
585bb28c95

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

@@ -44,7 +44,7 @@ public class RWDDownloadUtil {
 			String post_result = HttpClientUtil.post(Constant.zkt_monitor_url + "/generalDictionary/list", param.toJSONString());
 			JSONObject resultJSON = JSON.parseObject(post_result);
 			classArray = resultJSON.getJSONArray("Content");
-			if (classArray != null) {
+			if (classArray != null && classArray.size() == 1) {
 				break;
 			}
 		}

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

@@ -187,10 +187,10 @@ public class RWDLoadUtil {
 				String objType = Repository.code2objTypeMap.get(code);
 				if (objType != null) {
 					if (!objectArrayDic.containsKey(objType)) {
-						objectArrayDic.put(objType, new SceneDataValue(null, null, null, null));
+						SceneDataValue objTypeSDV = new SceneDataValue(null, null, null, null);
+						objTypeSDV.value_array = new SceneDataSet(false);
+						objectArrayDic.put(objType, objTypeSDV);
 					}
-					objectArrayDic.get(objType).value_array = new SceneDataSet(false);
-					objectArrayDic.get(objType).value_array.set = new ArrayList<SceneDataObject>();
 					objectArrayDic.get(objType).value_array.set.addAll(SceneDataSet.set);
 					for (String col : SceneDataSet.getColChange().keySet()) {
 						objectArrayDic.get(objType).value_array.setColChange(col);