dromara/dbswitch
1
0
Fork 0
mirror of https://gitee.com/dromara/dbswitch.git synced 2025-10-16 14:43:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

代码格式化

Browse Source
This commit is contained in:
守護
2024-05-09 22:18:02 +08:00
parent daea60f20f
commit 3473986b86
5 changed files with 311 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/controller/privateapi/AssignmentController.java
View File

@@ -119,7 +119,7 @@ public class AssignmentController {
@ApiOperation(value = "导出") @ApiOperation(value = "导出")
@PostMapping(value = "/export") @PostMapping(value = "/export")
public void exportAssignments(@RequestParam(value = "ids") List<Long> ids, HttpServletResponse response) { public void exportAssignments(@RequestParam(value = "ids") List<Long> ids, HttpServletResponse response) {
assignmentService.exportAssignments(ids,response); assignmentService.exportAssignments(ids, response);
} }
} }

8
dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/AssignmentService.java
View File

@@ -147,7 +147,8 @@ public class AssignmentService {
public PageResult<AssignmentInfoResponse> listAll(AssignmentSearchRequest request) { public PageResult<AssignmentInfoResponse> listAll(AssignmentSearchRequest request) {
Supplier<List<AssignmentInfoResponse>> method = () -> { Supplier<List<AssignmentInfoResponse>> method = () -> {
List<AssignmentInfoResponse> assignmentInfoResponseList = ConverterFactory.getConverter(AssignmentInfoConverter.class) List<AssignmentInfoResponse> assignmentInfoResponseList = ConverterFactory.getConverter(
AssignmentInfoConverter.class)
.convert(assignmentTaskDAO.listAll(request.getSearchText())); .convert(assignmentTaskDAO.listAll(request.getSearchText()));
assignmentInfoResponseList.forEach((e) -> { assignmentInfoResponseList.forEach((e) -> {
AssignmentConfigEntity assignmentConfigEntity = this.assignmentConfigDAO.getByAssignmentTaskId(e.getId()); AssignmentConfigEntity assignmentConfigEntity = this.assignmentConfigDAO.getByAssignmentTaskId(e.getId());
@@ -380,7 +381,8 @@ public class AssignmentService {
AssignmentJobEntity assignmentJobEntity = this.assignmentJobMapper.selectOne( AssignmentJobEntity assignmentJobEntity = this.assignmentJobMapper.selectOne(
new LambdaQueryWrapper<AssignmentJobEntity>() new LambdaQueryWrapper<AssignmentJobEntity>()
.eq(AssignmentJobEntity::getAssignmentId, assignmentsDataResponse.getId()).orderByDesc(AssignmentJobEntity::getCreateTime) .eq(AssignmentJobEntity::getAssignmentId, assignmentsDataResponse.getId())
.orderByDesc(AssignmentJobEntity::getCreateTime)
.last(" limit 1 ")); .last(" limit 1 "));
Integer status = (assignmentJobEntity == null || assignmentJobEntity.getStatus() == null) ? Integer status = (assignmentJobEntity == null || assignmentJobEntity.getStatus() == null) ?
JobStatusEnum.INIT.getValue() : JobStatusEnum.INIT.getValue() :
@@ -388,6 +390,6 @@ public class AssignmentService {
assignmentsDataResponse.setRunStatus(JobStatusEnum.of(status).getName()); assignmentsDataResponse.setRunStatus(JobStatusEnum.of(status).getName());
assignmentsDataResponses.add(assignmentsDataResponse); assignmentsDataResponses.add(assignmentsDataResponse);
} }
EasyexcelUtils.write(response,AssignmentsDataResponse.class,assignmentsDataResponses,"任务管理","任务管理列表"); EasyexcelUtils.write(response, AssignmentsDataResponse.class, assignmentsDataResponses, "任务管理", "任务管理列表");
} }
} }

4
dbswitch-common/src/main/java/com/gitee/dbswitch/common/util/JdbcUrlUtils.java
View File

@@ -84,9 +84,9 @@ public final class JdbcUrlUtils {
return true; return true;
} }
public static String getTemplateUrl(String url){ public static String getTemplateUrl(String url) {
return url.replaceAll("\\[(\\?|;|:)\\{params}\\]|\\[|\\]", "") return url.replaceAll("\\[(\\?|;|:)\\{params}\\]|\\[|\\]", "")
.replace("\\?{params}",""); .replace("\\?{params}", "");
} }
/** /**