张同佳 6 месяцев назад
Родитель
Сommit
6a2b0822d0

+ 21 - 3
services/ruoyi-job/src/main/java/com/hdkj/lt/job/controller/SysJobLogController.java

@@ -2,6 +2,12 @@ package com.hdkj.lt.job.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hdkj.lt.job.domain.SysJob;
+import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.web.page.PageDomain;
+import com.ruoyi.common.core.web.page.TableSupport;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,9 +44,21 @@ public class SysJobLogController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SysJobLog sysJobLog)
     {
-        startPage();
-        List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
-        return getDataTable(list);
+//        startPage();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        Page<SysJobLog> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+//        List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
+        Page<SysJobLog> list = jobLogService.selectJobLogListPage(page, sysJobLog);
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setCode(HttpStatus.SUCCESS);
+        tableDataInfo.setMsg("查询成功");
+        tableDataInfo.setRows(list.getRecords());
+        tableDataInfo.setTotal(list.getTotal());
+        return tableDataInfo;
     }
 
     /**

+ 7 - 2
services/ruoyi-job/src/main/java/com/hdkj/lt/job/mapper/SysJobLogMapper.java

@@ -1,8 +1,10 @@
 package com.hdkj.lt.job.mapper;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hdkj.lt.job.domain.SysJobLog;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,8 +14,7 @@ import java.util.List;
  * @author ruoyi
  */
 @Mapper
-public interface SysJobLogMapper
-{
+public interface SysJobLogMapper {
     /**
      * 获取quartz调度器日志的计划任务
      *
@@ -22,6 +23,8 @@ public interface SysJobLogMapper
      */
     public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
 
+    Page<SysJobLog> selectJobLogListPage(Page<SysJobLog> page, @Param("jobLog") SysJobLog jobLog);
+
     /**
      * 查询所有调度任务日志
      *
@@ -65,4 +68,6 @@ public interface SysJobLogMapper
      * 清空任务日志
      */
     public void cleanJobLog();
+
+
 }

+ 1 - 2
services/ruoyi-job/src/main/java/com/hdkj/lt/job/mapper/SysJobMapper.java

@@ -13,8 +13,7 @@ import java.util.List;
  * @author ruoyi
  */
 @Mapper
-public interface SysJobMapper
-{
+public interface SysJobMapper {
     /**
      * 查询调度任务日志集合
      *

+ 4 - 0
services/ruoyi-job/src/main/java/com/hdkj/lt/job/service/ISysJobLogService.java

@@ -1,6 +1,8 @@
 package com.hdkj.lt.job.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hdkj.lt.job.domain.SysJob;
 import com.hdkj.lt.job.domain.SysJobLog;
 
 import java.util.List;
@@ -20,6 +22,8 @@ public interface ISysJobLogService
      */
     public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
 
+    public Page<SysJobLog> selectJobLogListPage(Page<SysJobLog> page, SysJobLog jobLog);
+
     /**
      * 通过调度任务日志ID查询调度信息
      *

+ 8 - 0
services/ruoyi-job/src/main/java/com/hdkj/lt/job/service/impl/SysJobLogServiceImpl.java

@@ -1,6 +1,9 @@
 package com.hdkj.lt.job.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hdkj.lt.job.domain.SysJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hdkj.lt.job.domain.SysJobLog;
@@ -29,6 +32,11 @@ public class SysJobLogServiceImpl implements com.hdkj.lt.job.service.ISysJobLogS
         return jobLogMapper.selectJobLogList(jobLog);
     }
 
+    @Override
+    public Page<SysJobLog> selectJobLogListPage(Page<SysJobLog> page, SysJobLog jobLog) {
+        return jobLogMapper.selectJobLogListPage(page, jobLog);
+    }
+
     /**
      * 通过调度任务日志ID查询调度信息
      *

+ 27 - 1
services/ruoyi-job/src/main/resources/mapper/SysJobLogMapper.xml

@@ -45,6 +45,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by create_time desc
 	</select>
 
+	<select id="selectJobLogListPage" resultType="com.hdkj.lt.job.domain.SysJobLog">
+		<include refid="selectJobLogVo"/>
+		<where>
+			<if test="jobLog.jobName != null and jobLog.jobName != ''">
+				AND job_name like concat('%', #{jobLog.jobName}, '%')
+			</if>
+			<if test="jobLog.jobGroup != null and jobLog.jobGroup != ''">
+				AND job_group = #{jobLog.jobGroup}
+			</if>
+			<if test="jobLog.status != null and jobLog.status != ''">
+				AND status = #{jobLog.status}
+			</if>
+			<if test="jobLog.invokeTarget != null and jobLog.invokeTarget != ''">
+				AND invoke_target like concat('%', #{jobLog.invokeTarget}, '%')
+			</if>
+			<if test="jobLog.startTime != null and jobLog.startTime != ''"><!-- 开始时间检索 -->
+				and date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
+			</if>
+			<if test="jobLog.stopTime != null and jobLog.stopTime != ''"><!-- 结束时间检索 -->
+				and date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+			</if>
+		</where>
+		order by create_time desc
+	</select>
+
+
 	<select id="selectJobLogAll" resultMap="SysJobLogResult">
 		<include refid="selectJobLogVo"/>
 	</select>
@@ -54,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where job_log_id = #{jobLogId}
 	</select>
 
-	<delete id="deleteJobLogById" parameterType="Long">
+    <delete id="deleteJobLogById" parameterType="Long">
  		delete from sys_job_log where job_log_id = #{jobLogId}
  	</delete>