github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 【数据源】修复 api 自定义参数失败

Browse Source
This commit is contained in:
taojinlong 2025-01-08 11:55:37 +08:00 committed by taojinlong
parent 49966ab59e
commit 0a92376cc7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java
View File

@ -208,7 +208,7 @@ public class ApiUtils {
for (ApiDefinition definition : paramsList) { for (ApiDefinition definition : paramsList) {
for (int i = 0; i < definition.getFields().size(); i++) { for (int i = 0; i < definition.getFields().size(); i++) {
TableField field = definition.getFields().get(i); TableField field = definition.getFields().get(i);
if (field.getOriginName().equalsIgnoreCase(param)) { if (field.getName().equalsIgnoreCase(param)) {
String resultStr = execHttpRequest(true, definition, definition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), null); String resultStr = execHttpRequest(true, definition, definition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), null);
List<String[]> dataList = fetchResult(resultStr, definition); List<String[]> dataList = fetchResult(resultStr, definition);
if (dataList.size() > 0) { if (dataList.size() > 0) {
@ -230,7 +230,7 @@ public class ApiUtils {
for (ApiDefinition definition : paramsList) { for (ApiDefinition definition : paramsList) {
for (int i = 0; i < definition.getFields().size(); i++) { for (int i = 0; i < definition.getFields().size(); i++) {
TableField field = definition.getFields().get(i); TableField field = definition.getFields().get(i);
if (field.getOriginName().equalsIgnoreCase(param)) { if (field.getName().equalsIgnoreCase(param)) {
String resultStr = execHttpRequest(true, definition, definition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), null); String resultStr = execHttpRequest(true, definition, definition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), null);
List<String[]> dataList = fetchResult(resultStr, definition); List<String[]> dataList = fetchResult(resultStr, definition);
if (dataList.size() > 0) { if (dataList.size() > 0) {
@ -272,7 +272,7 @@ public class ApiUtils {
for (ApiDefinition definition : paramsList) { for (ApiDefinition definition : paramsList) {
for (int i = 0; i < definition.getFields().size(); i++) { for (int i = 0; i < definition.getFields().size(); i++) {
TableField field = definition.getFields().get(i); TableField field = definition.getFields().get(i);
if (field.getOriginName().equalsIgnoreCase(param)) { if (field.getName().equalsIgnoreCase(param)) {
String resultStr = execHttpRequest(true, definition, definition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), null); String resultStr = execHttpRequest(true, definition, definition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), null);
List<String[]> dataList = fetchResult(resultStr, definition); List<String[]> dataList = fetchResult(resultStr, definition);
if (dataList.size() > 0) { if (dataList.size() > 0) {
@ -294,7 +294,7 @@ public class ApiUtils {
for (ApiDefinition definition : paramsList) { for (ApiDefinition definition : paramsList) {
for (int i = 0; i < definition.getFields().size(); i++) { for (int i = 0; i < definition.getFields().size(); i++) {
TableField field = definition.getFields().get(i); TableField field = definition.getFields().get(i);
if (field.getOriginName().equalsIgnoreCase(param)) { if (field.getName().equalsIgnoreCase(param)) {
String resultStr = execHttpRequest(true, definition, definition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), null); String resultStr = execHttpRequest(true, definition, definition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), null);
List<String[]> dataList = fetchResult(resultStr, definition); List<String[]> dataList = fetchResult(resultStr, definition);
if (dataList.size() > 0) { if (dataList.size() > 0) {
@ -749,7 +749,7 @@ public class ApiUtils {
String[] row = new String[apiDefinition.getFields().size()]; String[] row = new String[apiDefinition.getFields().size()];
int i = 0; int i = 0;
for (TableField field : apiDefinition.getFields()) { for (TableField field : apiDefinition.getFields()) {
row[i] = Optional.ofNullable(data.get(field.getName())).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " "); row[i] = Optional.ofNullable(data.get(field.getOriginName())).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " ");
i++; i++;
} }
dataList.add(row); dataList.add(row);