代码结构

This commit is contained in:
chenjianxing 2020-05-12 19:14:13 +08:00
parent 0a2169b09e
commit 63ade5a017
48 changed files with 93 additions and 138 deletions

View File

@ -1,6 +1,6 @@
package io.metersphere.base.mapper.ext;
import io.metersphere.controller.request.testplan.QueryTestPlanRequest;
import io.metersphere.track.request.testplan.QueryTestPlanRequest;
import io.metersphere.dto.LoadTestDTO;
import org.apache.ibatis.annotations.Param;

View File

@ -7,7 +7,7 @@
<result column="project_name" property="projectName"/>
</resultMap>
<select id="list" resultMap="BaseResultMap" parameterType="io.metersphere.controller.request.testplan.QueryTestPlanRequest">
<select id="list" resultMap="BaseResultMap" parameterType="io.metersphere.track.request.testplan.QueryTestPlanRequest">
select load_test.*, project.name as project_name
from load_test
left join project on load_test.project_id = project.id

View File

@ -1,8 +1,8 @@
package io.metersphere.base.mapper.ext;
import io.metersphere.base.domain.TestCase;
import io.metersphere.controller.request.testcase.QueryTestCaseRequest;
import io.metersphere.dto.TestCaseDTO;
import io.metersphere.track.request.testcase.QueryTestCaseRequest;
import io.metersphere.track.dto.TestCaseDTO;
import org.apache.ibatis.annotations.Param;
import java.util.List;

View File

@ -20,7 +20,7 @@
ORDER BY test_case.update_time DESC
</select>
<select id="list" resultType="io.metersphere.dto.TestCaseDTO">
<select id="list" resultType="io.metersphere.track.dto.TestCaseDTO">
select test_case.* from test_case
<where>
<if test="request.name != null">

View File

@ -1,7 +1,7 @@
package io.metersphere.base.mapper.ext;
import io.metersphere.controller.request.testcase.QueryTestPlanRequest;
import io.metersphere.dto.TestPlanDTO;
import io.metersphere.track.request.testcase.QueryTestPlanRequest;
import io.metersphere.track.dto.TestPlanDTO;
import org.apache.ibatis.annotations.Param;
import java.util.List;

View File

@ -2,12 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.metersphere.base.mapper.ext.ExtTestPlanMapper">
<resultMap id="BaseResultMap" type="io.metersphere.dto.TestPlanDTO"
<resultMap id="BaseResultMap" type="io.metersphere.track.dto.TestPlanDTO"
extends="io.metersphere.base.mapper.TestPlanMapper.BaseResultMap">
<result column="project_name" property="projectName"/>
</resultMap>
<select id="list" resultMap="BaseResultMap" parameterType="io.metersphere.controller.request.testcase.QueryTestPlanRequest">
<select id="list" resultMap="BaseResultMap" parameterType="io.metersphere.track.request.testcase.QueryTestPlanRequest">
select test_plan.*, project.name as project_name
from test_plan
left join project on test_plan.project_id = project.id

View File

@ -1,8 +1,8 @@
package io.metersphere.base.mapper.ext;
import io.metersphere.controller.request.testplancase.QueryTestPlanCaseRequest;
import io.metersphere.dto.TestCaseReportStatusResultDTO;
import io.metersphere.dto.TestPlanCaseDTO;
import io.metersphere.track.request.testplancase.QueryTestPlanCaseRequest;
import io.metersphere.track.dto.TestCaseReportStatusResultDTO;
import io.metersphere.track.dto.TestPlanCaseDTO;
import org.apache.ibatis.annotations.Param;
import java.util.List;

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.metersphere.base.mapper.ext.ExtTestPlanTestCaseMapper">
<select id="getReportMetric" parameterType="java.lang.String" resultType="io.metersphere.dto.TestCaseReportStatusResultDTO">
<select id="getReportMetric" parameterType="java.lang.String" resultType="io.metersphere.track.dto.TestCaseReportStatusResultDTO">
select count(t1.id) as `count`, t1.status
from test_plan_test_case t1
inner join test_case t2
@ -19,7 +19,7 @@
and plan_id = #{planId};
</select>
<select id="list" resultType="io.metersphere.dto.TestPlanCaseDTO">
<select id="list" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
select test_plan_test_case.*, test_case.*
from test_plan_test_case
inner join test_case on test_plan_test_case.case_id = test_case.id

