From 621e7916dc92b05e6b01e66ccf3090ba747e316d Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 30 Nov 2022 22:09:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=BB=BB=E5=8A=A1=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/CrontabController.java | 54 +++++++++++++ .../mdd/admin/controller/IndexController.java | 8 +- .../mdd/admin/service/ICrontabService.java | 30 ++++++++ ...xCommonService.java => IIndexService.java} | 2 +- .../service/impl/CrontabServiceImpl.java | 76 +++++++++++++++++++ ...ServiceImpl.java => IndexServiceImpl.java} | 4 +- .../com/mdd/admin/vo/CrontabDetailVo.java | 18 +++++ .../com/mdd/admin/vo/CrontabListedVo.java | 18 +++++ .../java/com/mdd/common/entity/Crontab.java | 26 +++++++ .../com/mdd/common/mapper/CrontabMapper.java | 12 +++ 10 files changed, 241 insertions(+), 7 deletions(-) create mode 100644 server/like-admin/src/main/java/com/mdd/admin/controller/CrontabController.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/ICrontabService.java rename server/like-admin/src/main/java/com/mdd/admin/service/{IIndexCommonService.java => IIndexService.java} (88%) create mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/impl/CrontabServiceImpl.java rename server/like-admin/src/main/java/com/mdd/admin/service/impl/{IndexCommonServiceImpl.java => IndexServiceImpl.java} (96%) create mode 100644 server/like-admin/src/main/java/com/mdd/admin/vo/CrontabDetailVo.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/vo/CrontabListedVo.java create mode 100644 server/like-common/src/main/java/com/mdd/common/entity/Crontab.java create mode 100644 server/like-common/src/main/java/com/mdd/common/mapper/CrontabMapper.java diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/CrontabController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/CrontabController.java new file mode 100644 index 00000000..c91dab86 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/CrontabController.java @@ -0,0 +1,54 @@ +package com.mdd.admin.controller; + +import com.mdd.admin.service.ICrontabService; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.CrontabListedVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.annotation.Resource; + +@RequestMapping("api/crontab") +public class CrontabController { + + @Resource + ICrontabService iCrontabService; + + /** + * 计划任务列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @return AjaxResult + */ + @GetMapping("/list") + public AjaxResult list(@Validated PageValidate pageValidate) { + PageResult list = iCrontabService.list(pageValidate); + return AjaxResult.success(list); + } + + @GetMapping("/detail") + public AjaxResult detail() { + return AjaxResult.success(); + } + + @PostMapping("/add") + public AjaxResult add() { + return AjaxResult.success(); + } + + @PostMapping("/edit") + public AjaxResult edit() { + return AjaxResult.success(); + } + + @PostMapping("/del") + public AjaxResult del() { + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/IndexController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/IndexController.java index 6f9031d9..ca8c6139 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/IndexController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/IndexController.java @@ -1,6 +1,6 @@ package com.mdd.admin.controller; -import com.mdd.admin.service.IIndexCommonService; +import com.mdd.admin.service.IIndexService; import com.mdd.common.core.AjaxResult; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; @@ -19,7 +19,7 @@ import java.util.Map; public class IndexController { @Resource - IIndexCommonService iIndexCommonService; + IIndexService iIndexService; /** * 控制台 @@ -29,7 +29,7 @@ public class IndexController { */ @GetMapping("/console") public AjaxResult> console() { - Map map = iIndexCommonService.console(); + Map map = iIndexService.console(); return AjaxResult.success(map); } @@ -41,7 +41,7 @@ public class IndexController { */ @GetMapping("/config") public AjaxResult> config() { - Map map = iIndexCommonService.config(); + Map map = iIndexService.config(); return AjaxResult.success(map); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ICrontabService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ICrontabService.java new file mode 100644 index 00000000..4dd25426 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ICrontabService.java @@ -0,0 +1,30 @@ +package com.mdd.admin.service; + +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.CrontabDetailVo; +import com.mdd.admin.vo.CrontabListedVo; +import com.mdd.common.core.PageResult; + +/** + * 计划任务服务接口类 + */ +public interface ICrontabService { + + /** + * 计划任务列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @return PageResult + */ + PageResult list(PageValidate pageValidate); + + CrontabDetailVo detail(); + + void add(); + + void edit(); + + void del(); + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IIndexCommonService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IIndexService.java similarity index 88% rename from server/like-admin/src/main/java/com/mdd/admin/service/IIndexCommonService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IIndexService.java index 37cf1cae..bbfa80cb 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/IIndexCommonService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IIndexService.java @@ -5,7 +5,7 @@ import java.util.Map; /** * 主页服务接口类 */ -public interface IIndexCommonService { +public interface IIndexService { /** * 控制台数据 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/CrontabServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/CrontabServiceImpl.java new file mode 100644 index 00000000..d64ee522 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/CrontabServiceImpl.java @@ -0,0 +1,76 @@ +package com.mdd.admin.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.mdd.admin.service.ICrontabService; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.CrontabDetailVo; +import com.mdd.admin.vo.CrontabListedVo; +import com.mdd.admin.vo.article.ArticleListedVo; +import com.mdd.common.core.PageResult; +import com.mdd.common.entity.Crontab; +import com.mdd.common.mapper.CrontabMapper; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.LinkedList; +import java.util.List; + +/** + * 计划任务服务实现类 + */ +@Service +public class CrontabServiceImpl implements ICrontabService { + + @Resource + CrontabMapper crontabMapper; + + /** + * 计划任务列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @return PageResult + */ + @Override + public PageResult list(PageValidate pageValidate) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); + + IPage iPage = crontabMapper.selectPage(new Page<>(pageNo, pageSize), + new QueryWrapper() + .eq("is_delete", 0) + .orderByDesc("id")); + + List list = new LinkedList<>(); + for (Crontab crontab : iPage.getRecords()) { + CrontabListedVo vo = new CrontabListedVo(); + BeanUtils.copyProperties(crontab, vo); + } + + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); + } + + @Override + public CrontabDetailVo detail() { + return null; + } + + @Override + public void add() { + + } + + @Override + public void edit() { + + } + + @Override + public void del() { + + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/IndexCommonServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/IndexServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/mdd/admin/service/impl/IndexCommonServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/IndexServiceImpl.java index 33503143..6c8a65c6 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/IndexCommonServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/IndexServiceImpl.java @@ -1,6 +1,6 @@ package com.mdd.admin.service.impl; -import com.mdd.admin.service.IIndexCommonService; +import com.mdd.admin.service.IIndexService; import com.mdd.common.config.GlobalConfig; import com.mdd.common.utils.ArrayUtil; import com.mdd.common.utils.ConfigUtil; @@ -14,7 +14,7 @@ import java.util.*; * 主页服务实现类 */ @Service -public class IndexCommonServiceImpl implements IIndexCommonService { +public class IndexServiceImpl implements IIndexService { /** * 控制台数据 diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/CrontabDetailVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/CrontabDetailVo.java new file mode 100644 index 00000000..844a4b6c --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/CrontabDetailVo.java @@ -0,0 +1,18 @@ +package com.mdd.admin.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class CrontabDetailVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + private String name; + private String command; + private String rules; + private Integer status; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/CrontabListedVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/CrontabListedVo.java new file mode 100644 index 00000000..a8a5c0e3 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/CrontabListedVo.java @@ -0,0 +1,18 @@ +package com.mdd.admin.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class CrontabListedVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + private String name; + private String command; + private String rules; + private Integer status; + +} diff --git a/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java b/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java new file mode 100644 index 00000000..78371d44 --- /dev/null +++ b/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java @@ -0,0 +1,26 @@ +package com.mdd.common.entity; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 计划任务实体 + */ +@Data +public class Crontab implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; // 主键 + private String name; // 任务名称 + private String command; // 任务命令 + private String rules; // 任务规则 + private String remark; // 备注信息 + private Integer status; // 执行状态：1=运行, 2-停止, 3=错误 + private Integer isDelete; // 是否删除: 0=否, 1=是 + private Long createTime; // 创建时间 + private Long updateTime; // 更新时间 + private Long deleteTime; // 删除时间 + +} diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/CrontabMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/CrontabMapper.java new file mode 100644 index 00000000..99e42f88 --- /dev/null +++ b/server/like-common/src/main/java/com/mdd/common/mapper/CrontabMapper.java @@ -0,0 +1,12 @@ +package com.mdd.common.mapper; + +import com.mdd.common.core.basics.IBaseMapper; +import com.mdd.common.entity.Crontab; +import org.apache.ibatis.annotations.Mapper; + +/** + * 计划任务Mapper + */ +@Mapper +public interface CrontabMapper extends IBaseMapper { +}