public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-13 17:14:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(数据集): 修复api数据源中，json格式字段保存为不标准json格式，导致无法通过计算字段的函数解析 #17772

Browse Source
This commit is contained in:
taojinlong
2026-01-22 21:13:16 +08:00
parent 676e678c20
commit 844aea3522
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
View File

@@ -105,7 +105,7 @@ public class ApiProvider extends Provider {
@Override
public Status checkDsStatus(DatasourceRequest datasourceRequest) throws Exception {
Status status = new Status();
Status status = new Status();
status.setStatus(checkStatus(datasourceRequest));
return status;
}
@@ -226,12 +226,19 @@ public class ApiProvider extends Provider {
}
}
for (JSONObject field : fields) {
String value = Optional.ofNullable(data.get(field.get("originName"))).orElse("").toString();
if (value.startsWith("{") && value.endsWith("}")) {
try {
value = CommonBeanFactory.getBean(ObjectMapper.class).writeValueAsString(data.get(field.get("originName")));
} catch (Exception e) {
}
}
JSONArray array = field.getJSONArray("value");
if (array != null) {
array.add(Optional.ofNullable(data.get(field.getString("originName"))).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " "));
array.add(value.replaceAll("\n", " ").replaceAll("\r", " "));
} else {
array = new JSONArray();
array.add(Optional.ofNullable(data.get(field.getString("originName"))).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " "));
array.add(value.replaceAll("\n", " ").replaceAll("\r", " "));
}
field.put("value", array);
}
@@ -283,7 +290,7 @@ public class ApiProvider extends Provider {
JSONObject jsonObject = JSONObject.parseObject(jsonStr, Feature.IgnoreNotMatch);
for (String s : jsonObject.keySet()) {
String value = jsonObject.getString(s);
if (StringUtils.isNotEmpty(value) && value.startsWith("{")) {
if (StringUtils.isNotEmpty(value) && value.startsWith("{")) {
value = JSONObject.toJSONString(jsonObject.getJSONObject(s), SerializerFeature.WriteMapNullValue);
}
if (StringUtils.isNotEmpty(value) && value.startsWith("[")) {
@@ -451,7 +458,15 @@ public class ApiProvider extends Provider {
String[] row = new String[apiDefinition.getFields().size()];
int i = 0;
for (DatasetTableFieldDTO field : apiDefinition.getFields()) {
row[i] = Optional.ofNullable(data.get(field.getOriginName())).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " ");
String value = Optional.ofNullable(data.get(field.getOriginName())).orElse("").toString();
if (value.startsWith("{") && value.endsWith("}")) {
try {
value = CommonBeanFactory.getBean(ObjectMapper.class).writeValueAsString(data.get(field.getOriginName()));
} catch (Exception e) {
}
}
row[i] = value.replaceAll("\n", " ").replaceAll("\r", " ");
i++;
}
dataList.add(row);