diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/afl/AFLWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/afl/AFLWorker.java index 816acd82..a0cb009a 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/afl/AFLWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/afl/AFLWorker.java @@ -181,7 +181,7 @@ public class AFLWorker extends DockerWorker { crashesSaveReq.setInstanceId(pipPipelineHisInstance.getId()); crashesSaveReq.setTaskId(taskId); crashesSaveReq.setTaskType("AFL"); - crashesSaveReq.setCity("长沙");// 暂时空置 + crashesSaveReq.setCity("长沙市");// 暂时空置 crashesSaveReq.setTargetType(pipeline.getTargetType()); crashesSaveReq.setTargetName(targetVersion.getFileName()); localAflCrashesService.saveLocalAflCrashesInfo(crashesSaveReq); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ApplicationWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ApplicationWorker.java index 6988f199..6f1479c4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ApplicationWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ApplicationWorker.java @@ -124,7 +124,7 @@ public class ApplicationWorker extends HttpWorker { postHandlerManager.registerPostHandler(new ExecuteTaskPostHandler(pipTask.getId(),pipelineId) { @Override public void executeAfterDone(PipPipelineHisInstance pipPipelineHisInstance) { - vulInfoService.scaToVulInfoSave(scaTaskId,pipeline.getTargetType(),fileName,"长沙",pipPipelineHisInstance.getId(),taskId,"APPLICATION"); + vulInfoService.scaToVulInfoSave(scaTaskId,pipeline.getTargetType(),fileName,"长沙市",pipPipelineHisInstance.getId(),taskId,"APPLICATION"); } }); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaBinaryWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaBinaryWorker.java index 74fcf623..b8664f9e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaBinaryWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaBinaryWorker.java @@ -126,7 +126,7 @@ public class ScaBinaryWorker extends HttpWorker { postHandlerManager.registerPostHandler(new ExecuteTaskPostHandler(pipTask.getId(),pipelineId) { @Override public void executeAfterDone(PipPipelineHisInstance pipPipelineHisInstance) { - vulInfoService.scaToVulInfoSave(scaTaskId,pipeline.getTargetType(),fileName,"长沙",pipPipelineHisInstance.getId(),taskId,"BINARY"); + vulInfoService.scaToVulInfoSave(scaTaskId,pipeline.getTargetType(),fileName,"长沙市",pipPipelineHisInstance.getId(),taskId,"BINARY"); } }); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaMirrorWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaMirrorWorker.java index 601a770c..4c7533e4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaMirrorWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaMirrorWorker.java @@ -124,7 +124,7 @@ public class ScaMirrorWorker extends HttpWorker { postHandlerManager.registerPostHandler(new ExecuteTaskPostHandler(pipTask.getId(),pipelineId) { @Override public void executeAfterDone(PipPipelineHisInstance pipPipelineHisInstance) { - vulInfoService.scaToVulInfoSave(scaTaskId,pipeline.getTargetType(),fileName,"长沙",pipPipelineHisInstance.getId(),taskId,"MIRROR"); + vulInfoService.scaToVulInfoSave(scaTaskId,pipeline.getTargetType(),fileName,"长沙市",pipPipelineHisInstance.getId(),taskId,"MIRROR"); } }); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaSbomWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaSbomWorker.java index 7f1d412a..4c93ab7d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaSbomWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/sca/ScaSbomWorker.java @@ -122,7 +122,7 @@ public class ScaSbomWorker extends HttpWorker { postHandlerManager.registerPostHandler(new ExecuteTaskPostHandler(pipTask.getId(),pipelineId) { @Override public void executeAfterDone(PipPipelineHisInstance pipPipelineHisInstance) { - vulInfoService.scaToVulInfoSave(scaTaskId,pipeline.getTargetType(),fileName,"长沙",pipPipelineHisInstance.getId(),taskId,"SCA_S_BOM"); + vulInfoService.scaToVulInfoSave(scaTaskId,pipeline.getTargetType(),fileName,"长沙市",pipPipelineHisInstance.getId(),taskId,"SCA_S_BOM"); } }); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/Impl/DataAnalysisServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/Impl/DataAnalysisServiceImpl.java index e701382e..5c4455ba 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/Impl/DataAnalysisServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/Impl/DataAnalysisServiceImpl.java @@ -129,7 +129,9 @@ public class DataAnalysisServiceImpl implements DataAnalysisService { if (Objects.nonNull(city)) { city = Optional.ofNullable(provinceCapitalMap.get(city)).orElse(city); } - return vulInfoDao.selectList(new QueryWrapper().lambda().eq(Objects.nonNull(city),VulInfo::getCity,city).orderByDesc(VulInfo::getCreateTime)); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Objects.nonNull(city),VulInfo::getCity,city).orderByDesc(VulInfo::getCreateTime).last("LIMIT 10"); + return vulInfoDao.selectList(wrapper); } @Override diff --git a/ops-server/src/test/java/cd/casic/server/VulInfoTest.java b/ops-server/src/test/java/cd/casic/server/VulInfoTest.java index ce541b96..16fffde3 100644 --- a/ops-server/src/test/java/cd/casic/server/VulInfoTest.java +++ b/ops-server/src/test/java/cd/casic/server/VulInfoTest.java @@ -49,7 +49,7 @@ public class VulInfoTest { String targetType = PipelineTargetTypeConstant.SOURCE_CODE; Integer scaTaskId = 681; String targetName="测试目标名称"; - String city = "长沙"; + String city = "长沙市"; String instanceId = "instanceId"; String taskId = "taskId"; String taskType ="taskType";