View File

@ -1,5 +1,8 @@
package io.metersphere.excel.domain;
import lombok.Data;
@Data
public class ExcelErrData<T> {
private T t;
@ -15,28 +18,4 @@ public class ExcelErrData<T> {
this.rowNum = rowNum;
this.errMsg = errMsg;
}
public T getT() {
return t;
}
public void setT(T t) {
this.t = t;
}
public String getErrMsg() {
return errMsg;
}
public void setErrMsg(String errMsg) {
this.errMsg = errMsg;
}
public Integer getRowNum() {
return rowNum;
}
public void setRowNum(Integer rowNum) {
this.rowNum = rowNum;
}
}

View File

@ -1,25 +1,12 @@
package io.metersphere.excel.domain;
import java.util.List;
import lombok.Data;
import java.util.List;
@Data
public class ExcelResponse<T> {
private Boolean success;
private List<ExcelErrData<T>> errList;
public Boolean getSuccess() {
return success;
}
public void setSuccess(Boolean success) {
this.success = success;
}
public List<ExcelErrData<T>> getErrList() {
return errList;
}
public void setErrList(List<ExcelErrData<T>> errList) {
this.errList = errList;
}
}

View File

@ -6,10 +6,9 @@ import io.metersphere.excel.domain.TestCaseExcelData;
import io.metersphere.base.domain.TestCaseWithBLOBs;
import io.metersphere.commons.constants.TestCaseConstants;
import io.metersphere.commons.utils.BeanUtils;
import io.metersphere.service.TestCaseService;
import io.metersphere.track.service.TestCaseService;
import org.apache.commons.lang3.StringUtils;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.UUID;

View File

@ -6,7 +6,7 @@ import io.metersphere.base.domain.FileMetadata;
import io.metersphere.commons.constants.RoleConstants;
import io.metersphere.commons.utils.PageUtils;
import io.metersphere.commons.utils.Pager;
import io.metersphere.controller.request.testplan.*;
import io.metersphere.track.request.testplan.*;
import io.metersphere.dto.LoadTestDTO;
import io.metersphere.performance.service.PerformanceTestService;
import io.metersphere.service.FileService;

View File

@ -8,7 +8,7 @@ import io.metersphere.base.mapper.ext.ExtLoadTestReportMapper;
import io.metersphere.commons.constants.PerformanceTestStatus;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.controller.request.testplan.*;
import io.metersphere.track.request.testplan.*;
import io.metersphere.dto.LoadTestDTO;
import io.metersphere.i18n.Translator;
import io.metersphere.performance.engine.Engine;

View File

@ -9,7 +9,7 @@ import io.metersphere.base.mapper.ProjectMapper;
import io.metersphere.base.mapper.ext.ExtProjectMapper;
import io.metersphere.commons.exception.MSException;
import io.metersphere.controller.request.ProjectRequest;
import io.metersphere.controller.request.testplan.DeleteTestPlanRequest;
import io.metersphere.track.request.testplan.DeleteTestPlanRequest;
import io.metersphere.dto.ProjectDTO;
import io.metersphere.i18n.Translator;
import io.metersphere.performance.service.PerformanceTestService;

View File

@ -1,23 +1,21 @@
package io.metersphere.controller;
package io.metersphere.track.controller;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import io.metersphere.base.domain.*;
import io.metersphere.commons.utils.PageUtils;
import io.metersphere.commons.utils.Pager;
import io.metersphere.controller.request.testcase.QueryTestCaseRequest;
import io.metersphere.controller.request.testcase.TestCaseBatchRequest;
import io.metersphere.controller.request.testcase.TestPlanCaseBatchRequest;
import io.metersphere.dto.TestCaseDTO;
import io.metersphere.track.request.testcase.QueryTestCaseRequest;
import io.metersphere.track.request.testcase.TestCaseBatchRequest;
import io.metersphere.track.dto.TestCaseDTO;
import io.metersphere.excel.domain.ExcelResponse;
import io.metersphere.service.TestCaseService;
import io.metersphere.track.service.TestCaseService;
import io.metersphere.user.SessionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
@RequestMapping("/test/case")

