|
|
@ -36,12 +36,11 @@ import java.io.IOException;
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.LinkedHashMap;
|
|
|
|
import java.util.LinkedHashMap;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* @author x
|
|
|
|
|
|
|
|
* @website https://el-admin.vip
|
|
|
|
* @website https://el-admin.vip
|
|
|
|
* @description 服务实现
|
|
|
|
* @description 服务实现
|
|
|
|
|
|
|
|
* @author x
|
|
|
|
* @date 2020-09-09
|
|
|
|
* @date 2020-09-09
|
|
|
|
**/
|
|
|
|
**/
|
|
|
|
@Service
|
|
|
|
@Service
|
|
|
@ -52,34 +51,26 @@ public class TaskRecordServiceImpl implements TaskRecordService {
|
|
|
|
private final TaskRecordMapper taskRecordMapper;
|
|
|
|
private final TaskRecordMapper taskRecordMapper;
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public Map<String, Object> queryAll(TaskRecordQueryCriteria criteria, Pageable pageable) {
|
|
|
|
public Map<String,Object> queryAll(TaskRecordQueryCriteria criteria, Pageable pageable){
|
|
|
|
// 查询出一级
|
|
|
|
Page<TaskRecord> page = taskRecordRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
|
|
|
|
criteria.setParentId(0L);
|
|
|
|
|
|
|
|
Page<TaskRecord> page =
|
|
|
|
|
|
|
|
taskRecordRepository.findAll
|
|
|
|
|
|
|
|
((root, criteriaQuery, criteriaBuilder) ->
|
|
|
|
|
|
|
|
QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 找出所有
|
|
|
|
|
|
|
|
List<TaskRecord> all = taskRecordRepository.findAll();
|
|
|
|
|
|
|
|
page.getContent().stream().peek(taskRecord -> taskRecord.setChildren(getChildrens(taskRecord, all))).collect(Collectors.toList());
|
|
|
|
|
|
|
|
return PageUtil.toPage(page.map(taskRecordMapper::toDto));
|
|
|
|
return PageUtil.toPage(page.map(taskRecordMapper::toDto));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<TaskRecordDto> queryAll(TaskRecordQueryCriteria criteria) {
|
|
|
|
public List<TaskRecordDto> queryAll(TaskRecordQueryCriteria criteria){
|
|
|
|
return taskRecordMapper.toDto(taskRecordRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder)));
|
|
|
|
return taskRecordMapper.toDto(taskRecordRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional
|
|
|
|
@Transactional
|
|
|
|
public TaskRecordDto findById(Integer id) {
|
|
|
|
public TaskRecordDto findById(Integer id) {
|
|
|
|
TaskRecord taskRecord = taskRecordRepository.findById(id).orElseGet(TaskRecord::new);
|
|
|
|
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);
|
|
|
|
return taskRecordMapper.toDto(taskRecord);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public TaskRecordDto create(TaskRecord resources) {
|
|
|
|
public TaskRecordDto create(TaskRecord resources) {
|
|
|
@ -92,7 +83,7 @@ public class TaskRecordServiceImpl implements TaskRecordService {
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public TaskRecord update(TaskRecord resources) {
|
|
|
|
public TaskRecord update(TaskRecord resources) {
|
|
|
|
TaskRecord taskRecord = taskRecordRepository.findById(resources.getId()).orElseGet(TaskRecord::new);
|
|
|
|
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);
|
|
|
|
taskRecord.copy(resources);
|
|
|
|
return taskRecordRepository.save(taskRecord);
|
|
|
|
return taskRecordRepository.save(taskRecord);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -108,7 +99,7 @@ public class TaskRecordServiceImpl implements TaskRecordService {
|
|
|
|
public void download(List<TaskRecordDto> all, HttpServletResponse response) throws IOException {
|
|
|
|
public void download(List<TaskRecordDto> all, HttpServletResponse response) throws IOException {
|
|
|
|
List<Map<String, Object>> list = new ArrayList<>();
|
|
|
|
List<Map<String, Object>> list = new ArrayList<>();
|
|
|
|
for (TaskRecordDto taskRecord : all) {
|
|
|
|
for (TaskRecordDto taskRecord : all) {
|
|
|
|
Map<String, Object> map = new LinkedHashMap<>();
|
|
|
|
Map<String,Object> map = new LinkedHashMap<>();
|
|
|
|
map.put("创建时间", taskRecord.getGmtCreate());
|
|
|
|
map.put("创建时间", taskRecord.getGmtCreate());
|
|
|
|
map.put("修改时间", taskRecord.getGmtModified());
|
|
|
|
map.put("修改时间", taskRecord.getGmtModified());
|
|
|
|
map.put("任务名称", taskRecord.getTaskName());
|
|
|
|
map.put("任务名称", taskRecord.getTaskName());
|
|
|
@ -125,14 +116,4 @@ public class TaskRecordServiceImpl implements TaskRecordService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FileUtil.downloadExcel(list, response);
|
|
|
|
FileUtil.downloadExcel(list, response);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 递归查找所有菜单的子菜单
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
private List<TaskRecord> getChildrens(TaskRecord taskRecord, List<TaskRecord> all) {
|
|
|
|
|
|
|
|
return all.stream().filter(categoryEntity -> categoryEntity.getParentId().equals(taskRecord.getId())).peek(categoryEntity -> {
|
|
|
|
|
|
|
|
//1、找到子任务
|
|
|
|
|
|
|
|
categoryEntity.setChildren(getChildrens(categoryEntity, all));
|
|
|
|
|
|
|
|
}).collect(Collectors.toList());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|