center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat: API数据源支持输入jsonpath

Browse Source
This commit is contained in:
taojinlong 2023-01-17 16:59:20 +08:00
parent eb74494c5f
commit f0de908748
6 changed files with 145 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java
View File

@ -23,5 +23,7 @@ public class ApiDefinition {
private int previewNum = 10;
private int maxPreviewNum = 10;
private int serialNumber;
private boolean useJsonPath;
private String jsonPath;
}

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

@ -125,7 +125,6 @@ public class ApiProvider extends Provider {
}
static public String execHttpRequest(ApiDefinition apiDefinition, int socketTimeout) throws Exception {
String response = "";
HttpClientConfig httpClientConfig = new HttpClientConfig();
httpClientConfig.setSocketTimeout(socketTimeout * 1000);
@ -135,7 +134,6 @@ public class ApiProvider extends Provider {
httpClientConfig.addHeader(header.get("name").toString(), header.get("value").toString());
}
}
if (apiDefinitionRequest.getAuthManager() != null
&& StringUtils.isNotBlank(apiDefinitionRequest.getAuthManager().getUsername())
&& StringUtils.isNotBlank(apiDefinitionRequest.getAuthManager().getPassword())
@ -188,27 +186,72 @@ public class ApiProvider extends Provider {
throw new Exception("该请求返回数据为空");
}
List<JSONObject> fields = new ArrayList<>();
String rootPath;
if (response.startsWith("[")) {
rootPath = "$[*]";
JSONArray jsonArray = JSONObject.parseArray(response);
for (Object o : jsonArray) {
handleStr(apiDefinition, o.toString(), fields, rootPath);
if (apiDefinition.isUseJsonPath()) {
List<LinkedHashMap> currentData = new ArrayList<>();
Object object = JsonPath.read(response, apiDefinition.getJsonPath());
if (object instanceof List) {
currentData = (List<LinkedHashMap>) object;
} else {
currentData.add((LinkedHashMap) object);
}
for (LinkedHashMap data : currentData) {
int i = 0;
if (i >= apiDefinition.getPreviewNum()) {
break;
}
if (i == 0) {
for (Object o : data.keySet()) {
JSONObject field = new JSONObject();
field.put("originName", o.toString());
field.put("name", o.toString());
field.put("type", "STRING");
field.put("checked", true);
field.put("size", 65535);
field.put("deExtractType", 0);
field.put("deType", 0);
field.put("extField", 0);
fields.add(field);
}
}
for (JSONObject field : fields) {
JSONArray array = field.getJSONArray("value");
if (array != null) {
array.add(Optional.ofNullable(data.get(field.getString("originName"))).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " "));
} else {
array = new JSONArray();
array.add(Optional.ofNullable(data.get(field.getString("originName"))).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " "));
}
field.put("value", array);
i++;
}
}
apiDefinition.setJsonFields(fields);
return apiDefinition;
} else {
rootPath = "$";
handleStr(apiDefinition, response, fields, rootPath);
}
for (JSONObject field : fields) {
if (field.containsKey("children") && CollectionUtils.isNotEmpty(field.getJSONArray("children"))) {
field.put("disabled", false);
String rootPath;
if (response.startsWith("[")) {
rootPath = "$[*]";
JSONArray jsonArray = JSONObject.parseArray(response);
for (Object o : jsonArray) {
handleStr(apiDefinition, o.toString(), fields, rootPath);
}
} else {
rootPath = "$";
handleStr(apiDefinition, response, fields, rootPath);
}
if (field.containsKey("children") && CollectionUtils.isEmpty(field.getJSONArray("children"))) {
field.put("disabled", true);
for (JSONObject field : fields) {
if (field.containsKey("children") && CollectionUtils.isNotEmpty(field.getJSONArray("children"))) {
field.put("disabled", false);
}
if (field.containsKey("children") && CollectionUtils.isEmpty(field.getJSONArray("children"))) {
field.put("disabled", true);
}
}
apiDefinition.setJsonFields(fields);
return apiDefinition;
}
apiDefinition.setJsonFields(fields);
return apiDefinition;
}
@ -362,7 +405,7 @@ public class ApiProvider extends Provider {
private List<String[]> fetchResult(String result, ApiDefinition apiDefinition) {
List<String[]> dataList = new LinkedList<>();
if (StringUtils.isNotEmpty(apiDefinition.getDataPath()) && CollectionUtils.isEmpty(apiDefinition.getJsonFields())) {
if(apiDefinition.isUseJsonPath()){
List<LinkedHashMap> currentData = new ArrayList<>();
Object object = JsonPath.read(result, apiDefinition.getDataPath());
if (object instanceof List) {
@ -379,30 +422,49 @@ public class ApiProvider extends Provider {
}
dataList.add(row);
}
} else {
List<String> jsonPaths = apiDefinition.getFields().stream().map(DatasetTableFieldDTO::getJsonPath).collect(Collectors.toList());
Long maxLength = 0l;
List<List<String>> columnDataList = new ArrayList<>();
for (int i = 0; i < jsonPaths.size(); i++) {
List<String> data = new ArrayList<>();
Object object = JsonPath.read(result, jsonPaths.get(i));
if (object instanceof List && jsonPaths.get(i).contains("[*]")) {
data = (List<String>) object;
}else {
if (StringUtils.isNotEmpty(apiDefinition.getDataPath()) && CollectionUtils.isEmpty(apiDefinition.getJsonFields())) {
List<LinkedHashMap> currentData = new ArrayList<>();
Object object = JsonPath.read(result, apiDefinition.getDataPath());
if (object instanceof List) {
currentData = (List<LinkedHashMap>) object;
} else {
if (object != null) {
data.add(object.toString());
}
currentData.add((LinkedHashMap) object);
}
maxLength = maxLength > data.size() ? maxLength : data.size();
columnDataList.add(data);
}
for (int i = 0; i < maxLength; i++) {
String[] row = new String[apiDefinition.getFields().size()];
dataList.add(row);
}
for (int i = 0; i < columnDataList.size(); i++) {
for (int j = 0; j < columnDataList.get(i).size(); j++) {
dataList.get(j)[i] = Optional.ofNullable(String.valueOf(columnDataList.get(i).get(j))).orElse("").replaceAll("\n", " ").replaceAll("\r", " ");
for (LinkedHashMap data : currentData) {
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", " ");
i++;
}
dataList.add(row);
}
} else {
List<String> jsonPaths = apiDefinition.getFields().stream().map(DatasetTableFieldDTO::getJsonPath).collect(Collectors.toList());
Long maxLength = 0l;
List<List<String>> columnDataList = new ArrayList<>();
for (int i = 0; i < jsonPaths.size(); i++) {
List<String> data = new ArrayList<>();
Object object = JsonPath.read(result, jsonPaths.get(i));
if (object instanceof List && jsonPaths.get(i).contains("[*]")) {
data = (List<String>) object;
} else {
if (object != null) {
data.add(object.toString());
}
}
maxLength = maxLength > data.size() ? maxLength : data.size();
columnDataList.add(data);
}
for (int i = 0; i < maxLength; i++) {
String[] row = new String[apiDefinition.getFields().size()];
dataList.add(row);
}
for (int i = 0; i < columnDataList.size(); i++) {
for (int j = 0; j < columnDataList.get(i).size(); j++) {
dataList.get(j)[i] = Optional.ofNullable(String.valueOf(columnDataList.get(i).get(j))).orElse("").replaceAll("\n", " ").replaceAll("\r", " ");
}
}
}
}

2
frontend/src/lang/en.js
View File

@ -1894,7 +1894,9 @@ export default {
base_info: 'Basic information',
column_info: 'Data structure',
request: 'Request',
isUseJsonPath: 'Specify JsonPath or not',
path_all_info: 'Please fill in the full address',
jsonpath_info: 'Please fill in JsonPath',
req_param: 'Request parameters',
headers: 'Request header',
key: 'Key',

2
frontend/src/lang/tw.js
View File

@ -1888,7 +1888,9 @@ export default {
base_info: '基礎信息',
column_info: '資料結構',
request: '請求',
isUseJsonPath: '是否指定JsonPath',
path_all_info: '請輸入完整地址',
jsonpath_info: '請輸入JsonPath',
req_param: '請求參數',
headers: '請求頭',
key: '鍵',

2
frontend/src/lang/zh.js
View File

@ -1887,7 +1887,9 @@ export default {
base_info: '基础信息',
column_info: '数据结构',
request: '请求',
isUseJsonPath: '是否指定JsonPath',
path_all_info: '请填入完整地址',
jsonpath_info: '请填入JsonPath',
req_param: '请求参数',
headers: '请求头',
key: '键',

36
frontend/src/views/system/datasource/DsConfiguration.vue
View File

@ -535,6 +535,32 @@
/>
</el-form-item>
</div>
<el-form-item
:label="$t('datasource.isUseJsonPath')"
prop="url"
>
<el-input
v-model="apiItem.jsonPath"
:placeholder="$t('datasource.jsonpath_info')"
class="input-with-select"
size="small"
>
<el-select
slot="prepend"
v-model="apiItem.useJsonPath"
style="width: 100px"
size="small"
>
<el-option
v-for="item in isUseJsonPath"
:key="item.id"
:label="item.label"
:value="item.id"
/>
</el-select>
</el-input>
</el-form-item>
</el-form>
</el-row>
<el-row v-show="active === 2">
@ -567,7 +593,7 @@
<el-checkbox
:key="scope.row.jsonPath"
v-model="scope.row.checked"
:disabled="scope.row.disabled"
:disabled="scope.row.disabled || apiItem.useJsonPath"
@change="handleCheckAllChange(scope.row)"
>
{{ scope.row.originName }}
@ -973,12 +999,18 @@ export default {
originName: 'comments',
deExtractType: 0
}
]
],
useJsonPath: false,
jsonPath: ''
},
reqOptions: [
{ id: 'GET', label: 'GET' },
{ id: 'POST', label: 'POST' }
],
isUseJsonPath: [
{ id: true, label: this.$t('commons.yes') },
{ id: false, label: this.$t('commons.no') }
],
loading: false,
responseData: { type: 'HTTP', responseResult: {}, subRequestResults: [] },
api_step2_active_name: 'first',