From a0f0a48fc9c2c0794ad8ab17ce5e6b552a839ba0 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Mon, 30 Jun 2025 08:25:32 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=AE=A1=E7=90=86=E9=A1=B5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E5=88=97=E6=98=BE=E7=A4=BA=E4=BD=9C=E4=B8=9A=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=B7=B2=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1441426846482432]定时作业管理页增加一列显示作业是否已加载 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1441426846482432
---
 .../api/schedule/ReportSendJobSearchApi.java  | 12 ------
 .../report/dao/mapper/ReportSendJobMapper.xml | 39 +++++++++++++++++--
 .../module/report/dto/ReportSendJobVo.java    | 34 ++++++++--------
 3 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/src/main/java/neatlogic/module/report/api/schedule/ReportSendJobSearchApi.java b/src/main/java/neatlogic/module/report/api/schedule/ReportSendJobSearchApi.java
index 4b2bf83..5aa5d69 100644
--- a/src/main/java/neatlogic/module/report/api/schedule/ReportSendJobSearchApi.java
+++ b/src/main/java/neatlogic/module/report/api/schedule/ReportSendJobSearchApi.java
@@ -25,14 +25,11 @@ import neatlogic.framework.common.util.PageUtil;
 import neatlogic.framework.restful.annotation.*;
 import neatlogic.framework.restful.constvalue.OperationTypeEnum;
 import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase;
-import neatlogic.framework.scheduler.core.IJob;
-import neatlogic.framework.scheduler.core.SchedulerManager;
 import neatlogic.framework.scheduler.dao.mapper.SchedulerMapper;
 import neatlogic.framework.scheduler.dto.JobAuditVo;
 import neatlogic.module.report.auth.label.REPORT_BASE;
 import neatlogic.module.report.dao.mapper.ReportSendJobMapper;
 import neatlogic.module.report.dto.ReportSendJobVo;
-import neatlogic.module.report.schedule.plugin.ReportSendJob;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
@@ -51,9 +48,6 @@ public class ReportSendJobSearchApi extends PrivateApiComponentBase {
     @Resource
     private SchedulerMapper schedulerMapper;
 
-    @Resource
-    private SchedulerManager schedulerManager;
-
     @Override
     public String getToken() {
         return "report/sendjob/search";
@@ -120,12 +114,6 @@ public class ReportSendJobSearchApi extends PrivateApiComponentBase {
                         }
                     }
                 }
-                boolean isLoad = false;
-                IJob jobHandler = SchedulerManager.getHandler(ReportSendJob.class.getName());
-                if (jobHandler != null) {
-                    isLoad = schedulerManager.checkJobIsExists(job.getId().toString(), jobHandler.getGroupName());
-                }
-                job.setIsLoad(isLoad ? 1 : 0);
             }
         }
         returnObj.put("jobList", jobList);
diff --git a/src/main/java/neatlogic/module/report/dao/mapper/ReportSendJobMapper.xml b/src/main/java/neatlogic/module/report/dao/mapper/ReportSendJobMapper.xml
index c38c3b9..7dad66f 100755
--- a/src/main/java/neatlogic/module/report/dao/mapper/ReportSendJobMapper.xml
+++ b/src/main/java/neatlogic/module/report/dao/mapper/ReportSendJobMapper.xml
@@ -104,17 +104,50 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </if>
     </select>
 
+    <resultMap id="jobDetailMap" type="neatlogic.module.report.dto.ReportSendJobVo">
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="emailTitle" property="emailTitle"/>
+        <result column="cron" property="cron"/>
+        <result column="isActive" property="isActive"/>
+        <result column="fcd" property="fcd"/>
+        <result column="fcu" property="fcu"/>
+        <result column="lcd" property="lcd"/>
+        <result column="lcu" property="lcu"/>
+        <association property="jobStatus" resultMap="jobStatusMap"/>
+    </resultMap>
+
+    <resultMap id="jobStatusMap" type="neatlogic.framework.scheduler.dto.JobStatusVo">
+        <result column="jobName" property="jobName"/>
+        <result column="jobGroup" property="jobGroup"/>
+        <result column="handler" property="handler"/>
+        <result column="nextFireTime" property="nextFireTime"/>
+        <result column="lastFireTime" property="lastFireTime"/>
+        <result column="lastFinishTime" property="lastFinishTime"/>
+        <result column="execCount" property="execCount"/>
+    </resultMap>
+
     <select id="searchJob" parameterType="neatlogic.module.report.dto.ReportSendJobVo"
