From 513d8d9324b952438ec5513e9e3c7dfb092d5b83 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sun, 4 Aug 2024 22:47:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=E6=8A=A5=E9=94=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/top/continew/admin/job/api/JobBatchApi.java   |  6 ++----
 .../admin/job/service/impl/JobLogServiceImpl.java      | 10 ++++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobBatchApi.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobBatchApi.java
index 98457fd3..40dbc96f 100644
--- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobBatchApi.java
+++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobBatchApi.java
@@ -16,7 +16,6 @@
 
 package top.continew.admin.job.api;
 
-import com.aizuda.snailjob.common.core.model.Result;
 import com.aizuda.snailjob.common.core.model.Result;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -27,10 +26,9 @@ import org.springframework.web.service.annotation.HttpExchange;
 import org.springframework.web.service.annotation.PostExchange;
 import top.continew.admin.job.model.JobInstanceLogPageResult;
 import top.continew.admin.job.model.JobPageResult;
-import top.continew.admin.job.model.resp.JobLogResp;
 import top.continew.admin.job.model.resp.JobInstanceResp;
+import top.continew.admin.job.model.resp.JobLogResp;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -60,7 +58,7 @@ public interface JobBatchApi {
                                                          @RequestParam(value = "jobName", required = false) String jobName,
                                                          @RequestParam(value = "groupName", required = false) String groupName,
                                                          @RequestParam(value = "taskBatchStatus", required = false) Integer taskBatchStatus,
-                                                         @RequestParam(value = "datetimeRange", required = false) LocalDateTime[] datetimeRange,
+                                                         @RequestParam(value = "datetimeRange", required = false) String[] datetimeRange,
                                                          @RequestParam(value = "page") Integer page,
                                                          @RequestParam(value = "size") Integer size);
 
diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobLogServiceImpl.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobLogServiceImpl.java
index e22929f9..066c2d17 100644
--- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobLogServiceImpl.java
+++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobLogServiceImpl.java
@@ -16,6 +16,8 @@
 
 package top.continew.admin.job.service.impl;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import top.continew.admin.job.api.JobBatchApi;
@@ -29,6 +31,7 @@ import top.continew.admin.job.model.resp.JobLogResp;
 import top.continew.admin.job.service.JobLogService;
 import top.continew.starter.extension.crud.model.resp.PageResp;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
 
@@ -48,9 +51,12 @@ public class JobLogServiceImpl implements JobLogService {
 
     @Override
     public PageResp<JobLogResp> page(JobLogQuery query) {
+        LocalDateTime[] datetimeRange = query.getDatetimeRange();
         return jobClient.requestPage(() -> jobBatchApi.page(query.getJobId(), query.getJobName(), query
-            .getGroupName(), query.getTaskBatchStatus() != null ? query.getTaskBatchStatus().getValue() : null, query
-                .getDatetimeRange(), query.getPage(), query.getSize()));
+            .getGroupName(), query.getTaskBatchStatus() != null
+                ? query.getTaskBatchStatus().getValue()
+                : null, new String[] {DateUtil.format(datetimeRange[0], DatePattern.UTC_SIMPLE_PATTERN), DateUtil
+                    .format(datetimeRange[1], DatePattern.UTC_SIMPLE_PATTERN)}, query.getPage(), query.getSize()));
     }
 
     @Override