Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Supports query instance info list by PowerQuery in PowerJobClient #731

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Supports query instance info list by PowerQuery in PowerJobClient #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions powerjob-client/src/main/java/tech/powerjob/client/IPowerJobClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import tech.powerjob.common.request.http.SaveJobInfoRequest;
import tech.powerjob.common.request.http.SaveWorkflowNodeRequest;
import tech.powerjob.common.request.http.SaveWorkflowRequest;
import tech.powerjob.common.request.query.InstanceInfoQuery;
import tech.powerjob.common.request.query.JobInfoQuery;
import tech.powerjob.common.response.*;

Expand Down Expand Up @@ -50,6 +51,8 @@ public interface IPowerJobClient {

ResultDTO<InstanceInfoDTO> fetchInstanceInfo(Long instanceId);

ResultDTO<List<InstanceInfoDTO>> queryInstance(InstanceInfoQuery powerQuery);

/* ************* Workflow API list ************* */
ResultDTO<Long> saveWorkflow(SaveWorkflowRequest request);

Expand Down
15 changes: 15 additions & 0 deletions powerjob-client/src/main/java/tech/powerjob/client/PowerJobClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import tech.powerjob.common.request.http.SaveJobInfoRequest;
import tech.powerjob.common.request.http.SaveWorkflowNodeRequest;
import tech.powerjob.common.request.http.SaveWorkflowRequest;
import tech.powerjob.common.request.query.InstanceInfoQuery;
import tech.powerjob.common.request.query.JobInfoQuery;
import tech.powerjob.common.response.*;
import tech.powerjob.common.utils.CommonUtils;
Expand Down Expand Up @@ -352,6 +353,20 @@ public ResultDTO<InstanceInfoDTO> fetchInstanceInfo(Long instanceId) {
return JSON.parseObject(post, INSTANCE_RESULT_TYPE);
}

/**
* Query instance info list by PowerQuery
* @param powerQuery
* @return instance info list
*/
@Override
public ResultDTO<List<InstanceInfoDTO>> queryInstance(InstanceInfoQuery powerQuery) {
powerQuery.setAppIdEq(appId);
MediaType jsonType = MediaType.parse(OmsConstant.JSON_MEDIA_TYPE);
String json = JsonUtils.toJSONStringUnsafe(powerQuery);
String post = postHA(OpenAPIConstant.QUERY_INSTANCE, RequestBody.create(jsonType, json));
return JSON.parseObject(post, LIST_INSTANCE_RESULT_TYPE);
}

/* ************* Workflow API list ************* */

/**
Expand Down
23 changes: 23 additions & 0 deletions powerjob-client/src/test/java/tech/powerjob/client/test/TestQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
package tech.powerjob.client.test;

import com.alibaba.fastjson.JSON;
import tech.powerjob.common.request.query.InstanceInfoQuery;
import tech.powerjob.common.request.query.JobInfoQuery;
import tech.powerjob.common.enums.ExecuteType;
import tech.powerjob.common.enums.ProcessorType;
import tech.powerjob.common.response.InstanceInfoDTO;
import tech.powerjob.common.response.JobInfoDTO;
import tech.powerjob.common.response.ResultDTO;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateUtils;
import org.junit.jupiter.api.Test;

import java.util.Arrays;
import java.util.Date;
import java.util.List;

Expand Down Expand Up @@ -45,4 +48,24 @@ void testQueryJob() {
System.out.println(JSON.toJSONString(jobQueryResult));
System.out.println(jobQueryResult.getData().size());
}

@Test
void testQueryInstance() {
InstanceInfoQuery qry = new InstanceInfoQuery()
.setJobIdGt(-1L)
.setJobIdLt(10086L)
.setInstanceIdGt(-1L)
.setInstanceIdGt(10086L)
.setJobParamsLike("aa")
.setTypeIn(Arrays.asList(1,2))
.setStatusIn(Arrays.asList(3,4))
.setResultLike("no worker available")
.setExpectedTriggerTimeGt(1693994740089L)
.setActualTriggerTimeGt(1693994740089L)
.setFinishedTimeGt(1693994740089L)
.setGmtCreateGt(new Date(1693994740089L))
.setGmtModifiedGt(new Date(1693994740089L));
ResultDTO<List<InstanceInfoDTO>> instanceQryResult = powerJobClient.queryInstance(qry);
System.out.println(instanceQryResult);
}
}
57 changes: 57 additions & 0 deletions powerjob-common/src/main/java/tech/powerjob/common/request/query/InstanceInfoQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package tech.powerjob.common.request.query;

import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import tech.powerjob.common.PowerQuery;

import java.util.Date;
import java.util.List;

@Getter
@Setter
@Accessors(chain = true)
public class InstanceInfoQuery extends PowerQuery {
private Long idEq;
private Long idLt;
private Long idGt;

private Long jobIdEq;
private Long jobIdLt;
private Long jobIdGt;

private Long instanceIdEq;
private Long instanceIdLt;
private Long instanceIdGt;

private String jobParamsEq;
private String jobParamsLike;

private String instanceParamsEq;
private String instanceParamsLike;

private List<Integer> typeIn;

private Long wfInstanceIdEq;

private List<Integer> statusIn;

private String resultEq;
private String resultLike;
private String resultNotLike;

private Long expectedTriggerTimeGt;
private Long expectedTriggerTimeLt;

private Long actualTriggerTimeGt;
private Long actualTriggerTimeLt;

private Long finishedTimeGt;
private Long finishedTimeLt;

private Date gmtCreateLt;
private Date gmtCreateGt;

private Date gmtModifiedLt;
private Date gmtModifiedGt;
}
4 changes: 2 additions & 2 deletions ...b-server-starter/src/main/java/tech/powerjob/server/web/controller/OpenAPIController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import tech.powerjob.common.OpenAPIConstant;
import tech.powerjob.common.PowerQuery;
import tech.powerjob.common.enums.InstanceStatus;
import tech.powerjob.common.request.http.SaveJobInfoRequest;
import tech.powerjob.common.request.http.SaveWorkflowNodeRequest;
import tech.powerjob.common.request.http.SaveWorkflowRequest;
import tech.powerjob.common.request.query.InstanceInfoQuery;
import tech.powerjob.common.request.query.JobInfoQuery;
import tech.powerjob.common.response.InstanceInfoDTO;
import tech.powerjob.common.response.JobInfoDTO;
Expand Down Expand Up @@ -153,7 +153,7 @@ public ResultDTO<InstanceInfoDTO> fetchInstanceInfo(Long instanceId) {
}

@PostMapping(OpenAPIConstant.QUERY_INSTANCE)
public ResultDTO<List<InstanceInfoDTO>> queryInstance(@RequestBody PowerQuery powerQuery) {
public ResultDTO<List<InstanceInfoDTO>> queryInstance(@RequestBody InstanceInfoQuery powerQuery) {
return ResultDTO.success(instanceService.queryInstanceInfo(powerQuery));
}

Expand Down