From 73691e137350057ce89a1426d3c269925eeb54c8 Mon Sep 17 00:00:00 2001 From: yanlongqi Date: Tue, 9 Dec 2025 15:56:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E7=9A=84=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BC=A0=E9=80=92=E9=94=99=E8=AF=AF=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复JHJobApiExecution中condition参数错误传递params的问题 - 更新测试配置服务器地址和访问密钥 - 添加getCondition辅助方法用于构建查询条件 - 优化JobApiTest的测试用例 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- .../openapi/api/job/JHJobApiExecution.java | 2 +- .../sdk/openapi/test/JHClientConfig.java | 8 ++--- .../sdk/openapi/test/job/JobApiTest.java | 31 ++++++++++++++++--- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/job/JHJobApiExecution.java b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/job/JHJobApiExecution.java index 1e68595..15683b7 100644 --- a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/job/JHJobApiExecution.java +++ b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/job/JHJobApiExecution.java @@ -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>() { diff --git a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/JHClientConfig.java b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/JHClientConfig.java index 49fcced..3cc022c 100644 --- a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/JHClientConfig.java +++ b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/JHClientConfig.java @@ -15,13 +15,13 @@ public class JHClientConfig { public static final JHApiRequestHandler REQUEST_HANDLER = new JHApiRequestHandler() { @Override public String getCurrentUserName() { - return "yanlongqi"; + return "lqyan"; } }; - public static final String APPFORM_SERVER_URL = "https://172.20.0.200"; - public static final String ACCESS_KEY = "8147c7470bfd4a27952fe750c6bc7cef"; - public static final String ACCESS_KEY_SECRET = "899b13f590394c3daafc6468fed4b1df"; + public static final String APPFORM_SERVER_URL = "https://192.168.41.12"; + public static final String ACCESS_KEY = "74e02e60d47343299e4c130ea4a7685d"; + public static final String ACCESS_KEY_SECRET = "91ff101a1f7542dfb00049c39b4e8995"; /** diff --git a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/job/JobApiTest.java b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/job/JobApiTest.java index d7e97dc..7ddd496 100644 --- a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/job/JobApiTest.java +++ b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/job/JobApiTest.java @@ -4,10 +4,8 @@ import com.jhinno.sdk.openapi.api.job.*; import com.jhinno.sdk.openapi.test.JHClientConfig; 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 +37,35 @@ public class JobApiTest { System.out.println(execution.getJobFilesById("jhadmin", "42")); } + + public Map getCondition(List ids) { + List> filterItem = ids.stream().map(t -> { + Map 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 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 ids = Arrays.asList("192", "187"); + PageJobInfo pages = execution.getJobPage("lqyan", 1, 5, null, (JobStatusEnum) null, getCondition(ids)); System.out.println(pages); }