Browse Source

返回prim有bug,修复

menglu 3 years ago
parent
commit
6ba360fe36

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

@@ -69,7 +69,7 @@ public class SceneDataValue {
 				JSONArray result = new JSONArray();
 				if (this.value_array.isSingleValueSet) {
 					for (int i = 0; i < this.value_array.singleValueSet.size(); i++) {
-						result.add(this.value_array.singleValueSet.get(i).value_prim);
+						result.add(this.value_array.singleValueSet.get(i).value_prim.value);
 					}
 				} else {
 					for (int i = 0; i < this.value_array.set.size(); i++) {

+ 3 - 3
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/RestUtil.java

@@ -214,9 +214,9 @@ public class RestUtil {
 			sb.append(currData.myPropertyName);
 			sb.append("\t");
 			if (currData.value_array != null) {
-				sb.append(currData.value_array.getRowChange());
+				sb.append(currData.value_array.getRowChange() + "\t" + currData.value_array.getColChange());
 			} else if (currData.value_object != null) {
-				sb.append(currData.value_object.getRowChange());
+				sb.append(currData.value_object.getRowChange() + "\t" + currData.value_array.getColChange());
 			} else if (currData.value_prim != null) {
 				sb.append(currData.value_prim.getRowChange());
 			}
@@ -246,7 +246,7 @@ public class RestUtil {
 				sb.append("null");
 				sb.append("\t");
 			}
-			sb.append(currData.getRowChange());
+			sb.append(currData.getRowChange() + "\t" + currData.getColChange());
 			sb.append("(");
 			if (currData.rel_object != null) {
 				sb.append(currData.rel_object);

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

@@ -15,7 +15,7 @@ public class RWDUtil {
 		SceneDataObject sod = new SceneDataObject(null, null, null, null, null, null, null);
 		for (String kpKey : arrayItem.keySet()) {
 			Object kpValue = arrayItem.get(kpKey);
-			SceneDataValue svInner = new SceneDataValue(null, sod, kpKey, null);
+			SceneDataValue svInner = new SceneDataValue(null, null, null, null);
 			svInner.value_prim = new SceneDataPrimitive();
 			svInner.value_prim.value = kpValue;
 			svInner.finish = true;
@@ -29,10 +29,10 @@ public class RWDUtil {
 		sv.value_array.set = new ArrayList<SceneDataObject>();
 		for (int i = 0; i < array.size(); i++) {
 			JSONObject arrayItem = (JSONObject) array.get(i);
-			SceneDataObject sod = new SceneDataObject(null, null, null, sv, null, null, null);
+			SceneDataObject sod = new SceneDataObject(null, null, null, null, null, null, null);
 			for (String kpKey : arrayItem.keySet()) {
 				Object kpValue = arrayItem.get(kpKey);
-				SceneDataValue svInner = new SceneDataValue(null, sod, kpKey, null);
+				SceneDataValue svInner = new SceneDataValue(null, null, null, null);
 				svInner.value_prim = new SceneDataPrimitive();
 				svInner.value_prim.value = kpValue;
 				svInner.finish = true;
@@ -50,7 +50,7 @@ public class RWDUtil {
 			SceneDataObject sod = new SceneDataObject(null, null, null, null, null, null, null);
 			for (String kpKey : arrayItem.keySet()) {
 				Object kpValue = arrayItem.get(kpKey);
-				SceneDataValue svInner = new SceneDataValue(null, sod, kpKey, null);
+				SceneDataValue svInner = new SceneDataValue(null, null, null, null);
 				svInner.value_prim = new SceneDataPrimitive();
 				svInner.value_prim.value = kpValue;
 				svInner.finish = true;