diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasTaskConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasTaskConfig.java index 67d71a8..9b0751a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasTaskConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasTaskConfig.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -84,4 +85,11 @@ public class StasTaskConfig implements Serializable { @Excel(name = "描述", width = 15) @Schema(description = "描述") private String description; + + /**源库名称*/ + @TableField(exist = false) + private String sourceName; + /**目标库名称*/ + @TableField(exist = false) + private String targetName; } diff --git a/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/controller/StasTaskConfigController.java b/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/controller/StasTaskConfigController.java index 8a9fb5b..ed5a8de 100644 --- a/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/controller/StasTaskConfigController.java +++ b/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/controller/StasTaskConfigController.java @@ -2,6 +2,9 @@ package org.jeecg.taskConfig.controller; import java.sql.SQLException; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.servlet.http.HttpServletRequest; @@ -10,6 +13,8 @@ import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.enums.SyncTaskStatusEnum; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.dataSource.service.IStasDataSourceService; +import org.jeecg.modules.base.entity.StasDataSource; import org.jeecg.modules.base.entity.StasSyncStrategy; import org.jeecg.modules.base.entity.StasTaskConfig; import org.jeecg.quartz.entity.QuartzJob; @@ -47,6 +52,8 @@ public class StasTaskConfigController extends JeecgController page = new Page(pageNo, pageSize); IPage pageList = stasTaskConfigService.page(page, queryWrapper); + List records = pageList.getRecords(); + + Map dataSourceMap = stasDataSourceService.list().stream(). + collect(Collectors.toMap(StasDataSource::getId, StasDataSource::getInstanceName)); + for (StasTaskConfig record : records) { + String sourceName = dataSourceMap.get(record.getSourceId()); + if (sourceName != null) { + record.setSourceName(sourceName); + } + String targetName = dataSourceMap.get(record.getTargetId()); + if (targetName != null) { + record.setTargetName(targetName); + } + } + pageList.setRecords(records); return Result.OK(pageList); }