diff --git a/cutejava-front/src/views/system/quartzJob/index.vue b/cutejava-front/src/views/system/quartzJob/index.vue
index 5881f689..6c38fdbc 100644
--- a/cutejava-front/src/views/system/quartzJob/index.vue
+++ b/cutejava-front/src/views/system/quartzJob/index.vue
@@ -28,6 +28,7 @@
>日志
+ Cron在线表达式生成
diff --git a/cutejava-front/src/views/system/user/center.vue b/cutejava-front/src/views/system/user/center.vue
index bf16d427..dabee521 100644
--- a/cutejava-front/src/views/system/user/center.vue
+++ b/cutejava-front/src/views/system/user/center.vue
@@ -105,8 +105,8 @@
{{ scope.row.time || 0 }}ms
- {{ scope.row.executeTime }}ms
- {{ scope.row.executeTime }}ms
+ {{ scope.row.executeTime || 0 }}ms
+ {{ scope.row.executeTime || 0 }}ms
{
if (StringUtils.isNotBlank(params)) {
return method.invoke(target, params);
} else {
- return method.invoke(target, "");
+ return method.invoke(target, null);
}
}
}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java
index 237ef652..d460616e 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java
@@ -73,7 +73,7 @@ public class SystemQuartzJobService {
}
/**
- * 创建
+ * 创建 -> TestPassed
*
* @param args /
*/
@@ -93,7 +93,7 @@ public class SystemQuartzJobService {
}
/**
- * 修改任务并重新调度
+ * 修改任务并重新调度 -> TestPassed
*
* @param args /
*/
@@ -116,7 +116,7 @@ public class SystemQuartzJobService {
}
/**
- * 更改定时任务状态
+ * 更改定时任务状态 -> TestPassed
*
* @param quartzJobVo /
*/
@@ -135,7 +135,7 @@ public class SystemQuartzJobService {
}
/**
- * 立即执行定时任务
+ * 立即执行定时任务 -> TestPassed
*
* @param quartzJob /
*/
@@ -144,7 +144,7 @@ public class SystemQuartzJobService {
}
/**
- * 删除任务
+ * 删除任务 -> TestPassed
*
* @param ids /
*/
@@ -158,7 +158,7 @@ public class SystemQuartzJobService {
}
/**
- * 执行子任务
+ * 执行子任务 -> TestPassed
*
* @param tasks /
* @throws InterruptedException /
@@ -195,7 +195,7 @@ public class SystemQuartzJobService {
}
/**
- * 分页查询
+ * 分页查询 -> TestPassed
*
* @param args 条件
* @param page 分页参数
@@ -230,21 +230,20 @@ public class SystemQuartzJobService {
}
/**
- * 分页查询日志
+ * 分页查询日志 -> TestPassed
*
* @param args 条件
* @param page 分页参数
* @return /
*/
- public KitPageResult searchQuartzLogByArgs(SystemQueryQuartzJobArgs args,
- Page page) {
+ public KitPageResult searchQuartzLogByArgs(SystemQueryQuartzJobArgs args, Page page) {
LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
this.injectQuartzLogQueryParams(args, wrapper);
return KitPageUtil.toPage(systemQuartzLogMapper.selectPage(page, wrapper));
}
/**
- * 查询全部
+ * 查询全部 -> TestPassed
*
* @param args 条件
* @return /
@@ -256,7 +255,7 @@ public class SystemQuartzJobService {
}
/**
- * 查询全部
+ * 查询全部 -> TestPassed
*
* @param args 条件
* @return /
@@ -267,6 +266,9 @@ public class SystemQuartzJobService {
return systemQuartzLogMapper.selectList(wrapper);
}
+ /**
+ * 查询启用的定时任务 -> TestPassed
+ */
public List listEnableQuartzJob() {
LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SystemQuartzJobTb::getIsPause, 0);
@@ -316,6 +318,9 @@ public class SystemQuartzJobService {
KitExcelExporter.exportSimple(response, "定时任务日志数据", SystemQuartzLogExportRowVo.class, rowVos);
}
+ /**
+ * 根据任务id查询定时任务 -> TestPassed
+ */
public SystemQuartzJobTb getQuartzJobById(Long id) {
return systemQuartzJobMapper.selectById(id);
}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java
index b7966eef..3dde0bbe 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java
@@ -78,7 +78,7 @@ public class SystemUserJobService {
}
/**
- * 根据用户id列举岗位 -> TestPassed
+ * 根据用户id查询岗位 -> TestPassed
*
* @param userId /
* @return /
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java
index d882fbea..769c21c1 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java
@@ -158,7 +158,7 @@ public class SystemUserRoleService {
}
/**
- * 根据用户id列举角色 -> TestPassed
+ * 根据用户id查询角色 -> TestPassed
*
* @param userId /
* @return /
@@ -168,7 +168,7 @@ public class SystemUserRoleService {
}
/**
- * 根据用户id列举角色级别 -> TestPassed
+ * 根据用户id查询角色级别 -> TestPassed
*
* @param userId /
* @return /
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java
index 109284ef..0f6ddedf 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java
@@ -49,7 +49,7 @@ public class QuartzRunnable implements Callable