Merge branch 'master' into dev

2026-11-08 20:49:00 +08:00 · 2025-07-09 21:16:32 +08:00
commit fea0028126
@@ -65,7 +65,6 @@ public class SysUserController {

 	/**
 	 * 获取指定用户全部信息
-	 *
 	 * @return 用户信息
 	 */
 	@Inner
@@ -78,10 +77,9 @@ public class SysUserController {

 	/**
 	 * 获取当前用户全部信息
-	 *
 	 * @return 用户信息
 	 */
-	@GetMapping(value = {"/info"})
+	@GetMapping(value = { "/info" })
 	public R info() {
 		String username = SecurityUtils.getUser().getUsername();
 		UserDTO userDTO = new UserDTO();
@@ -96,7 +94,6 @@ public class SysUserController {

 	/**
 	 * 通过ID查询用户信息
-	 *
 	 * @param id ID
 	 * @return 用户信息
 	 */
@@ -107,7 +104,6 @@ public class SysUserController {

 	/**
 	 * 查询用户信息
-	 *
 	 * @param query 查询条件
 	 * @return 不为空返回用户名
 	 */
@@ -121,7 +117,6 @@ public class SysUserController {

 	/**
 	 * 删除用户信息
-	 *
 	 * @param ids ID
 	 * @return R
 	 */
@@ -135,7 +130,6 @@ public class SysUserController {

 	/**
 	 * 添加用户
-	 *
 	 * @param userDto 用户信息
 	 * @return success/false
 	 */
@@ -148,8 +142,7 @@ public class SysUserController {

 	/**
 	 * 分页查询用户
-	 *
-	 * @param page    参数集
+	 * @param page 参数集
 	 * @param userDTO 查询参数列表
 	 * @return 用户集合
 	 */
@@ -160,7 +153,6 @@ public class SysUserController {

 	/**
 	 * 管理员更新用户信息
-	 *
 	 * @param userDto 用户信息
 	 * @return R
 	 */
@@ -173,7 +165,6 @@ public class SysUserController {

 	/**
 	 * 修改个人信息 （当前用户）
-	 *
 	 * @param userDto userDto
 	 * @return success/false
 	 */
@@ -185,7 +176,6 @@ public class SysUserController {

 	/**
 	 * 修改个人密码 （当前用户）
-	 *
 	 * @param userDto 用户DTO对象，包含需要修改密码的用户信息
 	 * @return R 返回结果对象，包含修改密码操作的结果信息
 	 */
@@ -219,8 +209,7 @@ public class SysUserController {

 	/**
 	 * 导入用户
-	 *
-	 * @param excelVOList   用户列表
+	 * @param excelVOList 用户列表
 	 * @param bindingResult 错误信息列表
 	 * @return R
 	 */
@@ -232,7 +221,6 @@ public class SysUserController {

 	/**
 	 * 锁定指定用户
-	 *
 	 * @param username 用户名
 	 * @return R
 	 */
@@ -244,7 +232,6 @@ public class SysUserController {

 	/**
 	 * 解绑定接口
-	 *
 	 * @param type 需要解绑定的类型
 	 * @return R 返回结果对象，包含解绑定操作的结果信息
 	 */
@@ -255,7 +242,6 @@ public class SysUserController {

 	/**
 	 * 校验密码接口
-	 *
 	 * @param password 需要校验的密码
 	 * @return R 返回结果对象，包含校验密码操作的结果信息
 	 */
@@ -293,7 +279,8 @@ public class SysUserController {
 	 */
 	@GetMapping("/getUserListByUserName")
 	public R<List<SysUser>> getUserListByUserName(String username) {
-		return R.ok(userService.list(Wrappers.<SysUser>lambdaQuery().like(SysUser::getUsername, username)));
+		return R.ok(TenantBroker
+			.noneAs(() -> userService.list(Wrappers.<SysUser>lambdaQuery().like(SysUser::getUsername, username))));
 	}

 	/**
@@ -303,7 +290,8 @@ public class SysUserController {
 	 */
 	@GetMapping("/list")
 	public R<List<SysUser>> getUserListByIds(@RequestParam("userIds") List<Long> userIds) {
-		return R.ok(userService.list(Wrappers.<SysUser>lambdaQuery().in(SysUser::getUserId, userIds)));
+		return R.ok(TenantBroker
+			.noneAs(() -> userService.list(Wrappers.<SysUser>lambdaQuery().in(SysUser::getUserId, userIds))));
 	}

 }
@@ -56,279 +56,270 @@ import java.util.List;
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class SysJobController {

-    private final SysJobService sysJobService;
+	private final SysJobService sysJobService;

-    private final SysJobLogService sysJobLogService;
+	private final SysJobLogService sysJobLogService;

-    private final TaskUtil taskUtil;
+	private final TaskUtil taskUtil;

-    private final Scheduler scheduler;
+	private final Scheduler scheduler;

-    /**
-     * 定时任务分页查询
-     *
-     * @param page   分页对象
-     * @param sysJob 定时任务调度表
-     * @return
-     */
-    @GetMapping("/page")
-    @Operation(description = "分页定时业务查询")
-    public R getSysJobPage(Page page, SysJob sysJob) {
-        LambdaQueryWrapper<SysJob> wrapper = Wrappers.<SysJob>lambdaQuery()
-                .like(StrUtil.isNotBlank(sysJob.getJobName()), SysJob::getJobName, sysJob.getJobName())
-                .like(StrUtil.isNotBlank(sysJob.getJobGroup()), SysJob::getJobGroup, sysJob.getJobGroup())
-                .eq(StrUtil.isNotBlank(sysJob.getJobStatus()), SysJob::getJobStatus, sysJob.getJobGroup())
-                .eq(StrUtil.isNotBlank(sysJob.getJobExecuteStatus()), SysJob::getJobExecuteStatus,
-                        sysJob.getJobExecuteStatus());
-        return R.ok(sysJobService.page(page, wrapper));
-    }
+	/**
+	 * 定时任务分页查询
+	 * @param page 分页对象
+	 * @param sysJob 定时任务调度表
+	 * @return
+	 */
+	@GetMapping("/page")
+	@Operation(description = "分页定时业务查询")
+	public R getSysJobPage(Page page, SysJob sysJob) {
+		LambdaQueryWrapper<SysJob> wrapper = Wrappers.<SysJob>lambdaQuery()
+			.like(StrUtil.isNotBlank(sysJob.getJobName()), SysJob::getJobName, sysJob.getJobName())
+			.like(StrUtil.isNotBlank(sysJob.getJobGroup()), SysJob::getJobGroup, sysJob.getJobGroup())
+			.eq(StrUtil.isNotBlank(sysJob.getJobStatus()), SysJob::getJobStatus, sysJob.getJobStatus())
+			.eq(StrUtil.isNotBlank(sysJob.getJobExecuteStatus()), SysJob::getJobExecuteStatus,
+					sysJob.getJobExecuteStatus());
+		return R.ok(sysJobService.page(page, wrapper));
+	}

-    /**
-     * 校验任务
-     *
-     * @param field  字段
-     * @param sysJob sys 作业
-     * @return {@link R }
-     */
-    @GetMapping("/validate")
-    @Operation(description = "检查定时任务")
-    public R validate(String field, SysJob sysJob) {
-        return sysJobService.checkJob(field, sysJob);
-    }
+	/**
+	 * 校验任务
+	 * @param field 字段
+	 * @param sysJob sys 作业
+	 * @return {@link R }
+	 */
+	@GetMapping("/validate")
+	@Operation(description = "检查定时任务")
+	public R validate(String field, SysJob sysJob) {
+		return sysJobService.checkJob(field, sysJob);
+	}

-    /**
-     * 通过id查询定时任务
-     *
-     * @param id id
-     * @return R
-     */
-    @GetMapping("/{id}")
-    @Operation(description = "唯一标识查询定时任务")
-    public R getById(@PathVariable("id") Long id) {
-        return R.ok(sysJobService.getById(id));
-    }
+	/**
+	 * 通过id查询定时任务
+	 * @param id id
+	 * @return R
+	 */
+	@GetMapping("/{id}")
+	@Operation(description = "唯一标识查询定时任务")
+	public R getById(@PathVariable("id") Long id) {
+		return R.ok(sysJobService.getById(id));
+	}

-    /**
-     * 新增定时任务
-     *
-     * @param sysJob 定时任务调度表
-     * @return R
-     */
-    @SysLog("新增定时任务")
-    @PostMapping
-    @HasPermission("job_sys_job_add")
-    @Operation(description = "新增定时任务")
-    public R save(@RequestBody SysJob sysJob) {
-        // 初始化任务
-        taskUtil.addOrUpateJob(sysJob, scheduler);
-        sysJob.setJobStatus(PigxQuartzEnum.JOB_STATUS_RELEASE.getType());
-        sysJob.setCreateBy(SecurityUtils.getUser().getUsername());
-        return R.ok(sysJobService.save(sysJob));
-    }
+	/**
+	 * 新增定时任务
+	 * @param sysJob 定时任务调度表
+	 * @return R
+	 */
+	@SysLog("新增定时任务")
+	@PostMapping
+	@HasPermission("job_sys_job_add")
+	@Operation(description = "新增定时任务")
+	public R save(@RequestBody SysJob sysJob) {
+		// 初始化任务
+		taskUtil.addOrUpateJob(sysJob, scheduler);
+		sysJob.setJobStatus(PigxQuartzEnum.JOB_STATUS_RELEASE.getType());
+		sysJob.setCreateBy(SecurityUtils.getUser().getUsername());
+		return R.ok(sysJobService.save(sysJob));
+	}

-    /**
-     * 修改定时任务
-     *
-     * @param sysJob 定时任务调度表
-     * @return R
-     */
-    @SysLog("修改定时任务")
-    @PutMapping
-    @HasPermission("job_sys_job_edit")
-    @Operation(description = "修改定时任务")
-    public R updateById(@RequestBody SysJob sysJob) {
-        sysJob.setUpdateBy(SecurityUtils.getUser().getUsername());
-        SysJob querySysJob = this.sysJobService.getById(sysJob.getJobId());
-        if (PigxQuartzEnum.JOB_STATUS_NOT_RUNNING.getType().equals(querySysJob.getJobStatus())) {
-            this.taskUtil.addOrUpateJob(sysJob, scheduler);
-            sysJobService.updateById(sysJob);
-        } else if (PigxQuartzEnum.JOB_STATUS_RELEASE.getType().equals(querySysJob.getJobStatus())) {
-            sysJobService.updateById(sysJob);
-        }
-        return R.ok();
-    }
+	/**
+	 * 修改定时任务
+	 * @param sysJob 定时任务调度表
+	 * @return R
+	 */
+	@SysLog("修改定时任务")
+	@PutMapping
+	@HasPermission("job_sys_job_edit")
+	@Operation(description = "修改定时任务")
+	public R updateById(@RequestBody SysJob sysJob) {
+		sysJob.setUpdateBy(SecurityUtils.getUser().getUsername());
+		SysJob querySysJob = this.sysJobService.getById(sysJob.getJobId());
+		if (PigxQuartzEnum.JOB_STATUS_NOT_RUNNING.getType().equals(querySysJob.getJobStatus())) {
+			this.taskUtil.addOrUpateJob(sysJob, scheduler);
+			sysJobService.updateById(sysJob);
+		}
+		else if (PigxQuartzEnum.JOB_STATUS_RELEASE.getType().equals(querySysJob.getJobStatus())) {
+			sysJobService.updateById(sysJob);
+		}
+		return R.ok();
+	}

-    /**
-     * 通过id删除定时任务
-     *
-     * @param id id
-     * @return R
-     */
-    @SysLog("删除定时任务")
-    @DeleteMapping("/{id}")
-    @HasPermission("job_sys_job_del")
-    @Operation(description = "唯一标识查询定时任务，暂停任务才能删除")
-    public R removeById(@PathVariable Long id) {
-        SysJob querySysJob = this.sysJobService.getById(id);
-        if (PigxQuartzEnum.JOB_STATUS_NOT_RUNNING.getType().equals(querySysJob.getJobStatus())) {
-            this.taskUtil.removeJob(querySysJob, scheduler);
-            this.sysJobService.removeById(id);
-        } else if (PigxQuartzEnum.JOB_STATUS_RELEASE.getType().equals(querySysJob.getJobStatus())) {
-            this.sysJobService.removeById(id);
-        }
-        return R.ok();
-    }
+	/**
+	 * 通过id删除定时任务
+	 * @param id id
+	 * @return R
+	 */
+	@SysLog("删除定时任务")
+	@DeleteMapping("/{id}")
+	@HasPermission("job_sys_job_del")
+	@Operation(description = "唯一标识查询定时任务，暂停任务才能删除")
+	public R removeById(@PathVariable Long id) {
+		SysJob querySysJob = this.sysJobService.getById(id);
+		if (PigxQuartzEnum.JOB_STATUS_NOT_RUNNING.getType().equals(querySysJob.getJobStatus())) {
+			this.taskUtil.removeJob(querySysJob, scheduler);
+			this.sysJobService.removeById(id);
+		}
+		else if (PigxQuartzEnum.JOB_STATUS_RELEASE.getType().equals(querySysJob.getJobStatus())) {
+			this.sysJobService.removeById(id);
+		}
+		return R.ok();
+	}

-    /**
-     * 暂停全部定时任务
-     *
-     * @return
-     */
-    @SysLog("暂停全部定时任务")
-    @PostMapping("/shutdown-jobs")
-    @HasPermission("job_sys_job_shutdown_job")
-    @Operation(description = "暂停全部定时任务")
-    public R shutdownJobs() {
-        taskUtil.pauseJobs(scheduler);
-        long count = this.sysJobService.count(
-                new LambdaQueryWrapper<SysJob>().eq(SysJob::getJobStatus, PigxQuartzEnum.JOB_STATUS_RUNNING.getType()));
-        if (count <= 0) {
-            return R.ok("无正在运行定时任务");
-        } else {
-            // 更新定时任务状态条件，运行状态2更新为暂停状态2
-            this.sysJobService.update(
-                    SysJob.builder().jobStatus(PigxQuartzEnum.JOB_STATUS_NOT_RUNNING.getType()).build(),
-                    new UpdateWrapper<SysJob>().lambda()
-                            .eq(SysJob::getJobStatus, PigxQuartzEnum.JOB_STATUS_RUNNING.getType()));
-            return R.ok("暂停成功");
-        }
-    }
+	/**
+	 * 暂停全部定时任务
+	 * @return
+	 */
+	@SysLog("暂停全部定时任务")
+	@PostMapping("/shutdown-jobs")
+	@HasPermission("job_sys_job_shutdown_job")
+	@Operation(description = "暂停全部定时任务")
+	public R shutdownJobs() {
+		taskUtil.pauseJobs(scheduler);
+		long count = this.sysJobService.count(
+				new LambdaQueryWrapper<SysJob>().eq(SysJob::getJobStatus, PigxQuartzEnum.JOB_STATUS_RUNNING.getType()));
+		if (count <= 0) {
+			return R.ok("无正在运行定时任务");
+		}
+		else {
+			// 更新定时任务状态条件，运行状态2更新为暂停状态2
+			this.sysJobService.update(
+					SysJob.builder().jobStatus(PigxQuartzEnum.JOB_STATUS_NOT_RUNNING.getType()).build(),
+					new UpdateWrapper<SysJob>().lambda()
+						.eq(SysJob::getJobStatus, PigxQuartzEnum.JOB_STATUS_RUNNING.getType()));
+			return R.ok("暂停成功");
+		}
+	}

-    /**
-     * 启动全部定时任务
-     *
-     * @return
-     */
-    @SysLog("启动全部定时任务")
-    @PostMapping("/start-jobs")
-    @HasPermission("job_sys_job_start_job")
-    @Operation(description = "启动全部定时任务")
-    public R startJobs() {
-        // 更新定时任务状态条件，暂停状态3更新为运行状态2
-        this.sysJobService.update(SysJob.builder().jobStatus(PigxQuartzEnum.JOB_STATUS_RUNNING.getType()).build(),
-                new UpdateWrapper<SysJob>().lambda()
-                        .eq(SysJob::getJobStatus, PigxQuartzEnum.JOB_STATUS_NOT_RUNNING.getType()));
-        taskUtil.startJobs(scheduler);
-        return R.ok();
-    }
+	/**
+	 * 启动全部定时任务
+	 * @return
+	 */
+	@SysLog("启动全部定时任务")
+	@PostMapping("/start-jobs")
+	@HasPermission("job_sys_job_start_job")
+	@Operation(description = "启动全部定时任务")
+	public R startJobs() {
+		// 更新定时任务状态条件，暂停状态3更新为运行状态2
+		this.sysJobService.update(SysJob.builder().jobStatus(PigxQuartzEnum.JOB_STATUS_RUNNING.getType()).build(),
+				new UpdateWrapper<SysJob>().lambda()
+					.eq(SysJob::getJobStatus, PigxQuartzEnum.JOB_STATUS_NOT_RUNNING.getType()));
+		taskUtil.startJobs(scheduler);
+		return R.ok();
+	}

-    /**
-     * 刷新全部定时任务
-     *
-     * @return
-     */
-    @SysLog("刷新全部定时任务")
-    @PostMapping("/refresh-jobs")
-    @HasPermission("job_sys_job_refresh_job")
-    @Operation(description = "刷新全部定时任务")
-    public R refreshJobs() {
-        sysJobService.list().forEach((sysjob) -> {
-            if (PigxQuartzEnum.JOB_STATUS_RELEASE.getType().equals(sysjob.getJobStatus())
-                    || PigxQuartzEnum.JOB_STATUS_DEL.getType().equals(sysjob.getJobStatus())) {
-                taskUtil.removeJob(sysjob, scheduler);
-            } else if (PigxQuartzEnum.JOB_STATUS_RUNNING.getType().equals(sysjob.getJobStatus())
-                    || PigxQuartzEnum.JOB_STATUS_NOT_RUNNING.getType().equals(sysjob.getJobStatus())) {
-                taskUtil.addOrUpateJob(sysjob, scheduler);
-            } else {
-                taskUtil.removeJob(sysjob, scheduler);
-            }
-        });
-        return R.ok();
-    }
+	/**
+	 * 刷新全部定时任务
+	 * @return
+	 */
+	@SysLog("刷新全部定时任务")
+	@PostMapping("/refresh-jobs")
+	@HasPermission("job_sys_job_refresh_job")
+	@Operation(description = "刷新全部定时任务")
+	public R refreshJobs() {
+		sysJobService.list().forEach((sysjob) -> {
+			if (PigxQuartzEnum.JOB_STATUS_RELEASE.getType().equals(sysjob.getJobStatus())
+					|| PigxQuartzEnum.JOB_STATUS_DEL.getType().equals(sysjob.getJobStatus())) {
+				taskUtil.removeJob(sysjob, scheduler);
+			}
+			else if (PigxQuartzEnum.JOB_STATUS_RUNNING.getType().equals(sysjob.getJobStatus())
+					|| PigxQuartzEnum.JOB_STATUS_NOT_RUNNING.getType().equals(sysjob.getJobStatus())) {
+				taskUtil.addOrUpateJob(sysjob, scheduler);
+			}
+			else {
+				taskUtil.removeJob(sysjob, scheduler);
+			}
+		});
+		return R.ok();
+	}

-    /**
-     * 启动定时任务
-     *
-     * @param jobId
-     * @return
-     */
-    @SysLog("启动定时任务")
-    @PostMapping("/start-job/{id}")
-    @HasPermission("job_sys_job_start_job")
-    @Operation(description = "启动定时任务")
-    public R startJob(@PathVariable("id") Long jobId) {
-        SysJob querySysJob = this.sysJobService.getById(jobId);
-        if (querySysJob != null && PigxQuartzEnum.JOB_LOG_STATUS_FAIL.getType().equals(querySysJob.getJobStatus())) {
-            taskUtil.addOrUpateJob(querySysJob, scheduler);
-        } else {
-            taskUtil.resumeJob(querySysJob, scheduler);
-        }
-        // 更新定时任务状态条件，暂停状态3更新为运行状态2
-        this.sysJobService
-                .updateById(SysJob.builder().jobId(jobId).jobStatus(PigxQuartzEnum.JOB_STATUS_RUNNING.getType()).build());
-        return R.ok();
-    }
+	/**
+	 * 启动定时任务
+	 * @param jobId
+	 * @return
+	 */
+	@SysLog("启动定时任务")
+	@PostMapping("/start-job/{id}")
+	@HasPermission("job_sys_job_start_job")
+	@Operation(description = "启动定时任务")
+	public R startJob(@PathVariable("id") Long jobId) {
+		SysJob querySysJob = this.sysJobService.getById(jobId);
+		if (querySysJob != null && PigxQuartzEnum.JOB_LOG_STATUS_FAIL.getType().equals(querySysJob.getJobStatus())) {
+			taskUtil.addOrUpateJob(querySysJob, scheduler);
+		}
+		else {
+			taskUtil.resumeJob(querySysJob, scheduler);
+		}
+		// 更新定时任务状态条件，暂停状态3更新为运行状态2
+		this.sysJobService
+			.updateById(SysJob.builder().jobId(jobId).jobStatus(PigxQuartzEnum.JOB_STATUS_RUNNING.getType()).build());
+		return R.ok();
+	}

-    /**
-     * 启动定时任务
-     *
-     * @param jobId
-     * @return
-     */
-    @SysLog("立刻执行定时任务")
-    @PostMapping("/run-job/{id}")
-    @HasPermission("job_sys_job_run_job")
-    @Operation(description = "立刻执行定时任务")
-    public R runJob(@PathVariable("id") Long jobId) {
-        SysJob querySysJob = this.sysJobService.getById(jobId);
-        return TaskUtil.runOnce(scheduler, querySysJob) ? R.ok() : R.failed();
-    }
+	/**
+	 * 启动定时任务
+	 * @param jobId
+	 * @return
+	 */
+	@SysLog("立刻执行定时任务")
+	@PostMapping("/run-job/{id}")
+	@HasPermission("job_sys_job_run_job")
+	@Operation(description = "立刻执行定时任务")
+	public R runJob(@PathVariable("id") Long jobId) {
+		SysJob querySysJob = this.sysJobService.getById(jobId);
+		return TaskUtil.runOnce(scheduler, querySysJob) ? R.ok() : R.failed();
+	}

-    /**
-     * 暂停定时任务
-     *
-     * @return
-     */
-    @SysLog("暂停定时任务")
-    @PostMapping("/shutdown-job/{id}")
-    @HasPermission("job_sys_job_shutdown_job")
-    @Operation(description = "暂停定时任务")
-    public R shutdownJob(@PathVariable("id") Long id) {
-        SysJob querySysJob = this.sysJobService.getById(id);
-        // 更新定时任务状态条件，运行状态2更新为暂停状态3
-        this.sysJobService.updateById(SysJob.builder()
-                .jobId(querySysJob.getJobId())
-                .jobStatus(PigxQuartzEnum.JOB_STATUS_NOT_RUNNING.getType())
-                .build());
-        taskUtil.pauseJob(querySysJob, scheduler);
-        return R.ok();
-    }
+	/**
+	 * 暂停定时任务
+	 * @return
+	 */
+	@SysLog("暂停定时任务")
+	@PostMapping("/shutdown-job/{id}")
+	@HasPermission("job_sys_job_shutdown_job")
+	@Operation(description = "暂停定时任务")
+	public R shutdownJob(@PathVariable("id") Long id) {
+		SysJob querySysJob = this.sysJobService.getById(id);
+		// 更新定时任务状态条件，运行状态2更新为暂停状态3
+		this.sysJobService.updateById(SysJob.builder()
+			.jobId(querySysJob.getJobId())
+			.jobStatus(PigxQuartzEnum.JOB_STATUS_NOT_RUNNING.getType())
+			.build());
+		taskUtil.pauseJob(querySysJob, scheduler);
+		return R.ok();
+	}

-    /**
-     * 唯一标识查询定时执行日志
-     *
-     * @return
-     */
-    @GetMapping("/job-log")
-    @Operation(description = "唯一标识查询定时执行日志")
-    public R getJobLog(Page page, SysJobLog sysJobLog) {
-        return R.ok(sysJobLogService.page(page, Wrappers.query(sysJobLog)));
-    }
+	/**
+	 * 唯一标识查询定时执行日志
+	 * @return
+	 */
+	@GetMapping("/job-log")
+	@Operation(description = "唯一标识查询定时执行日志")
+	public R getJobLog(Page page, SysJobLog sysJobLog) {
+		return R.ok(sysJobLogService.page(page, Wrappers.query(sysJobLog)));
+	}

-    /**
-     * 检验任务名称和任务组联合是否唯一
-     *
-     * @return
-     */
-    @GetMapping("/is-valid-task-name")
-    @Operation(description = "检验任务名称和任务组联合是否唯一")
-    public R isValidTaskName(@RequestParam String jobName, @RequestParam String jobGroup) {
-        return this.sysJobService
-                .count(Wrappers.query(SysJob.builder().jobName(jobName).jobGroup(jobGroup).build())) > 0
-                ? R.failed("任务重复，请检查此组内是否已包含同名任务") : R.ok();
-    }
+	/**
+	 * 检验任务名称和任务组联合是否唯一
+	 * @return
+	 */
+	@GetMapping("/is-valid-task-name")
+	@Operation(description = "检验任务名称和任务组联合是否唯一")
+	public R isValidTaskName(@RequestParam String jobName, @RequestParam String jobGroup) {
+		return this.sysJobService
+			.count(Wrappers.query(SysJob.builder().jobName(jobName).jobGroup(jobGroup).build())) > 0
+					? R.failed("任务重复，请检查此组内是否已包含同名任务") : R.ok();
+	}

-    /**
-     * 导出任务
-     *
-     * @param sysJob
-     * @return
-     */
-    @ResponseExcel
-    @GetMapping("/export")
-    @Operation(description = "导出任务")
-    public List<SysJob> export(SysJob sysJob) {
-        return sysJobService.list(Wrappers.query(sysJob));
-    }
+	/**
+	 * 导出任务
+	 * @param sysJob
+	 * @return
+	 */
+	@ResponseExcel
+	@GetMapping("/export")
+	@Operation(description = "导出任务")
+	public List<SysJob> export(SysJob sysJob) {
+		return sysJobService.list(Wrappers.query(sysJob));
+	}

 }