From 9bc5138a183fbf315dfc1bcd8a322fce703d94a7 Mon Sep 17 00:00:00 2001
From: lqyan <lqyan@jhinno.com>
Date: Wed, 24 Jul 2024 23:18:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BD=9C=E4=B8=9A):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=BF=E7=9C=9F=E4=BD=9C=E4=B8=9A=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E8=A1=A8=E5=8D=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../openapi/api/job/JHJobApiExecution.java    | 15 +++++
 .../openapi/api/job/JobAppFormItemInfo.java   | 64 +++++++++++++++++++
 .../sdk/openapi/api/job/JobPathConstant.java  |  6 ++
 .../sdk/openapi/test/job/JobApiTest.java      | 16 +++--
 4 files changed, 96 insertions(+), 5 deletions(-)
 create mode 100644 jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/job/JobAppFormItemInfo.java

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 c67e36b..3fc2539 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
@@ -384,4 +384,19 @@ public class JHJobApiExecution extends JHApiExecution {
         });
     }
 
+    /**
+     * 查询用户作业表单信息
+     *
+     * @param username 用户名
+     * @param appId    用户ID
+     */
+    public List<JobAppFormItemInfo> getSimulationAppForm(String username, String appId) {
+        if (StringUtils.isBlank(appId)) {
+            throw new ArgsException("appId不能为空！");
+        }
+        String path = JobPathConstant.JOB_GET_APP_FORM_PATH.replace("{appId}", appId);
+        return get(path, username, new TypeReference<ResponseResult<List<JobAppFormItemInfo>>>() {
+        });
+    }
+
 }
diff --git a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/job/JobAppFormItemInfo.java b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/job/JobAppFormItemInfo.java
new file mode 100644
index 0000000..6289f27
--- /dev/null
+++ b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/job/JobAppFormItemInfo.java
@@ -0,0 +1,64 @@
+package com.jhinno.sdk.openapi.api.job;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+public class JobAppFormItemInfo {
+
+    /**
+     * 参数描述
+     */
+    private String valueDesc;
+
+    /**
+     * 参数key
+     */
+    private String valueKey;
+
+    /**
+     * 参数正则
+     */
+    private String validateRegXp;
+
+    /**
+     * 参数类型
+     * 从参数范围内多选（多个值用英文逗号隔开）还是单选,
+     * string、singleSelect、multiSelect
+     * <ol>
+     *     <li>选择: select</li>
+     *     <li>开关: switch</li>
+     *     <li>值: text</li>
+     *     <li>文件: upload</li>
+     * </ol>
+     */
+
+    private String valueType;
+
+    /**
+     * 参数范围
+     */
+    private List<ParamsValueScope> valueScope;
+
+    /**
+     * 是否必填
+     */
+    private boolean required;
+
+    /**
+     * 默认值
+     */
+    private String valueDefault;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class ParamsValueScope {
+        private String name;
+        private String value;
+    }
+}
diff --git a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/job/JobPathConstant.java b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/job/JobPathConstant.java
index 35935de..b4b89b2 100644
--- a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/job/JobPathConstant.java
+++ b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/job/JobPathConstant.java
@@ -82,4 +82,10 @@ public class JobPathConstant {
      * 连接作业会话
      */
     public static final String JOB_CONNECT_SESSION_PATH = "/ws/api/jobs/{jobId}/connect";
+
+
+    /**
+     * 获取作业表单
+     */
+    public static final String JOB_GET_APP_FORM_PATH = "/ws/api/jobs/{appId}/form_params";
 }
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 b4d9286..42fda86 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
@@ -1,9 +1,6 @@
 package com.jhinno.sdk.openapi.test.job;
 
-import com.jhinno.sdk.openapi.api.job.JHJobApiExecution;
-import com.jhinno.sdk.openapi.api.job.JobHistoryInfo;
-import com.jhinno.sdk.openapi.api.job.JobStatusEnum;
-import com.jhinno.sdk.openapi.api.job.PageJobInfo;
+import com.jhinno.sdk.openapi.api.job.*;
 import com.jhinno.sdk.openapi.test.JHClientConfig;
 import org.junit.Test;
 
@@ -20,7 +17,7 @@ import java.util.Map;
  */
 public class JobApiTest {
 
-    private static final JHJobApiExecution execution = new JHJobApiExecution(JHClientConfig.client);
+    private static final JHJobApiExecution execution = (JHJobApiExecution) JHClientConfig.jhApiClientMap.get(JHJobApiExecution.class);
 
     /**
      * 测试提交作业
@@ -125,4 +122,13 @@ public class JobApiTest {
         System.out.println(o);
     }
 
+    /**
+     * 测试获取作业表单
+     */
+    @Test
+    public void testGetSimulationAppForm() {
+        List<JobAppFormItemInfo> simulationAppForm = execution.getSimulationAppForm("jhadmin", "common_sub");
+        System.out.println(simulationAppForm);
+    }
+
 }