View File

@ -1,8 +1,8 @@
package io.metersphere.controller;
package io.metersphere.track.controller;
import io.metersphere.base.domain.TestCaseNode;
import io.metersphere.dto.TestCaseNodeDTO;
import io.metersphere.service.TestCaseNodeService;
import io.metersphere.track.dto.TestCaseNodeDTO;
import io.metersphere.track.service.TestCaseNodeService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;

View File

@ -1,9 +1,9 @@
package io.metersphere.controller;
package io.metersphere.track.controller;
import io.metersphere.base.domain.TestCaseReport;
import io.metersphere.controller.request.testCaseReport.CreateReportRequest;
import io.metersphere.dto.TestCaseReportMetricDTO;
import io.metersphere.service.TestCaseReportService;
import io.metersphere.track.request.testCaseReport.CreateReportRequest;
import io.metersphere.track.dto.TestCaseReportMetricDTO;
import io.metersphere.track.service.TestCaseReportService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;

View File

@ -1,8 +1,8 @@
package io.metersphere.controller;
package io.metersphere.track.controller;
import io.metersphere.base.domain.TestCaseReportTemplate;
import io.metersphere.controller.request.testCaseReport.QueryTemplateRequest;
import io.metersphere.service.TestCaseReportTemplateService;
import io.metersphere.track.request.testCaseReport.QueryTemplateRequest;
import io.metersphere.track.service.TestCaseReportTemplateService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;

View File

@ -1,18 +1,14 @@
package io.metersphere.controller;
package io.metersphere.track.controller;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import io.metersphere.base.domain.TestCase;
import io.metersphere.base.domain.TestCaseWithBLOBs;
import io.metersphere.base.domain.TestPlan;
import io.metersphere.commons.utils.PageUtils;
import io.metersphere.commons.utils.Pager;
import io.metersphere.controller.request.testcase.PlanCaseRelevanceRequest;
import io.metersphere.controller.request.testcase.QueryTestCaseRequest;
import io.metersphere.controller.request.testcase.QueryTestPlanRequest;
import io.metersphere.dto.TestPlanDTO;
import io.metersphere.service.TestCaseService;
import io.metersphere.service.TestPlanService;
import io.metersphere.track.request.testcase.PlanCaseRelevanceRequest;
import io.metersphere.track.request.testcase.QueryTestPlanRequest;
import io.metersphere.track.dto.TestPlanDTO;
import io.metersphere.track.service.TestPlanService;
import io.metersphere.user.SessionUtils;
import org.springframework.web.bind.annotation.*;

View File

@ -1,14 +1,14 @@
package io.metersphere.controller;
package io.metersphere.track.controller;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import io.metersphere.base.domain.TestPlanTestCase;
import io.metersphere.commons.utils.PageUtils;
import io.metersphere.commons.utils.Pager;
import io.metersphere.controller.request.testcase.TestPlanCaseBatchRequest;
import io.metersphere.controller.request.testplancase.QueryTestPlanCaseRequest;
import io.metersphere.dto.TestPlanCaseDTO;
import io.metersphere.service.TestPlanTestCaseService;
import io.metersphere.track.request.testcase.TestPlanCaseBatchRequest;
import io.metersphere.track.request.testplancase.QueryTestPlanCaseRequest;
import io.metersphere.track.dto.TestPlanCaseDTO;
import io.metersphere.track.service.TestPlanTestCaseService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;

View File

@ -1,4 +1,4 @@
package io.metersphere.dto;
package io.metersphere.track.dto;
import io.metersphere.base.domain.TestCaseWithBLOBs;
import lombok.Getter;

View File

@ -1,4 +1,4 @@
package io.metersphere.dto;
package io.metersphere.track.dto;
import io.metersphere.base.domain.TestCaseNode;
import lombok.Getter;

View File

@ -1,4 +1,4 @@
package io.metersphere.dto;
package io.metersphere.track.dto;
import lombok.Getter;
import lombok.Setter;

View File

