From 6f30ff71f54ca200273a85ff816480e5c26c8516 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 24 Jun 2025 09:56:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E9=9B=86=E6=88=90?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E8=AE=B0=E5=BD=95=E6=94=AF=E6=8C=81=E5=85=A5?= =?UTF-8?q?=E5=8F=82=E3=80=81=E7=BB=93=E6=9E=9C=E3=80=81=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E5=86=85=E5=AE=B9=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1436241948540928]集成调用记录支持入参、结果、错误信息的内容进行过滤 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1436241948540928 --- .../IntegrationAuditSearchApi.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/neatlogic/module/tenant/api/integration/IntegrationAuditSearchApi.java b/src/main/java/neatlogic/module/tenant/api/integration/IntegrationAuditSearchApi.java index fc49efd7..56897d26 100644 --- a/src/main/java/neatlogic/module/tenant/api/integration/IntegrationAuditSearchApi.java +++ b/src/main/java/neatlogic/module/tenant/api/integration/IntegrationAuditSearchApi.java @@ -35,6 +35,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; @Service @@ -70,6 +71,7 @@ public class IntegrationAuditSearchApi extends PrivateApiComponentBase { @Param(name = "timeRange", type = ApiParamType.INTEGER, desc = "时间范围"), @Param(name = "timeUnit", type = ApiParamType.ENUM, rule = "year,month,week,day,hour", desc = "时间范围单位"), @Param(name = "statusList", type = ApiParamType.JSONARRAY, desc = "状态"), + @Param(name = "paramKeyword", type = ApiParamType.STRING, desc = "入参关键字"), }) @Output({ @Param(explode = BasePageVo.class), @Param(name = "tbodyList", explode = IntegrationAuditVo[].class) @@ -78,7 +80,7 @@ public class IntegrationAuditSearchApi extends PrivateApiComponentBase { @Override public Object myDoService(JSONObject jsonObj) { IntegrationAuditVo paramAuditVo = JSON.toJavaObject(jsonObj, IntegrationAuditVo.class); - List returnList = null; + List returnList = new ArrayList<>(); //将时间范围转为 开始时间、结束时间 if (paramAuditVo.getStartTime() == null && paramAuditVo.getEndTime() == null) { @@ -97,13 +99,21 @@ public class IntegrationAuditSearchApi extends PrivateApiComponentBase { int auditCount = integrationMapper.getIntegrationAuditCount(paramAuditVo); if (auditCount > 0) { paramAuditVo.setRowNum(auditCount); - returnList = integrationMapper.searchIntegrationAudit(paramAuditVo); - } - - if (CollectionUtils.isEmpty(returnList)) { - returnList = new ArrayList<>(); + List idList = integrationMapper.getIntegrationAuditIdList(paramAuditVo); + if (CollectionUtils.isNotEmpty(idList)) { + List integrationAuditList = integrationMapper.getIntegrationAuditListByIdList(idList); + for (Long id : idList) { + for (IntegrationAuditVo integrationAuditVo : integrationAuditList) { + if (Objects.equals(integrationAuditVo.getId(), id)) { + returnList.add(integrationAuditVo); + break; + } + } + } + } +// paramAuditVo.setParamKeyword(null); +// List returnList2 = integrationMapper.searchIntegrationAudit(paramAuditVo); } - return TableResultUtil.getResult(returnList, paramAuditVo); } } -- Gitee From 714f786cdba4dc973f873d71bbf7a5657331cf48 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 24 Jun 2025 18:21:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E9=9B=86=E6=88=90?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E8=AE=B0=E5=BD=95=E6=94=AF=E6=8C=81=E5=85=A5?= =?UTF-8?q?=E5=8F=82=E3=80=81=E7=BB=93=E6=9E=9C=E3=80=81=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E5=86=85=E5=AE=B9=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1436241948540928]集成调用记录支持入参、结果、错误信息的内容进行过滤 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1436241948540928 --- .../tenant/api/integration/IntegrationAuditSearchApi.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/neatlogic/module/tenant/api/integration/IntegrationAuditSearchApi.java b/src/main/java/neatlogic/module/tenant/api/integration/IntegrationAuditSearchApi.java index 56897d26..ccce20c8 100644 --- a/src/main/java/neatlogic/module/tenant/api/integration/IntegrationAuditSearchApi.java +++ b/src/main/java/neatlogic/module/tenant/api/integration/IntegrationAuditSearchApi.java @@ -111,8 +111,6 @@ public class IntegrationAuditSearchApi extends PrivateApiComponentBase { } } } -// paramAuditVo.setParamKeyword(null); -// List returnList2 = integrationMapper.searchIntegrationAudit(paramAuditVo); } return TableResultUtil.getResult(returnList, paramAuditVo); } -- Gitee