diff --git a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/PowerQuery.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/PowerQuery.java index 09203229..8b34ed67 100644 --- a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/PowerQuery.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/PowerQuery.java @@ -1,11 +1,16 @@ package com.github.kfcfans.powerjob.common; +import lombok.Getter; +import lombok.Setter; + /** * PowerJob Query interface * * @author tjq * @since 2021/1/15 */ +@Getter +@Setter public abstract class PowerQuery { public static String EQUAL = "Eq"; @@ -33,12 +38,4 @@ public abstract class PowerQuery { public static String IS_NOT_NULL = "IsNotNull"; private Long appIdEq; - - public Long getAppIdEq() { - return appIdEq; - } - - public void setAppIdEq(Long appIdEq) { - this.appIdEq = appIdEq; - } } diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/QueryConvertUtils.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/QueryConvertUtils.java index 4a1f66a1..2f8b4ebd 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/QueryConvertUtils.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/QueryConvertUtils.java @@ -22,7 +22,7 @@ import java.util.List; @SuppressWarnings("unchecked, rawtypes") public class QueryConvertUtils { - public static Specification autoConvert(PowerQuery powerQuery) { + public static Specification toSpecification(PowerQuery powerQuery) { return (Specification) (root, query, cb) -> { List predicates = Lists.newLinkedList(); diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java index 0a3104cb..8525846e 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java @@ -101,7 +101,7 @@ public class JobService { } public List queryJob(PowerQuery powerQuery) { - Specification specification = QueryConvertUtils.autoConvert(powerQuery); + Specification specification = QueryConvertUtils.toSpecification(powerQuery); return jobInfoRepository.findAll(specification).stream().map(JobService::convert).collect(Collectors.toList()); } diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java index 5a210630..adf666b4 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java @@ -203,7 +203,7 @@ public class InstanceService { public List queryInstanceInfo(PowerQuery powerQuery) { return instanceInfoRepository - .findAll(QueryConvertUtils.autoConvert(powerQuery)) + .findAll(QueryConvertUtils.toSpecification(powerQuery)) .stream() .map(InstanceService::directConvert) .collect(Collectors.toList());