From cc2d8b9d824fede181a9a145cdd4992c68bb6204 Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Fri, 26 Jul 2024 13:59:58 +0800
Subject: [PATCH] =?UTF-8?q?:rocket:=20feat(=E6=96=B0=E5=A2=9E):=20?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cn/bunny/common/generator/NewCodeGet.java | 16 +++---
.../cn/bunny/common/generator/OldCodeGet.java | 57 -------------------
.../bunny/entity/system/quartz/JobList.java | 43 ++++++++++++++
.../service/controller/JobController.java | 14 +++++
.../bunny/service/mapper/JobListMapper.java | 18 ++++++
.../cn/bunny/service/service/JobService.java | 14 ++++-
.../service/service/impl/JobServiceImpl.java | 25 +++++++-
.../resources/mapper/quartz/JobListMapper.xml | 21 +++++++
service/src/test/java/cn/bunny/test.json | 13 +++++
9 files changed, 153 insertions(+), 68 deletions(-)
delete mode 100644 common/common-generator/src/main/java/cn/bunny/common/generator/OldCodeGet.java
create mode 100644 dao/src/main/java/cn/bunny/entity/system/quartz/JobList.java
create mode 100644 service/src/main/java/cn/bunny/service/mapper/JobListMapper.java
create mode 100644 service/src/main/resources/mapper/quartz/JobListMapper.xml
create mode 100644 service/src/test/java/cn/bunny/test.json
diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/NewCodeGet.java b/common/common-generator/src/main/java/cn/bunny/common/generator/NewCodeGet.java
index ce3ab00..9860925 100644
--- a/common/common-generator/src/main/java/cn/bunny/common/generator/NewCodeGet.java
+++ b/common/common-generator/src/main/java/cn/bunny/common/generator/NewCodeGet.java
@@ -15,15 +15,13 @@ public class NewCodeGet {
// 作者名称
public static final String author = "Bunny";
// 公共路径
- // public static final String outputDir = "D:\\MyFolder\\Quartz-Demo\\service";
- public static final String outputDir = "D:\\Project\\web\\PC\\demo\\Quartz-Demo\\service";
+ public static final String outputDir = "D:\\MyFolder\\Quartz-Demo\\service";
+ // public static final String outputDir = "D:\\Project\\web\\PC\\demo\\Quartz-Demo\\service";
// 实体类名称
public static final String entity = "Bunny";
public static void main(String[] args) {
- Generation("QRTZ_CALENDARS","QRTZ_CRON_TRIGGERS","QRTZ_FIRED_TRIGGERS","QRTZ_JOB_DETAILS","QRTZ_LOCKS","QRTZ_PAUSED_TRIGGER_GRPS","QRTZ_SCHEDULER_STATE",
-"QRTZ_SIMPLE_TRIGGERS","QRTZ_SIMPROP_TRIGGERS","QRTZ_TRIGGERS"
- );
+ Generation("job_list");
}
/**
@@ -45,10 +43,10 @@ public class NewCodeGet {
builder.entity(entity)// 实体类包名
// TODO 父包名。如果为空，将下面子包名必须写全部， 否则就只需写子包名
.parent("cn.bunny.service")
- .controller("controller.quartz")// 控制层包名
- .mapper("mapper.quartz")// mapper层包名
- .service("service.quartz")// service层包名
- .serviceImpl("service.quartz.impl")// service实现类包名
+ .controller("controller")// 控制层包名
+ .mapper("mapper")// mapper层包名
+ .service("service")// service层包名
+ .serviceImpl("service.impl")// service实现类包名
// 自定义mapper.xml文件输出目录
.pathInfo(Collections.singletonMap(OutputFile.xml, outputDir + "/src/main/resources/mapper/quartz"));
})
diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/OldCodeGet.java b/common/common-generator/src/main/java/cn/bunny/common/generator/OldCodeGet.java
deleted file mode 100644
index d43819c..0000000
--- a/common/common-generator/src/main/java/cn/bunny/common/generator/OldCodeGet.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cn.bunny.common.generator;
-
-public class OldCodeGet {
- public static void main(String[] args) {
- // // 1、创建代码生成器
- // AutoGenerator mpg = new AutoGenerator();
- //
- // // 2、全局配置
- // // 全局配置
- // GlobalConfig gc = new GlobalConfig();
- // // TODO 需要修改路径名称
- // gc.setOutputDir("F:\\web项目\\Bunny-Cli\\Java\\java-template\\service" + "/src/main/java");
- // gc.setServiceName("%sService"); // 去掉Service接口的首字母I
- // gc.setAuthor("bunny");
- // gc.setOpen(false);
- // mpg.setGlobalConfig(gc);
- //
- // // 3、数据源配置
- // DataSourceConfig dsc = new DataSourceConfig();
- // // TODO 需要修改数据库
- // dsc.setUrl("jdbc:mysql://106.15.251.123:3305/guigu-oa?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true");
- // dsc.setDriverName("com.mysql.cj.jdbc.Driver");
- // dsc.setUsername("root");
- // dsc.setPassword("02120212");
- // dsc.setDbType(DbType.MYSQL);
- // mpg.setDataSource(dsc);
- //
- // // 4、包配置
- // PackageConfig pc = new PackageConfig();
- // pc.setParent("cn.bunny");
- // // TODO 需要修改模块名
- // pc.setModuleName("service");
- // pc.setController("controller");
- // pc.setService("service");
- // pc.setMapper("mapper");
- // mpg.setPackageInfo(pc);
- //
- // // 5、策略配置
- // StrategyConfig strategy = getStrategyConfig();
- // mpg.setStrategy(strategy);
- //
- // // 6、执行
- // mpg.execute();
- // }
- //
- // private static StrategyConfig getStrategyConfig() {
- // StrategyConfig strategy = new StrategyConfig();
- // // TODO 要生成的表
- // strategy.setInclude("sys_menu", "sys_role_menu");
- // strategy.setNaming(NamingStrategy.underline_to_camel);// 数据库表映射到实体的命名策略
- // strategy.setColumnNaming(NamingStrategy.underline_to_camel);// 数据库表字段映射到实体的命名策略
- // strategy.setEntityLombokModel(true); // lombok 模型 @Accessors(chain = true) setter链式操作
- // strategy.setRestControllerStyle(true); // restful api风格控制器
- // strategy.setControllerMappingHyphenStyle(true); // url中驼峰转连字符
- // return strategy;
- }
-}
diff --git a/dao/src/main/java/cn/bunny/entity/system/quartz/JobList.java b/dao/src/main/java/cn/bunny/entity/system/quartz/JobList.java
new file mode 100644
index 0000000..7077dc7
--- /dev/null
+++ b/dao/src/main/java/cn/bunny/entity/system/quartz/JobList.java
@@ -0,0 +1,43 @@
+package cn.bunny.entity.system.quartz;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ *
+ * VIEW
+ *
+ *
+ * @author Bunny
+ * @since 2024-07-26
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("job_list")
+@ApiModel(value = "JobList对象", description = "VIEW")
+public class JobList implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ private String jobName;
+
+ private String jobGroup;
+
+ private String description;
+
+ private String jobClassName;
+
+ private String cronExpression;
+
+ private String triggerName;
+
+ private String triggerState;
+}
diff --git a/service/src/main/java/cn/bunny/service/controller/JobController.java b/service/src/main/java/cn/bunny/service/controller/JobController.java
index 3fb7888..8f3f586 100644
--- a/service/src/main/java/cn/bunny/service/controller/JobController.java
+++ b/service/src/main/java/cn/bunny/service/controller/JobController.java
@@ -2,8 +2,11 @@ package cn.bunny.service.controller;
import cn.bunny.dto.quartz.QuartzAddDto;
import cn.bunny.dto.quartz.QuartzOperationDto;
+import cn.bunny.entity.system.quartz.JobList;
import cn.bunny.pojo.result.Result;
import cn.bunny.service.service.JobService;
+import cn.bunny.vo.page.PageResult;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +20,17 @@ public class JobController {
@Autowired
private JobService jobService;
+ @Operation(summary = "分页查询所有任务", description = "分页查询所有任务")
+ @PostMapping("/page/{page}/{limit}")
+ public Result> pageQuery(
+ @PathVariable Integer page,
+ @PathVariable Integer limit
+ ) {
+ Page pageParams = new Page<>();
+ PageResult pageResult = jobService.pageQuery(pageParams);
+ return Result.success(pageResult);
+ }
+
@Operation(summary = "添加任务", description = "添加任务")
@PostMapping("/add")
public Result addJob(@RequestBody QuartzAddDto dto) {
diff --git a/service/src/main/java/cn/bunny/service/mapper/JobListMapper.java b/service/src/main/java/cn/bunny/service/mapper/JobListMapper.java
new file mode 100644
index 0000000..520a305
--- /dev/null
+++ b/service/src/main/java/cn/bunny/service/mapper/JobListMapper.java
@@ -0,0 +1,18 @@
+package cn.bunny.service.mapper;
+
+import cn.bunny.entity.system.quartz.JobList;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *
+ * VIEW Mapper 接口
+ *
+ *
+ * @author Bunny
+ * @since 2024-07-26
+ */
+@Mapper
+public interface JobListMapper extends BaseMapper {
+
+}
diff --git a/service/src/main/java/cn/bunny/service/service/JobService.java b/service/src/main/java/cn/bunny/service/service/JobService.java
index 6bb3428..fac71ff 100644
--- a/service/src/main/java/cn/bunny/service/service/JobService.java
+++ b/service/src/main/java/cn/bunny/service/service/JobService.java
@@ -2,8 +2,12 @@ package cn.bunny.service.service;
import cn.bunny.dto.quartz.QuartzAddDto;
import cn.bunny.dto.quartz.QuartzOperationDto;
+import cn.bunny.entity.system.quartz.JobList;
+import cn.bunny.vo.page.PageResult;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
-public interface JobService {
+public interface JobService extends IService {
/**
* * 添加任务
@@ -32,4 +36,12 @@ public interface JobService {
* @param dto 移出任务
*/
void remove(QuartzOperationDto dto);
+
+ /**
+ * * 分页查询所有任务
+ *
+ * @param pageParams 分页删除
+ * @return 分页结果
+ */
+ PageResult pageQuery(Page pageParams);
}
diff --git a/service/src/main/java/cn/bunny/service/service/impl/JobServiceImpl.java b/service/src/main/java/cn/bunny/service/service/impl/JobServiceImpl.java
index 2841de0..c810e78 100644
--- a/service/src/main/java/cn/bunny/service/service/impl/JobServiceImpl.java
+++ b/service/src/main/java/cn/bunny/service/service/impl/JobServiceImpl.java
@@ -2,8 +2,13 @@ package cn.bunny.service.service.impl;
import cn.bunny.dto.quartz.QuartzAddDto;
import cn.bunny.dto.quartz.QuartzOperationDto;
+import cn.bunny.entity.system.quartz.JobList;
+import cn.bunny.service.mapper.JobListMapper;
import cn.bunny.service.service.JobService;
+import cn.bunny.vo.page.PageResult;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.quartz.*;
@@ -16,7 +21,7 @@ import java.lang.reflect.Constructor;
@Service
@DS("quartz")
@Slf4j
-public class JobServiceImpl implements JobService {
+public class JobServiceImpl extends ServiceImpl implements JobService {
@Autowired
private Scheduler scheduler;
@@ -96,4 +101,22 @@ public class JobServiceImpl implements JobService {
log.warn("删除成功");
}
+
+ /**
+ * * 分页查询所有任务
+ *
+ * @param pageParams 分页删除
+ * @return 分页结果
+ */
+ @Override
+ public PageResult pageQuery(Page pageParams) {
+ Page listPage = page(pageParams);
+
+ return PageResult.builder()
+ .pageNo((int) listPage.getCurrent())
+ .pageSize((int) listPage.getSize())
+ .total(listPage.getTotal())
+ .list(listPage.getRecords())
+ .build();
+ }
}
diff --git a/service/src/main/resources/mapper/quartz/JobListMapper.xml b/service/src/main/resources/mapper/quartz/JobListMapper.xml
new file mode 100644
index 0000000..2d05d6e
--- /dev/null
+++ b/service/src/main/resources/mapper/quartz/JobListMapper.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ jobName, jobGroup, description, jobClassName, cronExpression, triggerName, triggerState
+
+
+
diff --git a/service/src/test/java/cn/bunny/test.json b/service/src/test/java/cn/bunny/test.json
new file mode 100644
index 0000000..6f30489
--- /dev/null
+++ b/service/src/test/java/cn/bunny/test.json
@@ -0,0 +1,13 @@
+{
+ "jobName": "hello2 方法",
+ "jobGroup": "test"
+}
+
+{
+ "jobName": "hello 方法",
+ "jobGroup": "test",
+ "description": "测试方法",
+ "jobClassName": "cn.bunny.service.job.dynamic.JobHello",
+ "jobMethodName": "start",
+ "cronExpression": "0/2 * * * * ?"
+}
\ No newline at end of file