mirror of
https://github.com/yanlongqi/jhinno-openapi-java-sdk.git
synced 2026-03-22 06:15:10 +08:00
fix: 修复作业分页查询的参数传递错误并优化测试代码
- 修复JHJobApiExecution中condition参数错误传递params的问题 - 更新测试配置服务器地址和访问密钥 - 添加getCondition辅助方法用于构建查询条件 - 优化JobApiTest的测试用例 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -96,7 +96,7 @@ public class JHJobApiExecution extends JHApiExecutionAbstract {
|
|||||||
params.put("status", status.getStatus());
|
params.put("status", status.getStatus());
|
||||||
}
|
}
|
||||||
if (CollectionUtil.isNotEmpty(condition)) {
|
if (CollectionUtil.isNotEmpty(condition)) {
|
||||||
params.put("condition", JsonUtil.objectToString(params));
|
params.put("condition", JsonUtil.objectToString(condition));
|
||||||
}
|
}
|
||||||
String path = JHApiClient.getUrl(JobPathConstant.JOB_PAGE_PATH, params);
|
String path = JHApiClient.getUrl(JobPathConstant.JOB_PAGE_PATH, params);
|
||||||
return execution.get(path, username, new TypeReference<ResponseResult<PageJobInfo>>() {
|
return execution.get(path, username, new TypeReference<ResponseResult<PageJobInfo>>() {
|
||||||
|
|||||||
@@ -15,13 +15,13 @@ public class JHClientConfig {
|
|||||||
public static final JHApiRequestHandler REQUEST_HANDLER = new JHApiRequestHandler() {
|
public static final JHApiRequestHandler REQUEST_HANDLER = new JHApiRequestHandler() {
|
||||||
@Override
|
@Override
|
||||||
public String getCurrentUserName() {
|
public String getCurrentUserName() {
|
||||||
return "yanlongqi";
|
return "lqyan";
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
public static final String APPFORM_SERVER_URL = "https://172.20.0.200";
|
public static final String APPFORM_SERVER_URL = "https://192.168.41.12";
|
||||||
public static final String ACCESS_KEY = "8147c7470bfd4a27952fe750c6bc7cef";
|
public static final String ACCESS_KEY = "74e02e60d47343299e4c130ea4a7685d";
|
||||||
public static final String ACCESS_KEY_SECRET = "899b13f590394c3daafc6468fed4b1df";
|
public static final String ACCESS_KEY_SECRET = "91ff101a1f7542dfb00049c39b4e8995";
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -4,10 +4,8 @@ import com.jhinno.sdk.openapi.api.job.*;
|
|||||||
import com.jhinno.sdk.openapi.test.JHClientConfig;
|
import com.jhinno.sdk.openapi.test.JHClientConfig;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.*;
|
||||||
import java.util.HashMap;
|
import java.util.stream.Collectors;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 作业相关测试类
|
* 作业相关测试类
|
||||||
@@ -39,12 +37,35 @@ public class JobApiTest {
|
|||||||
System.out.println(execution.getJobFilesById("jhadmin", "42"));
|
System.out.println(execution.getJobFilesById("jhadmin", "42"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public Map<String, Object> getCondition(List<String> ids) {
|
||||||
|
List<Map<String, Object>> filterItem = ids.stream().map(t -> {
|
||||||
|
Map<String, Object> filterEnum = new HashMap<>();
|
||||||
|
filterEnum.put("field", "id");
|
||||||
|
filterEnum.put("operator", "eq");
|
||||||
|
filterEnum.put("ignoreCase", true);
|
||||||
|
filterEnum.put("value", t);
|
||||||
|
filterEnum.put("type", "string");
|
||||||
|
return filterEnum;
|
||||||
|
}).collect(Collectors.toList());
|
||||||
|
|
||||||
|
Map<String, Object> filters = new HashMap<>();
|
||||||
|
filters.put("type", "enum");
|
||||||
|
filters.put("operator", "contains");
|
||||||
|
filters.put("ignoreCase", true);
|
||||||
|
filters.put("logic", "or");
|
||||||
|
filters.put("field", "id");
|
||||||
|
filters.put("filters", filterItem);
|
||||||
|
return filters;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 测试分页查询作业列表
|
* 测试分页查询作业列表
|
||||||
*/
|
*/
|
||||||
@Test
|
@Test
|
||||||
public void testGetJobPage() {
|
public void testGetJobPage() {
|
||||||
PageJobInfo pages = execution.getJobPage("jhadmin", 1, 5, null, JobStatusEnum.DONE, null);
|
List<String> ids = Arrays.asList("192", "187");
|
||||||
|
PageJobInfo pages = execution.getJobPage("lqyan", 1, 5, null, (JobStatusEnum) null, getCondition(ids));
|
||||||
System.out.println(pages);
|
System.out.println(pages);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user