From e2fcab7b1babd949f05ac035c4ecd915a0b36058 Mon Sep 17 00:00:00 2001 From: seagull Date: Tue, 19 Apr 2022 17:16:31 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=8F=82=E6=95=B0=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=97=B6=EF=BC=8C=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E4=B8=8D=E5=8F=98=EF=BC=8C=E7=95=8C=E9=9D=A2=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=8F=82=E6=95=B0=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/testmanagmt/projectCaseParams/edit.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/templates/testmanagmt/projectCaseParams/edit.html b/src/main/resources/templates/testmanagmt/projectCaseParams/edit.html index 2117ebb..bb0c799 100644 --- a/src/main/resources/templates/testmanagmt/projectCaseParams/edit.html +++ b/src/main/resources/templates/testmanagmt/projectCaseParams/edit.html @@ -69,6 +69,9 @@ type: "post", dataType: "json", data: { + paramsId: function () { + return $.common.trim($("#paramsId").val()); + }, name: function () { return $.common.trim($("#paramsName").val()); }, -- Gitee From 15c9e093d15b9aed23bf24107428b46c4ff14036 Mon Sep 17 00:00:00 2001 From: seagull Date: Sat, 7 May 2022 17:41:43 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E4=B8=8E=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=85=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/api/OpenGetApiController.java | 13 +++++++++++++ .../project/api/OpenPostApiController.java | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/src/main/java/com/luckyframe/project/api/OpenGetApiController.java b/src/main/java/com/luckyframe/project/api/OpenGetApiController.java index a88c44a..21751bd 100644 --- a/src/main/java/com/luckyframe/project/api/OpenGetApiController.java +++ b/src/main/java/com/luckyframe/project/api/OpenGetApiController.java @@ -92,6 +92,7 @@ public class OpenGetApiController rsp.setContentType("text/html;charset=GBK"); req.setCharacterEncoding("GBK"); PrintWriter pw = rsp.getWriter(); + log.info("通过计划ID获取用例列表>>>>>{}",req.getParameter("planId")); Integer planId = Integer.valueOf(req.getParameter("planId")); ProjectCase projectCase=new ProjectCase(); @@ -121,6 +122,7 @@ public class OpenGetApiController rsp.setContentType("text/html;charset=GBK"); req.setCharacterEncoding("GBK"); PrintWriter pw = rsp.getWriter(); + log.info("通过聚合计划ID获取计划列表>>>>>{}",req.getParameter("suiteId")); Integer suiteId = Integer.valueOf(req.getParameter("suiteId")); @@ -171,6 +173,7 @@ public class OpenGetApiController rsp.setContentType("text/html;charset=GBK"); req.setCharacterEncoding("GBK"); PrintWriter pw = rsp.getWriter(); + log.info("通过计划名称获取用例列表>>>>>{}",req.getParameter("planName")); String planName = req.getParameter("planName"); ProjectPlan projectPlan= projectPlanService.selectProjectPlanByPlanName(planName); @@ -202,6 +205,7 @@ public class OpenGetApiController rsp.setContentType("text/html;charset=GBK"); req.setCharacterEncoding("GBK"); PrintWriter pw = rsp.getWriter(); + log.info("通过用例ID获取步骤列表>>>>>{}",req.getParameter("caseId")); Integer caseId = Integer.valueOf(req.getParameter("caseId")); ProjectCaseSteps projectCaseSteps=new ProjectCaseSteps(); @@ -230,6 +234,7 @@ public class OpenGetApiController rsp.setContentType("text/html;charset=GBK"); req.setCharacterEncoding("GBK"); PrintWriter pw = rsp.getWriter(); + log.info("通过taskId获取实体>>>>>{}",req.getParameter("taskId")); Integer taskId = Integer.valueOf(req.getParameter("taskId")); TaskExecute taskExecute = taskExecuteService.selectTaskExecuteById(taskId); @@ -253,6 +258,7 @@ public class OpenGetApiController rsp.setContentType("text/html;charset=GBK"); req.setCharacterEncoding("GBK"); PrintWriter pw = rsp.getWriter(); + log.info("通过用例ID获取实体>>>>>{}",req.getParameter("caseId")); Integer caseId = Integer.valueOf(req.getParameter("caseId")); ProjectCase projectCase = projectCaseService.selectProjectCaseById(caseId); @@ -276,6 +282,7 @@ public class OpenGetApiController rsp.setContentType("text/html;charset=GBK"); req.setCharacterEncoding("GBK"); PrintWriter pw = rsp.getWriter(); + log.info("通过用例编号获取实体>>>>>{}",req.getParameter("caseSign")); String caseSign = req.getParameter("caseSign"); ProjectCase projectCase = projectCaseService.selectProjectCaseByCaseSign(caseSign); @@ -299,6 +306,7 @@ public class OpenGetApiController rsp.setContentType("text/html;charset=GBK"); req.setCharacterEncoding("GBK"); PrintWriter pw = rsp.getWriter(); + log.info("根据项目ID获取公共参数列表>>>>>{}",req.getParameter("projectId")); Integer projectId = Integer.valueOf(req.getParameter("projectId")); List projectCaseParamsList = projectCaseParamsService.selectProjectCaseParamsListByProjectId(projectId); @@ -325,6 +333,7 @@ public class OpenGetApiController rsp.setContentType("text/html;charset=GBK"); req.setCharacterEncoding("GBK"); PrintWriter pw = rsp.getWriter(); + log.info("根据项目ID和环境获取公共参数列表>>>>>projectId:{},envName:{}",req.getParameter("projectId"),req.getParameter("envName")); Integer projectId = Integer.valueOf(req.getParameter("projectId")); String envName=req.getParameter("envName"); List projectCaseParamsList = projectCaseParamsService.selectProjectCaseParamsListByProjectIdAndEnvName(projectId,envName); @@ -353,6 +362,7 @@ public class OpenGetApiController rsp.setContentType("text/html;charset=GBK"); req.setCharacterEncoding("GBK"); PrintWriter pw = rsp.getWriter(); + log.info("通过执行任务ID获取调度实体>>>>>{}",req.getParameter("taskId")); Integer taskId = Integer.valueOf(req.getParameter("taskId")); TaskExecute taskExecute = taskExecuteService.selectTaskExecuteById(taskId); TaskScheduling taskScheduling = taskSchedulingService.selectTaskSchedulingById(taskExecute.getSchedulingId()); @@ -377,6 +387,7 @@ public class OpenGetApiController rsp.setContentType("text/html;charset=GBK"); req.setCharacterEncoding("GBK"); PrintWriter pw = rsp.getWriter(); + log.info("通过计划名称获取用例列表>>>>>{}",req.getParameter("taskId")); Integer taskId = Integer.valueOf(req.getParameter("taskId")); List taskCaseExecuteList= taskCaseExecuteService.selectTaskCaseExecuteListForUnSucByTaskId(taskId); @@ -408,6 +419,7 @@ public class OpenGetApiController rsp.setContentType("text/html;charset=GBK"); req.setCharacterEncoding("GBK"); PrintWriter pw = rsp.getWriter(); + log.info("通过模板ID获取实体>>>>>{}",req.getParameter("templateId")); Integer templateId = Integer.valueOf(req.getParameter("templateId")); ProjectProtocolTemplate projectProtocolTemplate = projectProtocolTemplateService.selectProjectProtocolTemplateById(templateId); @@ -431,6 +443,7 @@ public class OpenGetApiController rsp.setContentType("text/html;charset=GBK"); req.setCharacterEncoding("GBK"); PrintWriter pw = rsp.getWriter(); + log.info("根据模板ID获取参数>>>>>{}",req.getParameter("templateId")); Integer templateId = Integer.valueOf(req.getParameter("templateId")); ProjectTemplateParams projectTemplateParams = new ProjectTemplateParams(); projectTemplateParams.setTemplateId(templateId); diff --git a/src/main/java/com/luckyframe/project/api/OpenPostApiController.java b/src/main/java/com/luckyframe/project/api/OpenPostApiController.java index 556c580..b4f49be 100644 --- a/src/main/java/com/luckyframe/project/api/OpenPostApiController.java +++ b/src/main/java/com/luckyframe/project/api/OpenPostApiController.java @@ -101,6 +101,7 @@ public class OpenPostApiController // 更新实体 int result = 0; try { + log.info("增加用例执行明细>>>>>{}",jsonObject.toJSONString()); TaskCaseExecute taskCaseExecute = JSONObject.parseObject(jsonObject.toJSONString(), TaskCaseExecute.class); taskCaseExecute.setCreateTime(new Date()); taskCaseExecute.setUpdateTime(new Date()); @@ -127,6 +128,7 @@ public class OpenPostApiController // 更新实体 int result = 0; try { + log.info("修改用例执行状态入参>>>>>{}",jsonObject.toJSONString()); TaskCaseExecute taskCaseExecute = JSONObject.parseObject(jsonObject.toJSONString(), TaskCaseExecute.class); Integer caseStatus = taskCaseExecute.getCaseStatus(); TaskCaseExecute tce=null; @@ -169,6 +171,7 @@ public class OpenPostApiController // 更新实体 int result = 0; try { + log.info("增加用例日志明细>>>>>{}",jsonObject.toJSONString()); TaskCaseLog taskCaseLog = JSONObject.parseObject(jsonObject.toJSONString(), TaskCaseLog.class); taskCaseLog.setCreateTime(new Date()); taskCaseLog.setUpdateTime(new Date()); @@ -205,6 +208,7 @@ public class OpenPostApiController int casefail = 0; int caselock = 0; int casenoexec = 0; + log.info("更新任务执行数据>>>>>{}",jsonObject.toJSONString()); Integer taskId = jsonObject.getInteger("taskId"); Integer caseCount = jsonObject.getInteger("caseCount"); Integer taskStatus = jsonObject.getInteger("taskStatus"); @@ -256,6 +260,7 @@ public class OpenPostApiController @PostMapping("/clientDeleteTaskCaseLog") @ResponseBody public String clientDeleteTaskCaseLog(@RequestBody JSONObject jsonObject) { + log.info("删除用例执行日志>>>>>{}",jsonObject.toJSONString()); Integer taskId = jsonObject.getInteger("taskId"); Integer caseId = jsonObject.getInteger("caseId"); int result = 0; @@ -285,6 +290,7 @@ public class OpenPostApiController @PostMapping("/getLogDetailResult") @ResponseBody public String getLogDetailResult(@RequestBody JSONObject jsonObject) { + log.info("提取测试结果的详细日志>>>>>{}",jsonObject.toJSONString()); String taskName = jsonObject.getString("taskName"); String caseSign = jsonObject.getString("caseSign"); String result = "未能提取到相关的测试结果..."; @@ -319,6 +325,7 @@ public class OpenPostApiController @PostMapping("/runTaskBySchedulingName") @ResponseBody public String runTaskBySchedulingName(@RequestBody JSONObject jsonObject) { + log.info("对外接口,根据调度任务的名称，触发测试任务>>>>>{}",jsonObject.toJSONString()); String schedulingName = jsonObject.getString("schedulingName"); try { TaskScheduling taskScheduling = taskSchedulingService.selectTaskSchedulingByName(schedulingName); -- Gitee From 67c94e9f5e464b3c9c9ec9b8fd004db360cc90ef Mon Sep 17 00:00:00 2001 From: seagull Date: Tue, 10 May 2022 17:30:55 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBug:=E5=90=8C=E4=B8=80?= =?UTF-8?q?=E8=81=9A=E5=90=88=E8=AE=A1=E5=88=92=E4=B8=AD=EF=BC=8C=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E4=B8=AD=E4=B8=8D?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=AD=98=E5=9C=A8=E5=90=8C=E4=B8=80=E6=9D=A1?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/api/OpenPostApiController.java | 7 +++- .../mapper/TaskCaseExecuteMapper.java | 9 +++++ .../service/ITaskCaseExecuteService.java | 9 +++++ .../service/TaskCaseExecuteServiceImpl.java | 13 +++++++ .../ProjectSuitePlanController.java | 37 +++++++++++++++++-- .../mapper/ProjectSuitePlanMapper.java | 10 ++++- .../service/IprojectSuitePlanService.java | 17 +++++++++ .../service/ProjectSuitePlanServiceImpl.java | 27 ++++++++++++++ .../testexecution/TaskCaseExecuteMapper.xml | 4 ++ .../testmanagmt/ProjectSuitePlanMapper.xml | 8 ++++ 10 files changed, 135 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/luckyframe/project/api/OpenPostApiController.java b/src/main/java/com/luckyframe/project/api/OpenPostApiController.java index b4f49be..0b7ec1d 100644 --- a/src/main/java/com/luckyframe/project/api/OpenPostApiController.java +++ b/src/main/java/com/luckyframe/project/api/OpenPostApiController.java @@ -105,7 +105,12 @@ public class OpenPostApiController TaskCaseExecute taskCaseExecute = JSONObject.parseObject(jsonObject.toJSONString(), TaskCaseExecute.class); taskCaseExecute.setCreateTime(new Date()); taskCaseExecute.setUpdateTime(new Date()); - result = taskCaseExecuteService.insertTaskCaseExecute(taskCaseExecute); + int caseCount = taskCaseExecuteService.selectTaskCaseExecuteCountByTaskIdAndCaseId(taskCaseExecute); + if(caseCount>0){ + log.info("当前任务中存在多条重复用例执行(已在{}条)，请检查。",caseCount); + }else{ + result = taskCaseExecuteService.insertTaskCaseExecute(taskCaseExecute); + } } catch (Exception e) { log.error("增加用例执行明细出现异常", e); } diff --git a/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/mapper/TaskCaseExecuteMapper.java b/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/mapper/TaskCaseExecuteMapper.java index f76f934..f45127a 100644 --- a/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/mapper/TaskCaseExecuteMapper.java +++ b/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/mapper/TaskCaseExecuteMapper.java @@ -31,6 +31,15 @@ public interface TaskCaseExecuteMapper */ TaskCaseExecute selectTaskCaseExecuteByTaskIdAndCaseId(TaskCaseExecute taskCaseExecute); + /** + * 根据任务ID以及用例ID查询单任务中条数 + * @param taskCaseExecute 执行用例对象 + * @return 返回用例执行条数 + * @author Seagull + * @date 2022年5月7日 + */ + int selectTaskCaseExecuteCountByTaskIdAndCaseId(TaskCaseExecute taskCaseExecute); + /** * 根据任务ID以及计划ID和用例ID查询实体 * @param taskCaseExecute diff --git a/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/ITaskCaseExecuteService.java b/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/ITaskCaseExecuteService.java index c391cc8..969e728 100644 --- a/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/ITaskCaseExecuteService.java +++ b/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/ITaskCaseExecuteService.java @@ -29,6 +29,15 @@ public interface ITaskCaseExecuteService */ TaskCaseExecute selectTaskCaseExecuteByTaskIdAndCaseId(TaskCaseExecute taskCaseExecute); + /** + * 根据taskId跟caseId查询用例执行条数 + * @param taskCaseExecute 用例执行对象中的taskId以及caseId + * @return 用例执行条数 + * @author Seagull + * @date 2022年5月7日 + */ + int selectTaskCaseExecuteCountByTaskIdAndCaseId(TaskCaseExecute taskCaseExecute); + /** * 根据taskid planid caseid查询用例执行信息 * @param taskCaseExecute diff --git a/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/TaskCaseExecuteServiceImpl.java b/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/TaskCaseExecuteServiceImpl.java index 8a68950..657e9af 100644 --- a/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/TaskCaseExecuteServiceImpl.java +++ b/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/TaskCaseExecuteServiceImpl.java @@ -46,6 +46,19 @@ public class TaskCaseExecuteServiceImpl implements ITaskCaseExecuteService return taskCaseExecuteMapper.selectTaskCaseExecuteByTaskIdAndCaseId(taskCaseExecute); } + /** + * 根据taskId跟caseId查询用例执行条数 + * @param taskCaseExecute 用例执行对象中的taskId以及caseId + * @return 执行用例条数 + * @author Seagull + * @date 2022年5月7日 + */ + @Override + public int selectTaskCaseExecuteCountByTaskIdAndCaseId(TaskCaseExecute taskCaseExecute) + { + return taskCaseExecuteMapper.selectTaskCaseExecuteCountByTaskIdAndCaseId(taskCaseExecute); + } + @Override public TaskCaseExecute selectTaskCaseExecuteByTaskIdAndPlanIdAndCaseId(TaskCaseExecute taskCaseExecute) { diff --git a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/controller/ProjectSuitePlanController.java b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/controller/ProjectSuitePlanController.java index ea2051e..abdcaec 100644 --- a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/controller/ProjectSuitePlanController.java +++ b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/controller/ProjectSuitePlanController.java @@ -8,7 +8,11 @@ import com.luckyframe.framework.web.controller.BaseController; import com.luckyframe.framework.web.domain.AjaxResult; import com.luckyframe.framework.web.page.TableDataInfo; import com.luckyframe.project.system.project.service.IProjectService; +import com.luckyframe.project.testmanagmt.projectCase.domain.ProjectCase; +import com.luckyframe.project.testmanagmt.projectCase.service.IProjectCaseService; import com.luckyframe.project.testmanagmt.projectPlan.domain.ProjectPlan; +import com.luckyframe.project.testmanagmt.projectPlan.domain.ProjectPlanCase; +import com.luckyframe.project.testmanagmt.projectPlan.service.IProjectPlanCaseService; import com.luckyframe.project.testmanagmt.projectPlan.service.IProjectPlanService; import com.luckyframe.project.testmanagmt.projectSuite.domain.ProjectSuite; import com.luckyframe.project.testmanagmt.projectSuite.domain.ProjectSuitePlan; @@ -20,6 +24,8 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; /*** @@ -41,7 +47,10 @@ public class ProjectSuitePlanController extends BaseController { private IProjectPlanService projectPlanService; @Autowired - private IProjectService projectService; + private IProjectPlanCaseService projectPlanCaseService; + + @Autowired + private IProjectCaseService projectCaseService; @RequiresPermissions("testmanagmt:projectSuite:view") @GetMapping("/{suiteId}") @@ -86,17 +95,39 @@ public class ProjectSuitePlanController extends BaseController { return error("没有此项目保存测试计划用例权限"); } + //不同的测试计划存在同一个用例，不能添加到同一个聚合计划中 + HashMap map = new HashMap(); + for(ProjectPlan projectPlan:projectPlans){ + if(projectPlan.isFlag()){ + List projectPlanCaseList= projectPlanCaseService.selectProjectPlanCaseListByPlanId(projectPlan.getPlanId()); + for(ProjectPlanCase ppc:projectPlanCaseList){ + if(!map.containsKey(ppc.getCaseId())){ + map.put(ppc.getCaseId(),ppc.getPlanId()); + }else { + ProjectCase projectCase = projectCaseService.selectProjectCaseById(ppc.getCaseId()); + Integer oldPlanId=map.get(ppc.getCaseId()); + ProjectPlan oldProjectPlan = projectPlanService.selectProjectPlanById(oldPlanId); + return error("用例重复存在，计划【"+projectPlan.getPlanName()+"】中的用例【"+projectCase.getCaseSign()+"】在计划【"+oldProjectPlan.getPlanName()+"】中已存在"); + } + } + } + } + for(ProjectPlan projectPlan:projectPlans){ if(StringUtils.isNotEmpty(projectPlan.getSuitePlanId())&&!projectPlan.isFlag()){ resultCount = resultCount+projectSuitePlanService.deleteProjectSuitePlanById(projectPlan.getSuitePlanId()); } - if(projectPlan.isFlag()&&StringUtils.isEmpty(projectPlan.getSuitePlanId())){ ProjectSuitePlan projectSuitePlan = new ProjectSuitePlan(); projectSuitePlan.setSuiteId(projectPlan.getSuiteId()); projectSuitePlan.setPlanId(projectPlan.getPlanId()); projectSuitePlan.setPriority(projectPlan.getPriority()); - resultCount = resultCount+projectSuitePlanService.insertProjectSuitePlan(projectSuitePlan); + Integer sameSuitePlanCount = projectSuitePlanService.selectProjectSuitePlanCountBySuiteIdAndPlanId(projectSuitePlan.getSuiteId(),projectSuitePlan.getPlanId()); + if(sameSuitePlanCount==0){ + resultCount = resultCount+projectSuitePlanService.insertProjectSuitePlan(projectSuitePlan); + }else{ + resultCount++; + } }else{ resultCount++; } diff --git a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/mapper/ProjectSuitePlanMapper.java b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/mapper/ProjectSuitePlanMapper.java index b3f9aec..d2524e8 100644 --- a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/mapper/ProjectSuitePlanMapper.java +++ b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/mapper/ProjectSuitePlanMapper.java @@ -31,8 +31,6 @@ public interface ProjectSuitePlanMapper { */ List selectProjectSuitePlanList(ProjectSuitePlan projectSuitePlan); - - /** * 新增聚合计划 * @@ -89,5 +87,13 @@ public interface ProjectSuitePlanMapper { */ int selectProjectSuitePlanCountBySuiteId(Integer suiteId); + /** + * 查询同一聚合计划下同一个计划的数量 + * @param suiteId 聚合测试计划ID planId 测试计划ID + * @author Seagull + * @date 2022年5月10日 + */ + int selectProjectSuitePlanCountBySuiteIdAndPlanId(ProjectSuitePlan projectSuitePlan); + } diff --git a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/IprojectSuitePlanService.java b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/IprojectSuitePlanService.java index 82ffdd4..3d95459 100644 --- a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/IprojectSuitePlanService.java +++ b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/IprojectSuitePlanService.java @@ -2,6 +2,8 @@ package com.luckyframe.project.testmanagmt.projectSuite.service; import com.luckyframe.project.testmanagmt.projectSuite.domain.ProjectSuitePlan; +import java.util.List; + /** * 聚合计划 服务层 * @@ -19,6 +21,13 @@ public interface IprojectSuitePlanService { */ ProjectSuitePlan selectProjectSuitePlanById(Integer suitePlanId); + /** + * 查询聚合计划用例列表 + * + * @param projectSuitePlan 聚合计划用例列表信息 + * @return 聚合计划集合 + */ + List selectProjectSuitePlanList(ProjectSuitePlan projectSuitePlan); /** * 新增聚合计划 @@ -57,4 +66,12 @@ public interface IprojectSuitePlanService { * @param suiteId 测试计划ID */ int selectProjectSuitePlanCountBySuiteId(Integer suiteId); + + /** + * 查询同一聚合计划下同一个计划的数量 + * @param suiteId 聚合测试计划ID planId 测试计划ID + * @author Seagull + * @date 2022年5月10日 + */ + int selectProjectSuitePlanCountBySuiteIdAndPlanId(Integer suiteId,Integer planId); } diff --git a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/ProjectSuitePlanServiceImpl.java b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/ProjectSuitePlanServiceImpl.java index b53afc6..8cc4978 100644 --- a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/ProjectSuitePlanServiceImpl.java +++ b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/ProjectSuitePlanServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.List; /** * 聚合计划 服务层实现 @@ -39,6 +40,18 @@ public class ProjectSuitePlanServiceImpl implements IprojectSuitePlanService { return projectSuitePlanMapper.selectProjectSuitePlanById(suitePlanId); } + /** + * 查询聚合计划用例列表 + * + * @param projectSuitePlan 聚合计划用例列表信息 + * @return 聚合计划集合 + */ + @Override + public List selectProjectSuitePlanList(ProjectSuitePlan projectSuitePlan) + { + return projectSuitePlanMapper.selectProjectSuitePlanList(projectSuitePlan); + } + /** * 新增测试计划用例 * @@ -104,5 +117,19 @@ public class ProjectSuitePlanServiceImpl implements IprojectSuitePlanService { return projectSuitePlanMapper.selectProjectSuitePlanCountBySuiteId(suiteId); } + /** + * 查询同一聚合计划下同一个计划的数量 + * @param suiteId 聚合测试计划ID planId 测试计划ID + * @author Seagull + * @date 2022年5月10日 + */ + @Override + public int selectProjectSuitePlanCountBySuiteIdAndPlanId(Integer suiteId,Integer planId) + { + ProjectSuitePlan projectSuitePlan = new ProjectSuitePlan(); + projectSuitePlan.setSuiteId(suiteId); + projectSuitePlan.setPlanId(planId); + return projectSuitePlanMapper.selectProjectSuitePlanCountBySuiteIdAndPlanId(projectSuitePlan); + } } diff --git a/src/main/resources/mybatis/testexecution/TaskCaseExecuteMapper.xml b/src/main/resources/mybatis/testexecution/TaskCaseExecuteMapper.xml index fee7c62..15d9b8f 100644 --- a/src/main/resources/mybatis/testexecution/TaskCaseExecuteMapper.xml +++ b/src/main/resources/mybatis/testexecution/TaskCaseExecuteMapper.xml @@ -136,6 +136,10 @@ select count(1) from task_case_execute where project_id=#{project_id} + + diff --git a/src/main/resources/mybatis/testmanagmt/ProjectSuitePlanMapper.xml b/src/main/resources/mybatis/testmanagmt/ProjectSuitePlanMapper.xml index 386d498..e4209f1 100644 --- a/src/main/resources/mybatis/testmanagmt/ProjectSuitePlanMapper.xml +++ b/src/main/resources/mybatis/testmanagmt/ProjectSuitePlanMapper.xml @@ -79,4 +79,12 @@ + + \ No newline at end of file -- Gitee From 3c52ce76a61e3b46b7b2b830b2748a5979bae0f0 Mon Sep 17 00:00:00 2001 From: seagull Date: Tue, 10 May 2022 17:38:05 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E9=A1=B5=E9=9D=A2=E9=83=A8=E5=88=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../testexecution/taskCaseExecute/taskCaseExecute.html | 6 +++--- .../testmanagmt/projectSuite/projectSuitePlan.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/templates/testexecution/taskCaseExecute/taskCaseExecute.html b/src/main/resources/templates/testexecution/taskCaseExecute/taskCaseExecute.html index faaaa28..f7a8db0 100644 --- a/src/main/resources/templates/testexecution/taskCaseExecute/taskCaseExecute.html +++ b/src/main/resources/templates/testexecution/taskCaseExecute/taskCaseExecute.html @@ -213,19 +213,19 @@ field : 'caseId', title : '用例ID', width : '5%', - visible: true + visible: false }, { field : 'taskId', title : '任务ID', width : '5%', - visible: true + visible: false }, { field : 'projectId', title : '项目ID', width : '5%', - visible: true + visible: false }, { field : 'caseSign', diff --git a/src/main/resources/templates/testmanagmt/projectSuite/projectSuitePlan.html b/src/main/resources/templates/testmanagmt/projectSuite/projectSuitePlan.html index 8030183..f1eb1f4 100644 --- a/src/main/resources/templates/testmanagmt/projectSuite/projectSuitePlan.html +++ b/src/main/resources/templates/testmanagmt/projectSuite/projectSuitePlan.html @@ -89,7 +89,7 @@ { field : 'priority', title : '执行优先级', - width : '40%', + width : '10%', editable : { type : 'text', title : '执行优先级', @@ -106,7 +106,7 @@ { field : 'planName', title : '计划名称', - width : '50%', + width : '60%', class : 'myTDLengthHidden', formatter: function(value, row, index) { return $.table.tooltip(value); @@ -136,7 +136,7 @@ { field : 'remark', title : '备注', - width : '15%', + width : '30%', class : 'myTDLengthHidden', formatter: function(value, row, index) { return $.table.tooltip(value); -- Gitee From 6852d9abb409b883911c305ae1fea473cdea23ef Mon Sep 17 00:00:00 2001 From: seagull Date: Fri, 20 May 2022 15:12:12 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B73.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 066faf1..1487de2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.luckyframe LuckyFrameWeb - 3.5 + 3.5.1 jar LuckyFrameWeb diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 77c7503..c883c79 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,7 +3,7 @@ luckyframe: # 名称 name: LuckyFrame # 版本 - version: 3.5 + version: 3.5.1 # 版权年份 copyrightYear: 2021 # 获取ip地址开关 -- Gitee From 670f4e1a192318218d2b3f02da0201e2f220eb6b Mon Sep 17 00:00:00 2001 From: chenzaixing Date: Wed, 19 Oct 2022 14:28:19 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:PO-sql=E8=84=9A=E6=9C=AC=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V3.5.1__upgradeData.sql | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/resources/db/migration/V3.5.1__upgradeData.sql b/src/main/resources/db/migration/V3.5.1__upgradeData.sql index 4570581..61b1d4b 100644 --- a/src/main/resources/db/migration/V3.5.1__upgradeData.sql +++ b/src/main/resources/db/migration/V3.5.1__upgradeData.sql @@ -7,7 +7,9 @@ ************ WARNING ************ 此脚本属于应用自动升级数据库表结构以及数据脚本，无需手动执行，请慎重！！！！ */ ---1、PO模式功能 +-- ---------------------------- +-- 页面配置 +-- ---------------------------- CREATE TABLE if not exists `project_page_object` ( `project_id` int NULL DEFAULT NULL COMMENT '关联项目ID', `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', @@ -23,6 +25,9 @@ CREATE TABLE if not exists `project_page_object` ( PRIMARY KEY (`page_id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 29 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '页面配置管理' ROW_FORMAT = DYNAMIC; +-- ---------------------------- +-- 页面元素关联表 +-- ---------------------------- CREATE TABLE if not exists `project_page_detail` ( `id` int NOT NULL AUTO_INCREMENT COMMENT '系统主键', `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', @@ -37,13 +42,13 @@ CREATE TABLE if not exists `project_page_detail` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 76 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '页面详情' ROW_FORMAT = DYNAMIC; -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2001, '页面管理', 4, 3, '/testmanagmt/projectPageObject', 'C', '0', 'testmanagmt:projectPageObject:view', '#', 'admin', '2018-03-01 00:00:00', 'dyl', '2022-03-31 17:48:28', '页面配置管理菜单'); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2002, '页面配置管理查询', 2001, 1, '#', 'F', '0', 'testmanagmt:projectPageObject:list', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:36', ''); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2003, '页面配置管理新增', 2001, 2, '#', 'F', '0', 'testmanagmt:projectPageObject:add', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:52', ''); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2004, '页面配置管理修改', 2001, 3, '#', 'F', '0', 'testmanagmt:projectPageObject:edit', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:00', ''); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2005, '页面配置管理删除', 2001, 4, '#', 'F', '0', 'testmanagmt:projectPageObject:remove', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:08', ''); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2006, '页面详情', 4, 1, '/testmanagmt/projectPageDetail', 'C', '1', 'testmanagmt:projectPageDetail:view', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-03-10 17:32:07', '页面详情菜单'); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2007, '页面详情查询', 2006, 1, '#', 'F', '0', 'testmanagmt:projectPageDetail:list', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:24', ''); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2008, '页面详情新增', 2006, 2, '#', 'F', '0', 'testmanagmt:projectPageDetail:add', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:47', ''); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2009, '页面详情修改', 2006, 3, '#', 'F', '0', 'testmanagmt:projectPageDetail:edit', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:53', ''); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2010, '页面详情删除', 2006, 4, '#', 'F', '0', 'testmanagmt:projectPageDetail:remove', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:30:00', ''); \ No newline at end of file +INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2001, '页面管理', 4, 3, '/testmanagmt/projectPageObject', 'C', '0', 'testmanagmt:projectPageObject:view', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-03-31 17:48:28', '页面配置管理菜单'); +INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2002, '页面配置管理查询', 2001, 1, '#', 'F', '0', 'testmanagmt:projectPageObject:list', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:36', ''); +INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2003, '页面配置管理新增', 2001, 2, '#', 'F', '0', 'testmanagmt:projectPageObject:add', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:52', ''); +INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2004, '页面配置管理修改', 2001, 3, '#', 'F', '0', 'testmanagmt:projectPageObject:edit', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:00', ''); +INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2005, '页面配置管理删除', 2001, 4, '#', 'F', '0', 'testmanagmt:projectPageObject:remove', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:08', ''); +INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2006, '页面详情', 4, 1, '/testmanagmt/projectPageDetail', 'C', '1', 'testmanagmt:projectPageDetail:view', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-03-10 17:32:07', '页面详情菜单'); +INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2007, '页面详情查询', 2006, 1, '#', 'F', '0', 'testmanagmt:projectPageDetail:list', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:24', ''); +INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2008, '页面详情新增', 2006, 2, '#', 'F', '0', 'testmanagmt:projectPageDetail:add', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:47', ''); +INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2009, '页面详情修改', 2006, 3, '#', 'F', '0', 'testmanagmt:projectPageDetail:edit', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:53', ''); +INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2010, '页面详情删除', 2006, 4, '#', 'F', '0', 'testmanagmt:projectPageDetail:remove', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:30:00', ''); \ No newline at end of file -- Gitee From 1070dda814e98339a2dc5ed4f6e3e8ff6fdffb61 Mon Sep 17 00:00:00 2001 From: chenzaixing Date: Thu, 23 Mar 2023 18:06:39 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix=EF=BC=9A=E8=A7=A3=E5=86=B3=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/api/OpenGetApiController.java | 382 +----------------- 1 file changed, 2 insertions(+), 380 deletions(-) diff --git a/src/main/java/com/luckyframe/project/api/OpenGetApiController.java b/src/main/java/com/luckyframe/project/api/OpenGetApiController.java index 25f73bc..8f37a2b 100644 --- a/src/main/java/com/luckyframe/project/api/OpenGetApiController.java +++ b/src/main/java/com/luckyframe/project/api/OpenGetApiController.java @@ -217,8 +217,8 @@ public class OpenGetApiController { //在客戶端获取测试用例步骤时，把PO转换为具体的包|路径 for (ProjectCaseSteps step : projectCaseStepsList) { if (POUtil.isPO(step)) { - POUtil.transPOToStepPath(step); - } + POUtil.transPOToStepPath(step); + } } // 转换成json字符串 JSONArray array = JSONArray.parseArray(JSON.toJSONString(projectCaseStepsList)); @@ -464,382 +464,4 @@ public class OpenGetApiController { log.error("根据模板ID获取参数出现异常", e); } } - /** - * 通过计划ID获取用例列表 - * @param req HTTP请求 - * @param rsp HTTP响应 - * @author Seagull - * @date 2019年4月16日 - */ - @RequestMapping(value = "/clientGetCaseListByPlanId.do") - public void clientGetCaseListByPlanId(HttpServletRequest req, HttpServletResponse rsp) { - // 更新实体 - try { - rsp.setContentType("text/html;charset=GBK"); - req.setCharacterEncoding("GBK"); - PrintWriter pw = rsp.getWriter(); - log.info("通过计划ID获取用例列表>>>>>{}",req.getParameter("planId")); - Integer planId = Integer.valueOf(req.getParameter("planId")); - - ProjectCase projectCase=new ProjectCase(); - projectCase.setPlanId(planId); - projectCase.setFlag(true); - List projectcases=projectCaseService.selectProjectCaseListForPlan(projectCase); - - // 转换成json字符串 - JSONArray array= JSONArray.parseArray(JSON.toJSONString(projectcases)); - pw.print(array.toString()); - } catch (Exception e) { - log.error("通过计划ID获取用例列表出现异常", e); - } - } - - /** - * 通过聚合计划ID获取计划列表 - * @param req HTTP请求 - * @param rsp HTTP响应 - * @author jerelli - * @date 2021年3月21日 - */ - @RequestMapping(value = "/clientGetPlanListBySuiteId.do") - public void clientGetPlanListBySuiteId(HttpServletRequest req, HttpServletResponse rsp) { - // 更新实体 - try { - rsp.setContentType("text/html;charset=GBK"); - req.setCharacterEncoding("GBK"); - PrintWriter pw = rsp.getWriter(); - log.info("通过聚合计划ID获取计划列表>>>>>{}",req.getParameter("suiteId")); - Integer suiteId = Integer.valueOf(req.getParameter("suiteId")); - - - ProjectPlan projectPlan=new ProjectPlan(); - projectPlan.setSuiteId(suiteId); - projectPlan.setFlag(true); - List projectplans=projectPlanService.selectProjectPlanListForSuite(projectPlan); - - // 转换成json字符串 - JSONArray array= JSONArray.parseArray(JSON.toJSONString(projectplans)); - pw.print(array.toString()); - } catch (Exception e) { - log.error("通过聚合计划ID获取计划列表出现异常", e); - } - } - - /** - * 获取服务器版本号 - * @param req HTTP请求 - * @param rsp HTTP响应 - * @author Seagull - * @date 2019年4月24日 - */ - @RequestMapping(value = "/clientGetServerVersion.do") - public void clientGetServerVersion(HttpServletRequest req, HttpServletResponse rsp) { - // 更新实体 - try { - rsp.setContentType("text/html;charset=GBK"); - req.setCharacterEncoding("GBK"); - PrintWriter pw = rsp.getWriter(); - pw.print("Version "+lfConfig.getVersion()); - } catch (Exception e) { - log.error("获取服务器版本号出现异常", e); - } - } - - /** - * 通过计划名称获取用例列表 - * @param req HTTP请求 - * @param rsp HTTP响应 - * @author Seagull - * @date 2019年4月16日 - */ - @RequestMapping(value = "/clientGetCaseListByPlanName.do") - public void clientGetCaseListByPlanName(HttpServletRequest req, HttpServletResponse rsp) { - // 更新实体 - try { - rsp.setContentType("text/html;charset=GBK"); - req.setCharacterEncoding("GBK"); - PrintWriter pw = rsp.getWriter(); - log.info("通过计划名称获取用例列表>>>>>{}",req.getParameter("planName")); - String planName = req.getParameter("planName"); - ProjectPlan projectPlan= projectPlanService.selectProjectPlanByPlanName(planName); - - ProjectCase projectCase=new ProjectCase(); - projectCase.setPlanId(projectPlan.getPlanId()); - projectCase.setFlag(true); - List projectcases=projectCaseService.selectProjectCaseListForPlan(projectCase); - - // 转换成json字符串 - JSONArray array= JSONArray.parseArray(JSON.toJSONString(projectcases)); - pw.print(array.toString()); - } catch (Exception e) { - log.error("通过计划名称获取用例列表出现异常", e); - } - } - - - /** - * 通过用例ID获取步骤列表 - * @param req HTTP请求 - * @param rsp HTTP响应 - * @author Seagull - * @date 2019年4月16日 - */ - @RequestMapping(value = "/clientGetStepListByCaseId.do") - public void clientGetStepListByCaseId(HttpServletRequest req, HttpServletResponse rsp) { - // 更新实体 - try { - rsp.setContentType("text/html;charset=GBK"); - req.setCharacterEncoding("GBK"); - PrintWriter pw = rsp.getWriter(); - log.info("通过用例ID获取步骤列表>>>>>{}",req.getParameter("caseId")); - Integer caseId = Integer.valueOf(req.getParameter("caseId")); - - ProjectCaseSteps projectCaseSteps=new ProjectCaseSteps(); - projectCaseSteps.setCaseId(caseId); - List projectCaseStepsList=projectCaseStepsService.selectProjectCaseStepsList(projectCaseSteps); - - // 转换成json字符串 - JSONArray array= JSONArray.parseArray(JSON.toJSONString(projectCaseStepsList)); - pw.print(array.toString()); - } catch (Exception e) { - log.error("通过用例ID获取步骤列表出现异常", e); - } - } - - /** - * 通过taskId获取实体 - * @param req HTTP请求 - * @param rsp HTTP响应 - * @author Seagull - * @date 2019年4月16日 - */ - @RequestMapping(value = "/clientGetTaskByTaskId.do") - public void clientGetTaskByTaskId(HttpServletRequest req, HttpServletResponse rsp) { - // 更新实体 - try { - rsp.setContentType("text/html;charset=GBK"); - req.setCharacterEncoding("GBK"); - PrintWriter pw = rsp.getWriter(); - log.info("通过taskId获取实体>>>>>{}",req.getParameter("taskId")); - Integer taskId = Integer.valueOf(req.getParameter("taskId")); - TaskExecute taskExecute = taskExecuteService.selectTaskExecuteById(taskId); - - pw.print(JSONObject.toJSONString(taskExecute)); - } catch (Exception e) { - log.error("通过taskId获取实体出现异常", e); - } - } - - /** - * 通过用例ID获取实体 - * @param req HTTP请求 - * @param rsp HTTP响应 - * @author Seagull - * @date 2019年4月16日 - */ - @RequestMapping(value = "/clientGetCaseByCaseId.do") - public void clientGetCaseByCaseId(HttpServletRequest req, HttpServletResponse rsp) { - // 更新实体 - try { - rsp.setContentType("text/html;charset=GBK"); - req.setCharacterEncoding("GBK"); - PrintWriter pw = rsp.getWriter(); - log.info("通过用例ID获取实体>>>>>{}",req.getParameter("caseId")); - Integer caseId = Integer.valueOf(req.getParameter("caseId")); - ProjectCase projectCase = projectCaseService.selectProjectCaseById(caseId); - - pw.print(JSONObject.toJSONString(projectCase)); - } catch (Exception e) { - log.error("通过用例编号获取实体出现异常", e); - } - } - - /** - * 通过用例编号获取实体 - * @param req HTTP请求 - * @param rsp HTTP响应 - * @author Seagull - * @date 2019年4月16日 - */ - @RequestMapping(value = "/clientGetCaseByCaseSign.do") - public void clientGetCaseByCaseSign(HttpServletRequest req, HttpServletResponse rsp) { - // 更新实体 - try { - rsp.setContentType("text/html;charset=GBK"); - req.setCharacterEncoding("GBK"); - PrintWriter pw = rsp.getWriter(); - log.info("通过用例编号获取实体>>>>>{}",req.getParameter("caseSign")); - String caseSign = req.getParameter("caseSign"); - ProjectCase projectCase = projectCaseService.selectProjectCaseByCaseSign(caseSign); - - pw.print(JSONObject.toJSONString(projectCase)); - } catch (Exception e) { - log.error("通过用例编号获取实体出现异常", e); - } - } - - /** - * 根据项目ID获取公共参数列表 - * @param req HTTP请求 - * @param rsp HTTP响应 - * @author Seagull - * @date 2019年4月16日 - */ - @RequestMapping(value = "/clientGetParamsByProjectId.do") - public void clientGetParamsByProjectId(HttpServletRequest req, HttpServletResponse rsp) { - // 更新实体 - try { - rsp.setContentType("text/html;charset=GBK"); - req.setCharacterEncoding("GBK"); - PrintWriter pw = rsp.getWriter(); - log.info("根据项目ID获取公共参数列表>>>>>{}",req.getParameter("projectId")); - Integer projectId = Integer.valueOf(req.getParameter("projectId")); - List projectCaseParamsList = projectCaseParamsService.selectProjectCaseParamsListByProjectId(projectId); - - // 转换成json字符串 - JSONArray array= JSONArray.parseArray(JSON.toJSONString(projectCaseParamsList)); - pw.print(array.toString()); - } catch (Exception e) { - log.error("根据项目ID获取公共参数列表出现异常", e); - } - } - - - /** - * 根据项目ID和环境获取公共参数列表 - * @param req HTTP请求 - * @param rsp HTTP响应 - * @author jerelli - * @date 2020年11月16日 - */ - @RequestMapping(value = "/clientGetParamsByProjectIdAndEnvName.do") - public void clientGetParamsByProjectIdAndEnvName(HttpServletRequest req, HttpServletResponse rsp) { - // 更新实体 - try { - rsp.setContentType("text/html;charset=GBK"); - req.setCharacterEncoding("GBK"); - PrintWriter pw = rsp.getWriter(); - log.info("根据项目ID和环境获取公共参数列表>>>>>projectId:{},envName:{}",req.getParameter("projectId"),req.getParameter("envName")); - Integer projectId = Integer.valueOf(req.getParameter("projectId")); - String envName=req.getParameter("envName"); - List projectCaseParamsList = projectCaseParamsService.selectProjectCaseParamsListByProjectIdAndEnvName(projectId,envName); - System.out.println("88888888888888"); - System.out.println(projectCaseParamsList.toString()); - System.out.println("88888888888888"); - // 转换成json字符串 - JSONArray array= JSONArray.parseArray(JSON.toJSONString(projectCaseParamsList)); - pw.print(array.toString()); - } catch (Exception e) { - log.error("根据项目ID和环境获取公共参数列表出现异常", e); - } - } - - /** - * 通过执行任务ID获取调度实体 - * @param req HTTP请求 - * @param rsp HTTP响应 - * @author Seagull - * @date 2019年4月16日 - */ - @RequestMapping(value = "/clientGetTaskSchedulingByTaskId.do") - public void clientGetTaskSchedulingByTaskId(HttpServletRequest req, HttpServletResponse rsp) { - // 更新实体 - try { - rsp.setContentType("text/html;charset=GBK"); - req.setCharacterEncoding("GBK"); - PrintWriter pw = rsp.getWriter(); - log.info("通过执行任务ID获取调度实体>>>>>{}",req.getParameter("taskId")); - Integer taskId = Integer.valueOf(req.getParameter("taskId")); - TaskExecute taskExecute = taskExecuteService.selectTaskExecuteById(taskId); - TaskScheduling taskScheduling = taskSchedulingService.selectTaskSchedulingById(taskExecute.getSchedulingId()); - - pw.print(JSONObject.toJSONString(taskScheduling)); - } catch (Exception e) { - log.error("通过执行任务ID获取调度实体出现异常", e); - } - } - - /** - * 通过计划名称获取用例列表 - * @param req HTTP请求 - * @param rsp HTTP响应 - * @author Seagull - * @date 2019年4月16日 - */ - @RequestMapping(value = "/clientGetCaseListForUnSucByTaskId.do") - public void clientGetCaseListForUnSucByTaskId(HttpServletRequest req, HttpServletResponse rsp) { - // 更新实体 - try { - rsp.setContentType("text/html;charset=GBK"); - req.setCharacterEncoding("GBK"); - PrintWriter pw = rsp.getWriter(); - log.info("通过计划名称获取用例列表>>>>>{}",req.getParameter("taskId")); - Integer taskId = Integer.valueOf(req.getParameter("taskId")); - List taskCaseExecuteList= taskCaseExecuteService.selectTaskCaseExecuteListForUnSucByTaskId(taskId); - - Integer[] caseIdArr = new Integer[taskCaseExecuteList.size()]; - - for(int i=0;i>>>>{}",req.getParameter("templateId")); - Integer templateId = Integer.valueOf(req.getParameter("templateId")); - ProjectProtocolTemplate projectProtocolTemplate = projectProtocolTemplateService.selectProjectProtocolTemplateById(templateId); - - pw.print(JSONObject.toJSONString(projectProtocolTemplate)); - } catch (Exception e) { - log.error("通过模板ID获取实体出现异常", e); - } - } - - /** - * 根据模板ID获取参数 - * @param req HTTP请求 - * @param rsp HTTP响应 - * @author Seagull - * @date 2019年4月24日 - */ - @RequestMapping(value = "/clientGetProjectTemplateParamsListByTemplateId.do") - public void clientGetProjectTemplateParamsListByTemplateId(HttpServletRequest req, HttpServletResponse rsp) { - // 更新实体 - try { - rsp.setContentType("text/html;charset=GBK"); - req.setCharacterEncoding("GBK"); - PrintWriter pw = rsp.getWriter(); - log.info("根据模板ID获取参数>>>>>{}",req.getParameter("templateId")); - Integer templateId = Integer.valueOf(req.getParameter("templateId")); - ProjectTemplateParams projectTemplateParams = new ProjectTemplateParams(); - projectTemplateParams.setTemplateId(templateId); - List projectTemplateParamsList = projectTemplateParamsService.selectProjectTemplateParamsList(projectTemplateParams); - - // 转换成json字符串 - JSONArray array= JSONArray.parseArray(JSON.toJSONString(projectTemplateParamsList)); - pw.print(array.toString()); - } catch (Exception e) { - log.error("根据模板ID获取参数出现异常", e); - } - } } -- Gitee