From fb29d8013b7ae5943b5521819b746ee01172b561 Mon Sep 17 00:00:00 2001
From: tjq <tengjiqi@gmail.com>
Date: Sun, 31 Jan 2021 13:26:38 +0800
Subject: [PATCH] fix: JobInfoQuery can't serialize #183

---
 .../powerjob/client/test/TestQuery.java        | 18 +++++++++---------
 .../common/request/query/JobInfoQuery.java     |  3 +--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/powerjob-client/src/test/java/com/github/kfcfans/powerjob/client/test/TestQuery.java b/powerjob-client/src/test/java/com/github/kfcfans/powerjob/client/test/TestQuery.java
index cf9f2ad3..003043de 100644
--- a/powerjob-client/src/test/java/com/github/kfcfans/powerjob/client/test/TestQuery.java
+++ b/powerjob-client/src/test/java/com/github/kfcfans/powerjob/client/test/TestQuery.java
@@ -33,17 +33,17 @@ class TestQuery extends ClientInitializer {
     @Test
     void testQueryJob() {
         JobInfoQuery jobInfoQuery = new JobInfoQuery()
-                .idGt(-1L)
-                .idLt(10086L)
-                .jobNameLike("DAG")
-                .gmtModifiedGt(DateUtils.addYears(new Date(), -10))
-                .gmtModifiedLt(DateUtils.addDays(new Date(), 10))
-                .executeTypeIn(Lists.newArrayList(ExecuteType.STANDALONE.getV(), ExecuteType.BROADCAST.getV(), ExecuteType.MAP_REDUCE.getV()))
-                .timeExpressionIn(Lists.newArrayList(TimeExpressionType.API.name(), TimeExpressionType.CRON.name(), TimeExpressionType.WORKFLOW.name(), TimeExpressionType.FIXED_RATE.name()))
-                .processorTypeIn(Lists.newArrayList(ProcessorType.EMBEDDED_JAVA.getV(), ProcessorType.SHELL.getV(), ProcessorType.JAVA_CONTAINER.getV()))
-                .processorInfoLike("com.github.kfcfans");
+                .setIdGt(-1L)
+                .setIdLt(10086L)
+                .setJobNameLike("DAG")
+                .setGmtModifiedGt(DateUtils.addYears(new Date(), -10))
+                .setGmtCreateLt(DateUtils.addDays(new Date(), 10))
+                .setExecuteTypeIn(Lists.newArrayList(ExecuteType.STANDALONE.getV(), ExecuteType.BROADCAST.getV(), ExecuteType.MAP_REDUCE.getV()))
+                .setProcessorTypeIn(Lists.newArrayList(ProcessorType.EMBEDDED_JAVA.getV(), ProcessorType.SHELL.getV(), ProcessorType.JAVA_CONTAINER.getV()))
+                .setProcessorInfoLike("com.github.kfcfans");
 
         ResultDTO<List<JobInfoDTO>> jobQueryResult = ohMyClient.queryJob(jobInfoQuery);
         System.out.println(JSON.toJSONString(jobQueryResult));
+        System.out.println(jobQueryResult.getData().size());
     }
 }
diff --git a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/query/JobInfoQuery.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/query/JobInfoQuery.java
index f1b2bf9d..754fbd71 100644
--- a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/query/JobInfoQuery.java
+++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/query/JobInfoQuery.java
@@ -16,7 +16,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-@Accessors(chain = true, fluent = true)
+@Accessors(chain = true)
 public class JobInfoQuery extends PowerQuery {
 
     private Long idEq;
@@ -31,7 +31,6 @@ public class JobInfoQuery extends PowerQuery {
     private String jobParamsLike;
 
     private List<Integer> timeExpressionTypeIn;
-    private List<String> timeExpressionIn;
     private List<Integer> executeTypeIn;
     private List<Integer> processorTypeIn;