@ -1,4 +1,4 @@
package io.metersphere.dto;
package io.metersphere.track.dto;
import lombok.Getter;
import lombok.Setter;

View File

@ -1,4 +1,4 @@
package io.metersphere.dto;
package io.metersphere.track.dto;
import lombok.Getter;
import lombok.Setter;

View File

@ -1,4 +1,4 @@
package io.metersphere.dto;
package io.metersphere.track.dto;
import io.metersphere.base.domain.TestCaseWithBLOBs;
import lombok.Getter;

View File

@ -1,4 +1,4 @@
package io.metersphere.dto;
package io.metersphere.track.dto;
import io.metersphere.base.domain.TestPlan;
import lombok.Getter;

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testCaseReport;
package io.metersphere.track.request.testCaseReport;
import lombok.Getter;
import lombok.Setter;

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testCaseReport;
package io.metersphere.track.request.testCaseReport;
import io.metersphere.base.domain.TestCaseReportTemplate;
import lombok.Getter;

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testcase;
package io.metersphere.track.request.testcase;
import lombok.Getter;
import lombok.Setter;

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testcase;
package io.metersphere.track.request.testcase;
import io.metersphere.base.domain.TestCase;
import io.metersphere.controller.request.OrderRequest;

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testcase;
package io.metersphere.track.request.testcase;
import io.metersphere.base.domain.TestPlan;
import lombok.Getter;

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testcase;
package io.metersphere.track.request.testcase;
import io.metersphere.base.domain.TestCaseWithBLOBs;
import lombok.Getter;

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testcase;
package io.metersphere.track.request.testcase;
import io.metersphere.base.domain.TestPlanTestCase;
import lombok.Getter;

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testplan;
package io.metersphere.track.request.testplan;
public class DeleteTestPlanRequest extends TestPlanRequest {
}

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testplan;
package io.metersphere.track.request.testplan;
import io.metersphere.base.domain.FileMetadata;
import lombok.Getter;

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testplan;
package io.metersphere.track.request.testplan;
import lombok.Getter;
import lombok.Setter;

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testplan;
package io.metersphere.track.request.testplan;
import lombok.Getter;
import lombok.Setter;

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testplan;
package io.metersphere.track.request.testplan;
public class RunTestPlanRequest extends TestPlanRequest {
}

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testplan;
package io.metersphere.track.request.testplan;
public class SaveTestPlanRequest extends TestPlanRequest {
}

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testplan;
package io.metersphere.track.request.testplan;
import lombok.Getter;
import lombok.Setter;

View File

@ -1,4 +1,4 @@
package io.metersphere.controller.request.testplancase;
package io.metersphere.track.request.testplancase;
import io.metersphere.base.domain.TestPlanTestCase;
import io.metersphere.controller.request.OrderRequest;

View File

@ -1,4 +1,4 @@
package io.metersphere.service;
package io.metersphere.track.service;
import io.metersphere.base.domain.*;
@ -8,7 +8,7 @@ import io.metersphere.base.mapper.TestPlanMapper;
import io.metersphere.base.mapper.TestPlanTestCaseMapper;
import io.metersphere.commons.constants.TestCaseConstants;
import io.metersphere.commons.utils.BeanUtils;
import io.metersphere.dto.TestCaseNodeDTO;
import io.metersphere.track.dto.TestCaseNodeDTO;
import io.metersphere.exception.ExcelException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;

View File

@ -1,4 +1,4 @@
package io.metersphere.service;
package io.metersphere.track.service;
import io.metersphere.base.domain.*;
import io.metersphere.base.mapper.*;
@ -7,10 +7,10 @@ import io.metersphere.base.mapper.ext.ExtTestPlanMapper;
import io.metersphere.base.mapper.ext.ExtTestPlanTestCaseMapper;
import io.metersphere.commons.constants.TestPlanTestCaseStatus;
import io.metersphere.commons.utils.BeanUtils;
import io.metersphere.controller.request.testCaseReport.CreateReportRequest;
import io.metersphere.controller.request.testcase.QueryTestPlanRequest;
import io.metersphere.controller.request.testplancase.QueryTestPlanCaseRequest;
import io.metersphere.dto.*;
import io.metersphere.track.request.testCaseReport.CreateReportRequest;
import io.metersphere.track.request.testcase.QueryTestPlanRequest;
import io.metersphere.track.request.testplancase.QueryTestPlanCaseRequest;
import io.metersphere.track.dto.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

