From 891f71b1c2f1c0e17a4eb3653c7e23a9e468e1cf Mon Sep 17 00:00:00 2001
From: Yjoioooo <693337446@qq.com>
Date: 星期四, 09 三月 2023 21:40:04 +0800
Subject: [PATCH] fix 修复多租户下注册用户BUG
---
ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java | 73 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java
index 62fa3b4..7beaf75 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java
@@ -10,53 +10,56 @@
/**
* job log
+ *
* @author xuxueli 2016-1-12 18:03:06
*/
@Mapper
public interface XxlJobLogDao {
- // exist jobId not use jobGroup, not exist use jobGroup
- public List<XxlJobLog> pageList(@Param("offset") int offset,
- @Param("pagesize") int pagesize,
- @Param("jobGroup") int jobGroup,
- @Param("jobId") int jobId,
- @Param("triggerTimeStart") Date triggerTimeStart,
- @Param("triggerTimeEnd") Date triggerTimeEnd,
- @Param("logStatus") int logStatus);
- public int pageListCount(@Param("offset") int offset,
- @Param("pagesize") int pagesize,
- @Param("jobGroup") int jobGroup,
- @Param("jobId") int jobId,
- @Param("triggerTimeStart") Date triggerTimeStart,
- @Param("triggerTimeEnd") Date triggerTimeEnd,
- @Param("logStatus") int logStatus);
-
- public XxlJobLog load(@Param("id") long id);
+ // exist jobId not use jobGroup, not exist use jobGroup
+ public List<XxlJobLog> pageList(@Param("offset") int offset,
+ @Param("pagesize") int pagesize,
+ @Param("jobGroup") int jobGroup,
+ @Param("jobId") int jobId,
+ @Param("triggerTimeStart") Date triggerTimeStart,
+ @Param("triggerTimeEnd") Date triggerTimeEnd,
+ @Param("logStatus") int logStatus);
- public long save(XxlJobLog xxlJobLog);
+ public int pageListCount(@Param("offset") int offset,
+ @Param("pagesize") int pagesize,
+ @Param("jobGroup") int jobGroup,
+ @Param("jobId") int jobId,
+ @Param("triggerTimeStart") Date triggerTimeStart,
+ @Param("triggerTimeEnd") Date triggerTimeEnd,
+ @Param("logStatus") int logStatus);
- public int updateTriggerInfo(XxlJobLog xxlJobLog);
+ public XxlJobLog load(@Param("id") long id);
- public int updateHandleInfo(XxlJobLog xxlJobLog);
-
- public int delete(@Param("jobId") int jobId);
+ public long save(XxlJobLog xxlJobLog);
- public Map<String, Object> findLogReport(@Param("from") Date from,
- @Param("to") Date to);
+ public int updateTriggerInfo(XxlJobLog xxlJobLog);
- public List<Long> findClearLogIds(@Param("jobGroup") int jobGroup,
- @Param("jobId") int jobId,
- @Param("clearBeforeTime") Date clearBeforeTime,
- @Param("clearBeforeNum") int clearBeforeNum,
- @Param("pagesize") int pagesize);
- public int clearLog(@Param("logIds") List<Long> logIds);
+ public int updateHandleInfo(XxlJobLog xxlJobLog);
- public List<Long> findFailJobLogIds(@Param("pagesize") int pagesize);
+ public int delete(@Param("jobId") int jobId);
- public int updateAlarmStatus(@Param("logId") long logId,
- @Param("oldAlarmStatus") int oldAlarmStatus,
- @Param("newAlarmStatus") int newAlarmStatus);
+ public Map<String, Object> findLogReport(@Param("from") Date from,
+ @Param("to") Date to);
- public List<Long> findLostJobIds(@Param("losedTime") Date losedTime);
+ public List<Long> findClearLogIds(@Param("jobGroup") int jobGroup,
+ @Param("jobId") int jobId,
+ @Param("clearBeforeTime") Date clearBeforeTime,
+ @Param("clearBeforeNum") int clearBeforeNum,
+ @Param("pagesize") int pagesize);
+
+ public int clearLog(@Param("logIds") List<Long> logIds);
+
+ public List<Long> findFailJobLogIds(@Param("pagesize") int pagesize);
+
+ public int updateAlarmStatus(@Param("logId") long logId,
+ @Param("oldAlarmStatus") int oldAlarmStatus,
+ @Param("newAlarmStatus") int newAlarmStatus);
+
+ public List<Long> findLostJobIds(@Param("losedTime") Date losedTime);
}
--
Gitblit v1.9.3