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 a1ba2df..757e90a 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 @@ -62,7 +62,6 @@ public class PcapController { @Transactional(rollbackFor = Exception.class) public R add(@RequestParam(value = "files", required = true) List fileList, @RequestParam(value = "descriptions", required = false) List descriptionList, - @RequestParam(required = false) String workbookId, @RequestParam(required = false) String workspaceId) throws IOException { T.VerifyUtil.is(workspaceId).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY); @@ -70,7 +69,7 @@ public class PcapController { for (int i = 0; i < fileList.size(); i++) { MultipartFile file = fileList.get(i); String description = T.StrUtil.emptyToDefault(T.CollUtil.get(descriptionList, i), ""); - PcapEntity pcapEntity = pcapService.savePcap(file.getResource(), description, workbookId, workspaceId); + PcapEntity pcapEntity = pcapService.savePcap(file.getResource(), description, workspaceId); recordList.add( T.MapUtil.builder() .put("id", pcapEntity.getId()) diff --git a/src/main/java/net/geedge/asw/module/runner/service/impl/PcapServiceImpl.java b/src/main/java/net/geedge/asw/module/runner/service/impl/PcapServiceImpl.java index 9d1322f..5484252 100644 --- a/src/main/java/net/geedge/asw/module/runner/service/impl/PcapServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/runner/service/impl/PcapServiceImpl.java @@ -124,8 +124,7 @@ public class PcapServiceImpl extends ServiceImpl implements @Override public PcapEntity savePcap(Resource fileResource, String... params) { String description = T.ArrayUtil.get(params, 0); - String workbookId = T.ArrayUtil.get(params, 1); - String workspaceId = T.ArrayUtil.get(params, 2); + String workspaceId = T.ArrayUtil.get(params, 1); String createUserId = T.StrUtil.emptyToDefault(T.ArrayUtil.get(params, 3), StpUtil.getLoginIdAsString()); PcapEntity entity = new PcapEntity(); @@ -162,9 +161,6 @@ public class PcapServiceImpl extends ServiceImpl implements // save this.save(entity); - - // workbook resource - workbookResourceService.saveResource(workbookId, entity.getId(), WorkbookConstant.ResourceType.PCAP.getValue()); } catch (IOException e) { log.error(e, "[savePcap] [error] [workspaceId: {}]", workspaceId); throw new ASWException(RCode.ERROR); diff --git a/src/main/resources/db/mapper/runner/PcapMapper.xml b/src/main/resources/db/mapper/runner/PcapMapper.xml index 433720f..3639f0a 100644 --- a/src/main/resources/db/mapper/runner/PcapMapper.xml +++ b/src/main/resources/db/mapper/runner/PcapMapper.xml @@ -18,19 +18,14 @@ - - - - - - + - + @@ -46,28 +41,22 @@ SELECT pcap.*, job.id AS jobId, - - app.id AS app_id, - app.name AS app_name, - pkg.id AS pkg_id, pkg.platform AS pkg_platform, pkg.version AS pkg_version, - pkg.identifier AS pkg_identifier, + pkg.name AS pkg_name, - run.id AS run_id, - run.name AS run_name, + env.id AS em_id, + env.name AS em_name, pb.id AS pb_id, pb.name AS pb_name FROM pcap pcap left join job job on pcap.id = job.pcap_id - LEFT JOIN runner run ON job.runner_id = run.id + LEFT JOIN environment env ON job.env_id = env.id LEFT JOIN package pkg ON job.package_id = pkg.id LEFT JOIN playbook pb ON job.playbook_id = pb.id - LEFT JOIN application app ON pb.app_id = app.id - LEFT JOIN workbook_resource wr ON pcap.id = wr.resource_id AND wr.resource_type = 'pcap' pcap.id in @@ -83,19 +72,14 @@ #{id} - - AND app.id in - #{id} - - AND pkg.id in #{id} - - AND run.id in - #{id} + + AND env.id in + #{id} @@ -103,10 +87,6 @@ #{id} - - AND wr.workbook_id = #{params.workbookId} - - AND pcap.workspace_id = #{params.workspaceId}