View File

@ -1,10 +1,9 @@
package io.metersphere.service;
package io.metersphere.track.service;
import io.metersphere.base.domain.TestCaseReportTemplate;
import io.metersphere.base.domain.TestCaseReportTemplateExample;
import io.metersphere.base.mapper.TestCaseReportMapper;
import io.metersphere.base.mapper.TestCaseReportTemplateMapper;
import io.metersphere.controller.request.testCaseReport.QueryTemplateRequest;
import io.metersphere.track.request.testCaseReport.QueryTemplateRequest;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

View File

@ -1,4 +1,4 @@
package io.metersphere.service;
package io.metersphere.track.service;
import com.alibaba.excel.EasyExcelFactory;
@ -9,10 +9,9 @@ import io.metersphere.base.mapper.ext.ExtTestCaseMapper;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.BeanUtils;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.controller.request.testcase.QueryTestCaseRequest;
import io.metersphere.controller.request.testcase.TestCaseBatchRequest;
import io.metersphere.controller.request.testcase.TestPlanCaseBatchRequest;
import io.metersphere.dto.TestCaseDTO;
import io.metersphere.track.request.testcase.QueryTestCaseRequest;
import io.metersphere.track.request.testcase.TestCaseBatchRequest;
import io.metersphere.track.dto.TestCaseDTO;
import io.metersphere.excel.domain.ExcelErrData;
import io.metersphere.excel.domain.ExcelResponse;
import io.metersphere.excel.domain.TestCaseExcelData;

View File

@ -1,4 +1,4 @@
package io.metersphere.service;
package io.metersphere.track.service;
import io.metersphere.base.domain.*;
@ -7,12 +7,10 @@ import io.metersphere.base.mapper.TestPlanMapper;
import io.metersphere.base.mapper.TestPlanTestCaseMapper;
import io.metersphere.base.mapper.ext.ExtTestPlanMapper;
import io.metersphere.commons.constants.TestPlanStatus;
import io.metersphere.commons.constants.TestPlanTestCaseStatus;
import io.metersphere.commons.exception.MSException;
import io.metersphere.controller.request.testcase.PlanCaseRelevanceRequest;
import io.metersphere.controller.request.testcase.QueryTestCaseRequest;
import io.metersphere.controller.request.testcase.QueryTestPlanRequest;
import io.metersphere.dto.TestPlanDTO;
import io.metersphere.track.request.testcase.PlanCaseRelevanceRequest;
import io.metersphere.track.request.testcase.QueryTestPlanRequest;
import io.metersphere.track.dto.TestPlanDTO;
import io.metersphere.i18n.Translator;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.session.ExecutorType;

View File

@ -1,17 +1,17 @@
package io.metersphere.service;
package io.metersphere.track.service;
import io.metersphere.base.domain.TestPlanTestCase;
import io.metersphere.base.domain.TestPlanTestCaseExample;
import io.metersphere.base.domain.User;
import io.metersphere.base.mapper.TestPlanTestCaseMapper;
import io.metersphere.base.mapper.ext.ExtTestCaseMapper;
import io.metersphere.base.mapper.ext.ExtTestPlanTestCaseMapper;
import io.metersphere.commons.constants.TestPlanTestCaseStatus;
import io.metersphere.commons.utils.BeanUtils;
import io.metersphere.controller.request.member.QueryMemberRequest;
import io.metersphere.controller.request.testcase.TestPlanCaseBatchRequest;
import io.metersphere.controller.request.testplancase.QueryTestPlanCaseRequest;
import io.metersphere.dto.TestPlanCaseDTO;
import io.metersphere.track.request.testcase.TestPlanCaseBatchRequest;
import io.metersphere.track.request.testplancase.QueryTestPlanCaseRequest;
import io.metersphere.track.dto.TestPlanCaseDTO;
import io.metersphere.service.UserService;
import io.metersphere.user.SessionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;