From c4bdd1897400044e1b34b388c2a28a9c90e3899a Mon Sep 17 00:00:00 2001 From: shizhendong Date: Mon, 23 Sep 2024 15:26:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20ASW-86=20pcap=20=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=93=8D=E5=BA=94=E8=A7=A3=E6=9E=90=E7=BB=93?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../runner/controller/PcapController.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/geedge/asw/module/runner/controller/PcapController.java b/src/main/java/net/geedge/asw/module/runner/controller/PcapController.java index bbc717d..a1ba2df 100644 --- a/src/main/java/net/geedge/asw/module/runner/controller/PcapController.java +++ b/src/main/java/net/geedge/asw/module/runner/controller/PcapController.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.net.url.UrlBuilder; import cn.hutool.log.Log; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import feign.Response; @@ -24,7 +25,11 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @RestController @RequestMapping("/api/v1/pcap") @@ -111,7 +116,19 @@ public class PcapController { T.VerifyUtil.is(ids).notEmpty(); pcapService.parse2session(ids); - return R.ok(); + + // records + List entityList = pcapService.list(new LambdaQueryWrapper().in(PcapEntity::getId, ids)); + List> records = entityList.stream() + .map(entity -> + Map.of( + "id", entity.getId(), + "name", entity.getName(), + "status", entity.getStatus() + ) + ) + .collect(Collectors.toList()); + return R.ok().putData("records", records); }