From c6386fd709b66dc617910be8f967f717cb9679a5 Mon Sep 17 00:00:00 2001 From: bynt Date: Tue, 11 May 2021 19:51:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0sql=E6=96=87=E4=BB=B6=20?= =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TaskRecordServiceImpl.java | 37 +++++-------------- pom.xml | 3 +- sql/eladmin.sql | 21 +++++++++++ 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/impl/TaskRecordServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/impl/TaskRecordServiceImpl.java index cc271c0..956239a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/impl/TaskRecordServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/impl/TaskRecordServiceImpl.java @@ -36,12 +36,11 @@ import java.io.IOException; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.LinkedHashMap; -import java.util.stream.Collectors; /** - * @author x * @website https://el-admin.vip * @description 服务实现 + * @author x * @date 2020-09-09 **/ @Service @@ -52,34 +51,26 @@ public class TaskRecordServiceImpl implements TaskRecordService { private final TaskRecordMapper taskRecordMapper; @Override - public Map queryAll(TaskRecordQueryCriteria criteria, Pageable pageable) { - // 查询出一级 - criteria.setParentId(0L); - Page page = - taskRecordRepository.findAll - ((root, criteriaQuery, criteriaBuilder) -> - QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable); - - // 找出所有 - List all = taskRecordRepository.findAll(); - page.getContent().stream().peek(taskRecord -> taskRecord.setChildren(getChildrens(taskRecord, all))).collect(Collectors.toList()); + public Map queryAll(TaskRecordQueryCriteria criteria, Pageable pageable){ + Page page = taskRecordRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); return PageUtil.toPage(page.map(taskRecordMapper::toDto)); } @Override - public List queryAll(TaskRecordQueryCriteria criteria) { - return taskRecordMapper.toDto(taskRecordRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder))); + public List queryAll(TaskRecordQueryCriteria criteria){ + return taskRecordMapper.toDto(taskRecordRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); } @Override @Transactional public TaskRecordDto findById(Integer id) { TaskRecord taskRecord = taskRecordRepository.findById(id).orElseGet(TaskRecord::new); - ValidationUtil.isNull(taskRecord.getId(), "TaskRecord", "id", id); + ValidationUtil.isNull(taskRecord.getId(),"TaskRecord","id",id); return taskRecordMapper.toDto(taskRecord); } + @Override @Transactional(rollbackFor = Exception.class) public TaskRecordDto create(TaskRecord resources) { @@ -92,7 +83,7 @@ public class TaskRecordServiceImpl implements TaskRecordService { @Transactional(rollbackFor = Exception.class) public TaskRecord update(TaskRecord resources) { TaskRecord taskRecord = taskRecordRepository.findById(resources.getId()).orElseGet(TaskRecord::new); - ValidationUtil.isNull(taskRecord.getId(), "TaskRecord", "id", resources.getId()); + ValidationUtil.isNull( taskRecord.getId(),"TaskRecord","id",resources.getId()); taskRecord.copy(resources); return taskRecordRepository.save(taskRecord); } @@ -108,7 +99,7 @@ public class TaskRecordServiceImpl implements TaskRecordService { public void download(List all, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); for (TaskRecordDto taskRecord : all) { - Map map = new LinkedHashMap<>(); + Map map = new LinkedHashMap<>(); map.put("创建时间", taskRecord.getGmtCreate()); map.put("修改时间", taskRecord.getGmtModified()); map.put("任务名称", taskRecord.getTaskName()); @@ -125,14 +116,4 @@ public class TaskRecordServiceImpl implements TaskRecordService { } FileUtil.downloadExcel(list, response); } - - /** - * 递归查找所有菜单的子菜单 - */ - private List getChildrens(TaskRecord taskRecord, List all) { - return all.stream().filter(categoryEntity -> categoryEntity.getParentId().equals(taskRecord.getId())).peek(categoryEntity -> { - //1、找到子任务 - categoryEntity.setChildren(getChildrens(categoryEntity, all)); - }).collect(Collectors.toList()); - } } diff --git a/pom.xml b/pom.xml index 0d51c0c..6ec9dcd 100644 --- a/pom.xml +++ b/pom.xml @@ -127,8 +127,9 @@ + - org.apache.shardingSphere + org.apache.shardingsphere sharding-jdbc-spring-boot-starter 4.0.0-RC1 diff --git a/sql/eladmin.sql b/sql/eladmin.sql index bccc611..a90dc73 100644 --- a/sql/eladmin.sql +++ b/sql/eladmin.sql @@ -812,3 +812,24 @@ CREATE TABLE `tool_qiniu_content` ( ) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='七牛云文件存储'; SET FOREIGN_KEY_CHECKS = 1; + + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for tb_build_task +-- ---------------------------- +DROP TABLE IF EXISTS `tb_build_task`; +CREATE TABLE `tb_build_task` ( + `id` bigint(0) NOT NULL AUTO_INCREMENT, + `gmt_create` datetime(0) NULL DEFAULT NULL, + `gmt_modified` datetime(0) NULL DEFAULT NULL, + `build_id` bigint(0) NULL DEFAULT -1 COMMENT '发送id', + `send_time` datetime(0) NULL DEFAULT NULL COMMENT '发送时间', + `is_send` tinyint(1) NULL DEFAULT -1 COMMENT '发送状态 1成功 0失败', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 6093 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1; +