Browse Source

优化tostring

menglu 3 years ago
parent
commit
43f6cd1872

+ 23 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/data/SceneDataSet.java

@@ -4,6 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import com.alibaba.fastjson.JSONArray;
+import com.persagy.ibms.data.sdk.util.FastJsonUtil;
+
 public class SceneDataSet {
 	public boolean isSingleValueSet = false;
 	public List<SceneDataObject> set;
@@ -45,4 +48,24 @@ public class SceneDataSet {
 	public boolean hasColChange(String col) {
 		return this.change.colChangeMap.containsKey(col);
 	}
+
+	public JSONArray toJSON(int depth) {
+		JSONArray result = new JSONArray();
+		if (this.isSingleValueSet) {
+			for (int i = 0; i < this.singleValueSet.size(); i++) {
+				result.add(this.singleValueSet.get(i).value_prim.value);
+			}
+		} else {
+			for (int i = 0; i < this.set.size(); i++) {
+				SceneDataObject sod = this.set.get(i);
+				result.add(sod.toJSON(depth));
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		return FastJsonUtil.toString(this.toJSON(1));
+	}
 }

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

@@ -66,17 +66,7 @@ public class SceneDataValue {
 				JSONObject result = (JSONObject) this.value_object.toJSON(curr_depth);
 				return result;
 			} else if (this.value_array != null) {
-				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.value);
-					}
-				} else {
-					for (int i = 0; i < this.value_array.set.size(); i++) {
-						SceneDataObject sod = this.value_array.set.get(i);
-						result.add(sod.toJSON(curr_depth));
-					}
-				}
+				JSONArray result = this.value_array.toJSON(curr_depth);
 				return result;
 			} else if (this.value_prim != null) {
 				return this.value_prim.value;

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

@@ -1263,7 +1263,7 @@ public class QueryUtil {
 		if (UniqueReturnColumn != null) {
 			List<SceneDataValue> resultArray_new = new ArrayList<SceneDataValue>();
 			for (SceneDataObject setValue : resultArray.set) {
-				resultArray_new.add(setValue.value_object.get(UniqueReturnColumn));
+				resultArray_new.add(setValue.get(UniqueReturnColumn));
 			}
 			resultArray.singleValueSet = resultArray_new;
 			if (set.getRowChange()) {
@@ -1280,7 +1280,7 @@ public class QueryUtil {
 				SceneDataObject resultItem = new SceneDataObject(null, null, null, null, null, null, null);
 				for (Object jtoken : ReturnColumns) {
 					String column = (jtoken).toString();
-					resultItem.put(column, setValue.value_object.get(column));
+					resultItem.put(column, setValue.get(column));
 				}
 				resultArray_new.add(resultItem);
 			}