From 91f36605e865048b0d95aa41cdc587f966101a73 Mon Sep 17 00:00:00 2001 From: eastargh Date: Thu, 14 May 2026 11:22:47 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8A=A4=EC=BC=80=EC=A5=B4=EB=9F=AC=20?= =?UTF-8?q?=EC=8B=A4=ED=96=89=EC=8B=9C=EA=B0=84=20format=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/scheduler/schedulerManDetail.jsp | 24 +++++------ .../common/scheduler/SchedulerManService.java | 42 ++++++++++++------- 2 files changed, 39 insertions(+), 27 deletions(-) diff --git a/WebContent/jsp/common/scheduler/schedulerManDetail.jsp b/WebContent/jsp/common/scheduler/schedulerManDetail.jsp index 3851e26..82cca5b 100644 --- a/WebContent/jsp/common/scheduler/schedulerManDetail.jsp +++ b/WebContent/jsp/common/scheduler/schedulerManDetail.jsp @@ -465,21 +465,21 @@ $(document).ready(function() { - - - - - - + + + + + + - - - - - - + + + + + +
Default SchedulerOn Memory: Previous Fired: Next Fire Time: isConcurrentExectionDisallowed: PersistJobData: Durable: On Memory: Previous Fired: Next Fire Time: isConcurrentExectionDisallowed: PersistJobData: Durable:
Clustered SchedulerOn Memory: Previous Fired: Next Fire Time: isConcurrentExectionDisallowed: PersistJobData: Durable: On Memory: Previous Fired: Next Fire Time: isConcurrentExectionDisallowed: PersistJobData: Durable:
diff --git a/src/main/java/com/eactive/eai/rms/common/scheduler/SchedulerManService.java b/src/main/java/com/eactive/eai/rms/common/scheduler/SchedulerManService.java index 0b10e8f..35d6e24 100644 --- a/src/main/java/com/eactive/eai/rms/common/scheduler/SchedulerManService.java +++ b/src/main/java/com/eactive/eai/rms/common/scheduler/SchedulerManService.java @@ -1,13 +1,11 @@ package com.eactive.eai.rms.common.scheduler; -import com.eactive.eai.rms.common.base.BaseService; -import com.eactive.eai.rms.common.scheduler.ui.JobInfoMapper; -import com.eactive.eai.rms.common.scheduler.ui.JobInfoUI; -import com.eactive.eai.rms.common.scheduler.ui.ScheduleInfo; -import com.eactive.eai.rms.common.scheduler.ui.SchedulerUISearch; -import com.eactive.eai.rms.data.entity.man.monitoringCode.service.MonitoringCodeService; -import com.eactive.eai.rms.data.entity.man.scheduler.JobHistoryService; -import com.eactive.eai.rms.data.entity.man.scheduler.JobInfoService; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; + import org.apache.commons.lang3.StringUtils; import org.quartz.JobDetail; import org.quartz.JobKey; @@ -20,9 +18,14 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; +import com.eactive.eai.rms.common.base.BaseService; +import com.eactive.eai.rms.common.scheduler.ui.JobInfoMapper; +import com.eactive.eai.rms.common.scheduler.ui.JobInfoUI; +import com.eactive.eai.rms.common.scheduler.ui.ScheduleInfo; +import com.eactive.eai.rms.common.scheduler.ui.SchedulerUISearch; +import com.eactive.eai.rms.data.entity.man.monitoringCode.service.MonitoringCodeService; +import com.eactive.eai.rms.data.entity.man.scheduler.JobHistoryService; +import com.eactive.eai.rms.data.entity.man.scheduler.JobInfoService; @Service("schedulerService") @Transactional(transactionManager = "transactionManagerForEMS") @@ -122,10 +125,10 @@ public class SchedulerManService extends BaseService { List triggersOfJob = scheduler.getTriggersOfJob(new JobKey(jobName, Scheduler.DEFAULT_GROUP)); if(triggersOfJob.size() > 0) { - result.setStartTime(String.valueOf(triggersOfJob.get(0).getStartTime())); - result.setEndTime(String.valueOf(triggersOfJob.get(0).getEndTime())); - result.setPreviousFireTime(String.valueOf(triggersOfJob.get(0).getPreviousFireTime())); - result.setNextFireTime(String.valueOf(triggersOfJob.get(0).getNextFireTime())); + result.setStartTime(dateFormat(triggersOfJob.get(0).getStartTime())); + result.setEndTime(dateFormat(triggersOfJob.get(0).getEndTime())); + result.setPreviousFireTime(dateFormat(triggersOfJob.get(0).getPreviousFireTime())); + result.setNextFireTime(dateFormat(triggersOfJob.get(0).getNextFireTime())); } } catch (Exception e) { @@ -150,5 +153,14 @@ public class SchedulerManService extends BaseService { public void delete(String jobName) { jobInfoService.deleteById(jobName); } + + private String dateFormat(Date date) { + if (date == null) { + return ""; + } else { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + return sdf.format(date); + } + } }