From adeaa77864792872f7e39bb9d3560c07d75c1873 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 14 四月 2021 12:01:26 +0800
Subject: [PATCH] update mp化

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java |   70 +++++++++++++++++++----------------
 1 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java
index 8556a37..515f403 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java
@@ -1,89 +1,95 @@
 package com.ruoyi.quartz.service.impl;
 
-import java.util.List;
-
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.ruoyi.quartz.domain.SysJobLog;
 import com.ruoyi.quartz.mapper.SysJobLogMapper;
 import com.ruoyi.quartz.service.ISysJobLogService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅 鏈嶅姟灞�
- * 
+ *
  * @author ruoyi
  */
 @Service
-public class SysJobLogServiceImpl extends ServiceImpl<SysJobLogMapper, SysJobLog> implements ISysJobLogService
-{
-    @Autowired
-    private SysJobLogMapper jobLogMapper;
+public class SysJobLogServiceImpl extends ServiceImpl<SysJobLogMapper, SysJobLog> implements ISysJobLogService {
 
     /**
      * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟
-     * 
+     *
      * @param jobLog 璋冨害鏃ュ織淇℃伅
      * @return 璋冨害浠诲姟鏃ュ織闆嗗悎
      */
     @Override
-    public List<SysJobLog> selectJobLogList(SysJobLog jobLog)
-    {
-        return jobLogMapper.selectJobLogList(jobLog);
+    public List<SysJobLog> selectJobLogList(SysJobLog jobLog) {
+        Map<String, Object> params = jobLog.getParams();
+        return list(new LambdaQueryWrapper<SysJobLog>()
+                .like(StrUtil.isNotBlank(jobLog.getJobName()), SysJobLog::getJobName, jobLog.getJobName())
+                .eq(StrUtil.isNotBlank(jobLog.getJobGroup()), SysJobLog::getJobGroup, jobLog.getJobGroup())
+                .eq(StrUtil.isNotBlank(jobLog.getStatus()), SysJobLog::getStatus, jobLog.getStatus())
+                .like(StrUtil.isNotBlank(jobLog.getInvokeTarget()), SysJobLog::getInvokeTarget, jobLog.getInvokeTarget())
+                .apply(Validator.isNotEmpty(params.get("beginTime")),
+                        "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
+                        params.get("beginTime"))
+                .apply(Validator.isNotEmpty(params.get("endTime")),
+                        "date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
+                        params.get("endTime")));
     }
 
     /**
      * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅
-     * 
+     *
      * @param jobLogId 璋冨害浠诲姟鏃ュ織ID
      * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅
      */
     @Override
-    public SysJobLog selectJobLogById(Long jobLogId)
-    {
-        return jobLogMapper.selectJobLogById(jobLogId);
+    public SysJobLog selectJobLogById(Long jobLogId) {
+        return getById(jobLogId);
     }
 
     /**
      * 鏂板浠诲姟鏃ュ織
-     * 
+     *
      * @param jobLog 璋冨害鏃ュ織淇℃伅
      */
     @Override
-    public void addJobLog(SysJobLog jobLog)
-    {
-        jobLogMapper.insertJobLog(jobLog);
+    public void addJobLog(SysJobLog jobLog) {
+        baseMapper.insert(jobLog);
     }
 
     /**
      * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅
-     * 
+     *
      * @param logIds 闇�瑕佸垹闄ょ殑鏁版嵁ID
      * @return 缁撴灉
      */
     @Override
-    public int deleteJobLogByIds(Long[] logIds)
-    {
-        return jobLogMapper.deleteJobLogByIds(logIds);
+    public int deleteJobLogByIds(Long[] logIds) {
+        return baseMapper.deleteBatchIds(Arrays.asList(logIds));
     }
 
     /**
      * 鍒犻櫎浠诲姟鏃ュ織
-     * 
+     *
      * @param jobId 璋冨害鏃ュ織ID
      */
     @Override
-    public int deleteJobLogById(Long jobId)
-    {
-        return jobLogMapper.deleteJobLogById(jobId);
+    public int deleteJobLogById(Long jobId) {
+        return baseMapper.deleteById(jobId);
     }
 
     /**
      * 娓呯┖浠诲姟鏃ュ織
      */
     @Override
-    public void cleanJobLog()
-    {
-        jobLogMapper.cleanJobLog();
+    public void cleanJobLog() {
+        remove(new LambdaQueryWrapper<>());
     }
 }

--
Gitblit v1.9.3