-            resultType="neatlogic.module.report.dto.ReportSendJobVo">
+            resultType="jobDetailMap">
         select
         a.`id`,
         a.`name`,
         a.`email_title` as emailTitle,
         a.`cron` as cron,
         a.`is_active` as isActive,
-        (select `next_fire_time` from `schedule_job_status` where `job_name` = CONCAT(a.`id`,'') and `job_group` =
-        CONCAT(#{tenantUuid},'-REPORT-SEND')) as nextFireTime
+        a.`fcd`,
+        a.`fcu`,
+        a.`lcd`,
+        a.`lcu`,
+        b.job_name as jobName,
+        b.job_group as jobGroup,
+        b.handler,
+        b.last_finish_time as lastFinishTime,
+        b.last_fire_time as lastFireTime,
+        b.next_fire_time as nextFireTime,
+        b.exec_count as execCount
         from `report_send_job` a
+        LEFT JOIN schedule_job_status b ON a.id = b.job_name
         <where>
             <if test="keyword != null and keyword != ''">
                 and a.`name` LIKE CONCAT('%', #{keyword}, '%')
diff --git a/src/main/java/neatlogic/module/report/dto/ReportSendJobVo.java b/src/main/java/neatlogic/module/report/dto/ReportSendJobVo.java
index 986fdbf..8ebef7c 100755
--- a/src/main/java/neatlogic/module/report/dto/ReportSendJobVo.java
+++ b/src/main/java/neatlogic/module/report/dto/ReportSendJobVo.java
@@ -1,14 +1,14 @@
 package neatlogic.module.report.dto;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.common.dto.BaseEditorVo;
 import neatlogic.framework.restful.annotation.EntityField;
+import neatlogic.framework.scheduler.dto.JobStatusVo;
 import neatlogic.framework.util.SnowflakeUtil;
-import com.alibaba.fastjson.annotation.JSONField;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 public class ReportSendJobVo extends BaseEditorVo {
@@ -25,8 +25,8 @@ public class ReportSendJobVo extends BaseEditorVo {
 	@EntityField(name = "是否激活", type = ApiParamType.INTEGER)
 	private Integer isActive;
 
-	@EntityField(name = "下次发送时间")
-	private Date nextFireTime;
+//	@EntityField(name = "下次发送时间")
+//	private Date nextFireTime;
 	@EntityField(name = "发送次数", type = ApiParamType.INTEGER)
 	private Integer execCount;
 	@EntityField(name = "邮件接收人列表", type = ApiParamType.JSONARRAY)
@@ -43,8 +43,8 @@ public class ReportSendJobVo extends BaseEditorVo {
 	private List<ReportSendJobRelationVo> reportRelationList;
 	@EntityField(name = "报表列表", type = ApiParamType.JSONARRAY)
 	private List<ReportVo> reportList;
-	@EntityField(name = "是否已加载", type = ApiParamType.INTEGER)
-	private Integer isLoad;
+
+	private JobStatusVo jobStatus;
 
 	public Long getId() {
 		if (id == null) {
@@ -97,13 +97,13 @@ public class ReportSendJobVo extends BaseEditorVo {
 		this.isActive = isActive;
 	}
 
-	public Date getNextFireTime() {
-		return nextFireTime;
-	}
-
-	public void setNextFireTime(Date nextFireTime) {
-		this.nextFireTime = nextFireTime;
-	}
+//	public Date getNextFireTime() {
+//		return nextFireTime;
+//	}
+//
+//	public void setNextFireTime(Date nextFireTime) {
+//		this.nextFireTime = nextFireTime;
+//	}
 
 	public Integer getExecCount() {
 		return execCount;
@@ -177,11 +177,11 @@ public class ReportSendJobVo extends BaseEditorVo {
 		this.reportList = reportList;
 	}
 
-	public Integer getIsLoad() {
-		return isLoad;
+	public JobStatusVo getJobStatus() {
+		return jobStatus;
 	}
 
-	public void setIsLoad(Integer isLoad) {
-		this.isLoad = isLoad;
+	public void setJobStatus(JobStatusVo jobStatus) {
+		this.jobStatus = jobStatus;
 	}
 }
-- 
Gitee