public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-16 05:50:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(数据源): 修复API数据源分页错误

Browse Source
This commit is contained in:
taojinlong
2025-01-22 14:08:28 +08:00
committed by taojinlong
parent c59d3e49db
commit 550afadb31
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ public class ApiUtils {
dataList.addAll(fetchResult(response, apiDefinition));
String cursor = null;
try {
cursor = JsonPath.read(response, apiDefinition.getRequest().getPage().getResponseData().get(0).getResolutionPath());
cursor = JsonPath.read(response, apiDefinition.getRequest().getPage().getResponseData().get(0).getResolutionPath()).toString();
} catch (Exception e) {
}
while (cursor != null) {
@@ -107,7 +107,11 @@ public class ApiUtils {
response = execHttpRequest(false, apiDefinition, apiDefinition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), params(datasourceRequest));
dataList.addAll(fetchResult(response, apiDefinition));
try {
cursor = JsonPath.read(response, apiDefinition.getRequest().getPage().getResponseData().get(0).getResolutionPath());
if (cursor.equalsIgnoreCase(JsonPath.read(response, apiDefinition.getRequest().getPage().getResponseData().get(0).getResolutionPath()).toString())) {
cursor = null;
} else {
cursor = JsonPath.read(response, apiDefinition.getRequest().getPage().getResponseData().get(0).getResolutionPath()).toString();
}
} catch (Exception e) {
cursor = null;
}

3
core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java
View File

@@ -45,7 +45,8 @@ public class H2EngineProvider extends EngineProvider {
for (int i = 0; i < strings.length; i++) {
if (tableFields.get(i).isChecked()) {
if (StringUtils.isEmpty(strings[i])) {
if (tableFields.get(i).getFieldType().equals("LONG") || tableFields.get(i).getFieldType().equals("DOUBLE")) {
String type = tableFields.get(i).getType() == null ? tableFields.get(i).getFieldType() : tableFields.get(i).getType();
if (type.equals("LONG") || type.equals("DOUBLE")) {
strings1[length] = "0";
} else {
strings1[length] = null;

3
core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java
View File

@@ -52,7 +52,8 @@ public class MysqlEngineProvider extends EngineProvider {
for (int i = 0; i < strings.length; i++) {
if (tableFields.get(i).isChecked()) {
if (StringUtils.isEmpty(strings[i])) {
if (tableFields.get(i).getFieldType().equals("LONG") || tableFields.get(i).getFieldType().equals("DOUBLE")) {
String type = tableFields.get(i).getType() == null ? tableFields.get(i).getFieldType() : tableFields.get(i).getType();
if (type.equals("LONG") || type.equals("DOUBLE")) {
strings1[length] = "0";
} else {
strings1[length] = null;