4 Commits

Author SHA1 Message Date
7096ec5175 升级新版本 2025-12-24 21:35:25 +08:00
yanlongqi
4d70ec9bd6 解决查询历史作业方法不能传递自动以条件的问题 2025-12-24 20:58:50 +08:00
yanlongqi
0cdae4fba8 升级 2025-12-17 15:24:22 +08:00
yanlongqi
73691e1373 fix: 修复作业分页查询的参数传递错误并优化测试代码
- 修复JHJobApiExecution中condition参数错误传递params的问题
- 更新测试配置服务器地址和访问密钥
- 添加getCondition辅助方法用于构建查询条件
- 优化JobApiTest的测试用例

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-09 15:56:58 +08:00
7 changed files with 36 additions and 14 deletions

View File

@@ -13,7 +13,7 @@
<parent>
<groupId>com.jhinno</groupId>
<artifactId>jhinno-openapi-java-sdk-parent</artifactId>
<version>2.0.6</version>
<version>2.0.8</version>
</parent>
<dependencies>

View File

@@ -96,7 +96,7 @@ public class JHJobApiExecution extends JHApiExecutionAbstract {
params.put("status", status.getStatus());
}
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);
return execution.get(path, username, new TypeReference<ResponseResult<PageJobInfo>>() {
@@ -155,7 +155,7 @@ public class JHJobApiExecution extends JHApiExecutionAbstract {
params.put("status", status.getStatus());
}
if (CollectionUtil.isNotEmpty(condition)) {
params.put("condition", JsonUtil.objectToString(params));
params.put("condition", JsonUtil.objectToString(condition));
}
String path = JHApiClient.getUrl(JobPathConstant.JOB_HISTORY_JOBS_PATH, params);

View File

@@ -15,7 +15,7 @@ public class JHClientConfig {
public static final JHApiRequestHandler REQUEST_HANDLER = new JHApiRequestHandler() {
@Override
public String getCurrentUserName() {
return "yanlongqi";
return "lqyan";
}
};

View File

@@ -2,12 +2,11 @@ package com.jhinno.sdk.openapi.test.job;
import com.jhinno.sdk.openapi.api.job.*;
import com.jhinno.sdk.openapi.test.JHClientConfig;
import com.jhinno.sdk.openapi.utils.JsonUtil;
import org.junit.Test;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
* 作业相关测试类
@@ -39,12 +38,35 @@ public class JobApiTest {
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
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);
}
@@ -86,7 +108,7 @@ public class JobApiTest {
*/
@Test
public void testGetJobsByIds() {
System.out.println(execution.getJobsByIds("jhadmin", Arrays.asList("42", "41")));
System.out.println(JsonUtil.objectToString(execution.getJobsByIds("jhadmin", Arrays.asList("1591", "162"))));
}
/**

View File

@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cim.jhinno</groupId>
<artifactId>jhinno-openapi-sdk-spring-boot-example</artifactId>
<version>2.0.6</version>
<version>2.0.7</version>
<packaging>jar</packaging>
<name>Jhinno OpenAPI SDK for Java SpringBoot Example</name>
<description>The Jhinno OpenAPI SDK for Java used for accessing Jhinno OpenApi Service</description>
@@ -22,7 +22,7 @@
<dependency>
<groupId>com.jhinno</groupId>
<artifactId>jhinno-openapi-sdk-spring-boot-starter</artifactId>
<version>2.0.6</version>
<version>2.0.8</version>
</dependency>
<dependency>

View File

@@ -13,7 +13,7 @@
<parent>
<groupId>com.jhinno</groupId>
<artifactId>jhinno-openapi-java-sdk-parent</artifactId>
<version>2.0.6</version>
<version>2.0.8</version>
</parent>
<dependencies>

View File

@@ -6,7 +6,7 @@
<groupId>com.jhinno</groupId>
<artifactId>jhinno-openapi-java-sdk-parent</artifactId>
<version>2.0.6</version>
<version>2.0.8</version>
<packaging>pom</packaging>
<name>Jhinno OpenAPI SDK for Java parent</name>
<description>The Jhinno OpenAPI SDK for Java used for accessing Jhinno OpenApi Service</description>