From c77b29dd308a4b8cc250bda72acda8ef9833f938 Mon Sep 17 00:00:00 2001 From: songjun Date: Wed, 18 Oct 2023 12:35:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...TesterTaskInterfaceRelationController.java | 22 +++++++++++--- .../TesterTaskInterfaceRelationOut.java | 30 ++++++++++++++++++- .../TesterTaskInterfaceRelationMapper.java | 20 +++++++------ .../ITesterTaskInterfaceRelationService.java | 18 ++++++----- ...esterTaskInterfaceRelationServiceImpl.java | 27 ++++++++++++----- .../TesterTaskInterfaceRelationMapper.xml | 9 ++++++ .../task_interface_relation.html | 12 ++++---- 7 files changed, 102 insertions(+), 36 deletions(-) diff --git a/tester/src/main/java/com/ruoyi/tester/controller/TesterTaskInterfaceRelationController.java b/tester/src/main/java/com/ruoyi/tester/controller/TesterTaskInterfaceRelationController.java index 4493dcb..e4aeb1e 100644 --- a/tester/src/main/java/com/ruoyi/tester/controller/TesterTaskInterfaceRelationController.java +++ b/tester/src/main/java/com/ruoyi/tester/controller/TesterTaskInterfaceRelationController.java @@ -1,8 +1,6 @@ package com.ruoyi.tester.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -82,7 +80,23 @@ public class TesterTaskInterfaceRelationController extends BaseController startPage(); List list = testerTaskInterfaceRelationService.selectTesterTaskInterfaceRelationList(testerTaskInterfaceRelation); TableDataInfo dataTable = getDataTable(list); - List ret = dataTable.getRows().stream().map(x -> new TesterTaskInterfaceRelationOut((TesterTaskInterfaceRelation) x, taskMap, interfaceMap)).collect(Collectors.toList()); + + Set dependRelationIdSet = new HashSet<>(); + for (TesterTaskInterfaceRelation item : list) { + String dependRelationIds = item.getDependRelationIds(); + if (StringUtils.hasLength(dependRelationIds)) { + String[] split = dependRelationIds.split(","); + for (String s : split) { + if (StringUtils.hasLength(s.trim())) { + dependRelationIdSet.add(Long.valueOf(s.trim())); + } + } + } + } + List depends = testerTaskInterfaceRelationService.selectInRelationIds(dependRelationIdSet); + Map dependMap = depends.stream().collect(Collectors.toMap(TesterTaskInterfaceRelation::getRelationId, Function.identity())); + + List ret = list.stream().map(x -> new TesterTaskInterfaceRelationOut(x, taskMap, interfaceMap, dependMap)).collect(Collectors.toList()); dataTable.setRows(ret); return dataTable; } diff --git a/tester/src/main/java/com/ruoyi/tester/domain/TesterTaskInterfaceRelationOut.java b/tester/src/main/java/com/ruoyi/tester/domain/TesterTaskInterfaceRelationOut.java index ff3f126..c8800f4 100644 --- a/tester/src/main/java/com/ruoyi/tester/domain/TesterTaskInterfaceRelationOut.java +++ b/tester/src/main/java/com/ruoyi/tester/domain/TesterTaskInterfaceRelationOut.java @@ -1,6 +1,7 @@ package com.ruoyi.tester.domain; import com.ruoyi.common.annotation.Excel; +import org.springframework.util.StringUtils; import java.util.Map; @@ -33,6 +34,8 @@ public class TesterTaskInterfaceRelationOut { /** 依赖关系id(以逗号分隔) */ private String dependRelationIds; + //依赖关系描述 + private String dependRelationDesc; /** 依赖参数 */ private String dependParam; @@ -55,7 +58,7 @@ public class TesterTaskInterfaceRelationOut { /** 状态（0正常 1停用） */ private String status; - public TesterTaskInterfaceRelationOut(TesterTaskInterfaceRelation item, Map taskMap, Map interfaceMap) { + public TesterTaskInterfaceRelationOut(TesterTaskInterfaceRelation item, Map taskMap, Map interfaceMap, Map dependMap) { this.relationId = item.getRelationId(); this.taskId = item.getTaskId(); if (taskMap.containsKey(taskId)) { @@ -76,6 +79,23 @@ public class TesterTaskInterfaceRelationOut { this.pathParam = item.getPathParam(); this.loginConfigId = item.getLoginConfigId(); this.status = item.getStatus(); + + if (StringUtils.hasLength(this.dependRelationIds)) { + String[] split = this.dependRelationIds.split(","); + for (String s : split) { + if (StringUtils.hasLength(s.trim())) { + TesterTaskInterfaceRelation relation = dependMap.get(Long.valueOf(s.trim())); + if (relation != null) { + if (this.dependRelationDesc == null) { + this.dependRelationDesc = "[" + relation.getDescription() + "]"; + } else { + this.dependRelationDesc += "
"; + this.dependRelationDesc += "[" + relation.getDescription() + "]"; + } + } + } + } + } } public Long getRelationId() { @@ -150,6 +170,14 @@ public class TesterTaskInterfaceRelationOut { this.dependRelationIds = dependRelationIds; } + public String getDependRelationDesc() { + return dependRelationDesc; + } + + public void setDependRelationDesc(String dependRelationDesc) { + this.dependRelationDesc = dependRelationDesc; + } + public String getDependParam() { return dependParam; } diff --git a/tester/src/main/java/com/ruoyi/tester/mapper/TesterTaskInterfaceRelationMapper.java b/tester/src/main/java/com/ruoyi/tester/mapper/TesterTaskInterfaceRelationMapper.java index 798e272..f4f0b42 100644 --- a/tester/src/main/java/com/ruoyi/tester/mapper/TesterTaskInterfaceRelationMapper.java +++ b/tester/src/main/java/com/ruoyi/tester/mapper/TesterTaskInterfaceRelationMapper.java @@ -1,19 +1,21 @@ package com.ruoyi.tester.mapper; +import java.util.Collection; import java.util.List; import com.ruoyi.tester.domain.TesterTaskInterfaceRelation; +import org.apache.ibatis.annotations.Param; /** * 任务-接口关联关系Mapper接口 - * + * * @author SJ * @date 2022-04-25 */ -public interface TesterTaskInterfaceRelationMapper +public interface TesterTaskInterfaceRelationMapper { /** * 查询任务-接口关联关系 - * + * * @param relationId 任务-接口关联关系主键 * @return 任务-接口关联关系 */ @@ -21,15 +23,15 @@ public interface TesterTaskInterfaceRelationMapper /** * 查询任务-接口关联关系列表 - * + * * @param testerTaskInterfaceRelation 任务-接口关联关系 * @return 任务-接口关联关系集合 */ public List selectTesterTaskInterfaceRelationList(TesterTaskInterfaceRelation testerTaskInterfaceRelation); - + public List selectInRelationIds(@Param("relationIds") Collection relationIds); /** * 新增任务-接口关联关系 - * + * * @param testerTaskInterfaceRelation 任务-接口关联关系 * @return 结果 */ @@ -37,7 +39,7 @@ public interface TesterTaskInterfaceRelationMapper /** * 修改任务-接口关联关系 - * + * * @param testerTaskInterfaceRelation 任务-接口关联关系 * @return 结果 */ @@ -45,7 +47,7 @@ public interface TesterTaskInterfaceRelationMapper /** * 删除任务-接口关联关系 - * + * * @param relationId 任务-接口关联关系主键 * @return 结果 */ @@ -53,7 +55,7 @@ public interface TesterTaskInterfaceRelationMapper /** * 批量删除任务-接口关联关系 - * + * * @param relationIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/tester/src/main/java/com/ruoyi/tester/service/ITesterTaskInterfaceRelationService.java b/tester/src/main/java/com/ruoyi/tester/service/ITesterTaskInterfaceRelationService.java index e2393ae..1fccdf2 100644 --- a/tester/src/main/java/com/ruoyi/tester/service/ITesterTaskInterfaceRelationService.java +++ b/tester/src/main/java/com/ruoyi/tester/service/ITesterTaskInterfaceRelationService.java @@ -1,19 +1,20 @@ package com.ruoyi.tester.service; +import java.util.Collection; import java.util.List; import com.ruoyi.tester.domain.TesterTaskInterfaceRelation; /** * 任务-接口关联关系Service接口 - * + * * @author SJ * @date 2022-04-25 */ -public interface ITesterTaskInterfaceRelationService +public interface ITesterTaskInterfaceRelationService { /** * 查询任务-接口关联关系 - * + * * @param relationId 任务-接口关联关系主键 * @return 任务-接口关联关系 */ @@ -21,15 +22,16 @@ public interface ITesterTaskInterfaceRelationService /** * 查询任务-接口关联关系列表 - * + * * @param testerTaskInterfaceRelation 任务-接口关联关系 * @return 任务-接口关联关系集合 */ public List selectTesterTaskInterfaceRelationList(TesterTaskInterfaceRelation testerTaskInterfaceRelation); + public List selectInRelationIds(Collection relationIds); /** * 新增任务-接口关联关系 - * + * * @param testerTaskInterfaceRelation 任务-接口关联关系 * @return 结果 */ @@ -37,7 +39,7 @@ public interface ITesterTaskInterfaceRelationService /** * 修改任务-接口关联关系 - * + * * @param testerTaskInterfaceRelation 任务-接口关联关系 * @return 结果 */ @@ -45,7 +47,7 @@ public interface ITesterTaskInterfaceRelationService /** * 批量删除任务-接口关联关系 - * + * * @param relationIds 需要删除的任务-接口关联关系主键集合 * @return 结果 */ @@ -53,7 +55,7 @@ public interface ITesterTaskInterfaceRelationService /** * 删除任务-接口关联关系信息 - * + * * @param relationId 任务-接口关联关系主键 * @return 结果 */ diff --git a/tester/src/main/java/com/ruoyi/tester/service/impl/TesterTaskInterfaceRelationServiceImpl.java b/tester/src/main/java/com/ruoyi/tester/service/impl/TesterTaskInterfaceRelationServiceImpl.java index 3acd60a..8d0bd6b 100644 --- a/tester/src/main/java/com/ruoyi/tester/service/impl/TesterTaskInterfaceRelationServiceImpl.java +++ b/tester/src/main/java/com/ruoyi/tester/service/impl/TesterTaskInterfaceRelationServiceImpl.java @@ -1,5 +1,7 @@ package com.ruoyi.tester.service.impl; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -8,22 +10,23 @@ import com.ruoyi.tester.mapper.TesterTaskInterfaceRelationMapper; import com.ruoyi.tester.domain.TesterTaskInterfaceRelation; import com.ruoyi.tester.service.ITesterTaskInterfaceRelationService; import com.ruoyi.common.core.text.Convert; +import org.springframework.util.CollectionUtils; /** * 任务-接口关联关系Service业务层处理 - * + * * @author SJ * @date 2022-04-25 */ @Service -public class TesterTaskInterfaceRelationServiceImpl implements ITesterTaskInterfaceRelationService +public class TesterTaskInterfaceRelationServiceImpl implements ITesterTaskInterfaceRelationService { @Autowired private TesterTaskInterfaceRelationMapper testerTaskInterfaceRelationMapper; /** * 查询任务-接口关联关系 - * + * * @param relationId 任务-接口关联关系主键 * @return 任务-接口关联关系 */ @@ -35,7 +38,7 @@ public class TesterTaskInterfaceRelationServiceImpl implements ITesterTaskInterf /** * 查询任务-接口关联关系列表 - * + * * @param testerTaskInterfaceRelation 任务-接口关联关系 * @return 任务-接口关联关系 */ @@ -45,9 +48,17 @@ public class TesterTaskInterfaceRelationServiceImpl implements ITesterTaskInterf return testerTaskInterfaceRelationMapper.selectTesterTaskInterfaceRelationList(testerTaskInterfaceRelation); } + @Override + public List selectInRelationIds(Collection relationIds){ + if (CollectionUtils.isEmpty(relationIds)) { + return new ArrayList<>(); + } + return testerTaskInterfaceRelationMapper.selectInRelationIds(relationIds); + } + /** * 新增任务-接口关联关系 - * + * * @param testerTaskInterfaceRelation 任务-接口关联关系 * @return 结果 */ @@ -60,7 +71,7 @@ public class TesterTaskInterfaceRelationServiceImpl implements ITesterTaskInterf /** * 修改任务-接口关联关系 - * + * * @param testerTaskInterfaceRelation 任务-接口关联关系 * @return 结果 */ @@ -73,7 +84,7 @@ public class TesterTaskInterfaceRelationServiceImpl implements ITesterTaskInterf /** * 批量删除任务-接口关联关系 - * + * * @param relationIds 需要删除的任务-接口关联关系主键 * @return 结果 */ @@ -85,7 +96,7 @@ public class TesterTaskInterfaceRelationServiceImpl implements ITesterTaskInterf /** * 删除任务-接口关联关系信息 - * + * * @param relationId 任务-接口关联关系主键 * @return 结果 */ diff --git a/tester/src/main/resources/mapper/tester/TesterTaskInterfaceRelationMapper.xml b/tester/src/main/resources/mapper/tester/TesterTaskInterfaceRelationMapper.xml index 29662e5..ef4f256 100644 --- a/tester/src/main/resources/mapper/tester/TesterTaskInterfaceRelationMapper.xml +++ b/tester/src/main/resources/mapper/tester/TesterTaskInterfaceRelationMapper.xml @@ -49,6 +49,15 @@ order by relation_id desc + +