Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into upgrade

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/core/common/response/RegionTreeResponse.java

@@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class RegionTreeResponse {
 	
@@ -19,7 +21,7 @@ public class RegionTreeResponse {
 	private Boolean isBind;
 	private String type;
 	private Boolean isRegion;
-	private JSONArray position3d;
+	private JSONArray position3d = new JSONArray();;
 	private String routePath;
 	private String level;
 	private String levelStr;
@@ -30,7 +32,13 @@ public class RegionTreeResponse {
 	}
 
 	public void setPosition3d(String position3d) {
-		this.position3d = StringUtils.isEmpty(position3d) ? new JSONArray() : JSON.parseArray(position3d);
+		JSONArray jsonArray = new JSONArray();
+		if(!StringUtils.isEmpty(position3d)){
+			String[] arryStr = position3d.split(",");
+			List<Double> collect = Arrays.stream(arryStr).map(Double::parseDouble).collect(Collectors.toList());
+			jsonArray.addAll(collect);
+		}
+		this.position3d = jsonArray;
 	}
 
 	public Long getId() {