xiaoe/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui测试前后端问题修复

Browse Source
This commit is contained in:
guocan
2025-05-27 14:32:09 +08:00
parent 2965095148
commit 64b57fc3ec
5 changed files with 133 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test-test/src/main/java/com/test/test/controller/PerformanceTestController.java
View File

@@ -2,6 +2,7 @@ package com.test.test.controller;
import java.util.List;
import com.test.common.utils.StringUtils;
import com.test.test.domain.PerformanceTest;
import com.test.test.domain.TestCase;
import com.test.test.domain.qo.PerformanceTestQO;
@@ -157,7 +158,8 @@ public class PerformanceTestController extends BaseController {
Long l = performanceTestService.updatePerformanceTest(performanceTestQO);
PerformanceTestVO updatedTask = performanceTestService.selectPerformanceTestById(performanceTestQO.getId());
// 如果crontab或crontab_status被修改了，则更新定时任务
if (!updatedTask.getCrontab().equals(originalTask.getCrontab())
if ((!StringUtils.isEmpty(updatedTask.getCrontab()) &&
!StringUtils.isEmpty(originalTask.getCrontab()) && !updatedTask.getCrontab().equals(originalTask.getCrontab()))
|| updatedTask.getCrontabStatus() != originalTask.getCrontabStatus()) {
PerformanceTest entity = new PerformanceTest();
entity.setId(updatedTask.getId());

8
test-test/src/main/java/com/test/test/service/impl/UiSceneStepsServiceImpl.java
View File

@@ -466,7 +466,7 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
*/
private List<UiHighSettingVO> extractbeforeSetting(List<UiHighSettingVO> settings) {
return settings.stream()
.filter(e -> "1".equals(e.getSettingType()) && 0 == e.getIsDisabled() )
.filter(e -> "1".equals(e.getSettingType()) && 1 == e.getIsDisabled() )
.collect(Collectors.toList()); // 返回默认设置
}
@@ -485,7 +485,7 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
result.put("continueExecution", continueExecution);
result.put("assertionReportVOS", assertionReports);
List<UiHighSettingVO> uiHighSettingVOS = settingList.stream()
.filter(setting -> setting.getOperateType().equals("2") && 0 == setting.getIsDisabled())
.filter(setting -> setting.getOperateType().equals("2") && 1 == setting.getIsDisabled())
.toList();
if (CollectionUtils.isEmpty(uiHighSettingVOS)) {
@@ -500,7 +500,7 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
assertionQOList.addAll(assertion.getWebTitles());
if (!CollectionUtils.isEmpty(assertionQOList)) {
for (AssertionQO assertionQO : assertionQOList) {
if ("1".equals(assertionQO.getIsDisabled())) {
if ("0".equals(assertionQO.getIsDisabled())) {
continue;
}
AssertionReportVO report = new AssertionReportVO();
@@ -905,7 +905,7 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
dataExtractionQOList.addAll(dataExtractionQO.getWindowExtractions());
if (!CollectionUtils.isEmpty(dataExtractionQOList)) {
for (DataExtractionQO extraction : dataExtractionQOList) {
if ("1".equals(extraction.getIsDisabled())) {
if ("0".equals(extraction.getIsDisabled())) {
continue;
}
try {