项目表由project改成auto_project

.gitignore

@@ -8,7 +8,7 @@ target/
 .apt_generated
 .classpath
 .factorypath
-.project
+.autoProject
 .settings
 .springBeans
 .sts4-cache

pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<autoProject xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
@@ -12,7 +12,7 @@
     <artifactId>holmes</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>holmes</name>
-    <description>QG QA project</description>
+    <description>QG QA autoProject</description>
     <properties>
         <java.version>1.8</java.version>
     </properties>
@@ -140,4 +140,4 @@
         </plugins>
     </build>
 
-</project>
+</autoProject>

src/main/java/cn/qg/holmes/controller/auto/AutoModuleController.java

@@ -3,10 +3,9 @@ package cn.qg.holmes.controller.auto;
 import cn.qg.holmes.common.JsonResult;
 import cn.qg.holmes.entity.auto.AutoModule;
 import cn.qg.holmes.service.auto.AutoModuleService;
-import cn.qg.holmes.service.auto.ProjectService;
+import cn.qg.holmes.service.auto.AutoProjectService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,7 +25,7 @@ public class AutoModuleController {
     AutoModuleService autoModuleService;
 
     @Autowired
-    ProjectService projectService;
+    AutoProjectService autoProjectService;
 
     /**
      * 获取接口自动化模块列表
@@ -52,7 +51,7 @@ public class AutoModuleController {
     public JsonResult addAutoModule(@RequestBody AutoModule autoModule) {
         QueryWrapper<AutoModule> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("name", autoModule.getName());
-        if (projectService.getById(autoModule.getProjectId()) == null) {
+        if (autoProjectService.getById(autoModule.getProjectId()) == null) {
             return JsonResult.buildErrorStateResult("所选项目不存在！", false);
         } else if (autoModuleService.getOne(queryWrapper) != null) {
             return JsonResult.buildErrorStateResult("模块已存在！", false);

src/main/java/cn/qg/holmes/controller/auto/ProjectController.java → src/main/java/cn/qg/holmes/controller/auto/AutoProjectController.java

 package cn.qg.holmes.controller.auto;
 
 import cn.qg.holmes.common.JsonResult;
-import cn.qg.holmes.entity.auto.Project;
-import cn.qg.holmes.service.auto.ProjectService;
+import cn.qg.holmes.entity.auto.AutoProject;
+import cn.qg.holmes.service.auto.AutoProjectService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,10 +19,10 @@ import java.util.Map;
 @CrossOrigin
 @RestController
 @RequestMapping("/auto/project")
-public class ProjectController {
+public class AutoProjectController {
 
     @Autowired
-    ProjectService projectService;
+    AutoProjectService autoProjectService;
 
     /**
      * 获取项目列表
@@ -32,8 +32,8 @@ public class ProjectController {
      */
     @GetMapping("/list")
     public JsonResult getAutoProjectList(@RequestParam Integer pageNum, @RequestParam Integer pageSize) {
-        IPage<Project> projectIPage = new Page<>(pageNum, pageSize);
-        IPage<Project> projectPageEntity = projectService.page(projectIPage);
+        IPage<AutoProject> projectIPage = new Page<>(pageNum, pageSize);
+        IPage<AutoProject> projectPageEntity = autoProjectService.page(projectIPage);
         Map<String, Object> map = new HashMap<>();
         map.put("list", projectPageEntity.getRecords());
         map.put("total", projectPageEntity.getTotal());
@@ -42,32 +42,32 @@ public class ProjectController {
 
     /**
      * 新增项目
-     * @param project 项目实体
+     * @param autoProject 项目实体
      * @return
      */
     @PostMapping("/add")
-    public JsonResult autoProjectAdd(@RequestBody Project project) {
+    public JsonResult autoProjectAdd(@RequestBody AutoProject autoProject) {
         // 判断项目是否已存在
-        QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("name", project.getName());
-        if (projectService.getOne(queryWrapper) != null) {
+        QueryWrapper<AutoProject> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("name", autoProject.getName());
+        if (autoProjectService.getOne(queryWrapper) != null) {
             return JsonResult.buildErrorStateResult("该名称项目已存在!", false);
         } else {
-            return JsonResult.buildSuccessResult(projectService.save(project));
+            return JsonResult.buildSuccessResult(autoProjectService.save(autoProject));
         }
     }
 
     /**
      * 修改项目
-     * @param project 项目实体
+     * @param autoProject 项目实体
      * @return
      */
     @PostMapping("/modify")
-    public JsonResult autoProjectModify(@RequestBody Project project) {
-        if (projectService.getById(project.getId()) == null) {
+    public JsonResult autoProjectModify(@RequestBody AutoProject autoProject) {
+        if (autoProjectService.getById(autoProject.getId()) == null) {
             return JsonResult.buildErrorStateResult("项目不存在", false);
         } else {
-            return JsonResult.buildSuccessResult(projectService.updateById(project));
+            return JsonResult.buildSuccessResult(autoProjectService.updateById(autoProject));
         }
     }
 
@@ -77,10 +77,10 @@ public class ProjectController {
      */
     @GetMapping("/delete")
     public JsonResult autoProjectDelete(@RequestParam Integer projectId) {
-        if (projectService.getById(projectId) == null) {
+        if (autoProjectService.getById(projectId) == null) {
             return JsonResult.buildErrorStateResult("该项目不存在！", false);
         } else {
-            return JsonResult.buildSuccessResult(projectService.removeById(projectId));
+            return JsonResult.buildSuccessResult(autoProjectService.removeById(projectId));
         }
     }
 }

src/main/java/cn/qg/holmes/controller/auto/SceneController.java

@@ -2,7 +2,7 @@ package cn.qg.holmes.controller.auto;
 
 import cn.qg.holmes.common.JsonResult;
 import cn.qg.holmes.entity.auto.Scene;
-import cn.qg.holmes.service.auto.ProjectService;
+import cn.qg.holmes.service.auto.AutoProjectService;
 import cn.qg.holmes.service.auto.SceneService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,7 +26,7 @@ public class SceneController {
     SceneService sceneService;
 
     @Autowired
-    ProjectService projectService;
+    AutoProjectService autoProjectService;
 
     /**
      * 获取场景列表
@@ -66,7 +66,7 @@ public class SceneController {
         if (scene.getName() == null) {
             JsonResult.buildErrorStateResult("场景名不允许为空！", false);
         }
-        if (projectService.getById(scene.getProjectId()) == null) {
+        if (autoProjectService.getById(scene.getProjectId()) == null) {
             return JsonResult.buildErrorStateResult("项目不存在！", false);
         }
         return JsonResult.buildSuccessResult(sceneService.save(scene));
@@ -82,7 +82,7 @@ public class SceneController {
         if (scene.getId() == null) {
             return JsonResult.buildErrorStateResult("场景id不能为空！", false);
         }
-        if (projectService.getById(scene.getProjectId()) == null) {
+        if (autoProjectService.getById(scene.getProjectId()) == null) {
             return JsonResult.buildErrorStateResult("项目不存在！", false);
         }
         return JsonResult.buildSuccessResult(sceneService.updateById(scene));

src/main/java/cn/qg/holmes/entity/auto/Project.java → src/main/java/cn/qg/holmes/entity/auto/AutoProject.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * @author libo
  */
 @Data
-public class Project {
+public class AutoProject {
     @TableId(type = IdType.AUTO)
     private Integer id;
     private String name;

src/main/java/cn/qg/holmes/mapper/auto/ProjectMapper.java → src/main/java/cn/qg/holmes/mapper/auto/AutoProjectMapper.java

 package cn.qg.holmes.mapper.auto;
 
-import cn.qg.holmes.entity.auto.Project;
+import cn.qg.holmes.entity.auto.AutoProject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-public interface ProjectMapper extends BaseMapper<Project> {
+public interface AutoProjectMapper extends BaseMapper<AutoProject> {
 }

src/main/java/cn/qg/holmes/service/auto/ProjectService.java → src/main/java/cn/qg/holmes/service/auto/AutoProjectService.java

 package cn.qg.holmes.service.auto;
 
-import cn.qg.holmes.entity.auto.Project;
+import cn.qg.holmes.entity.auto.AutoProject;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-public interface ProjectService extends IService<Project> {
+public interface AutoProjectService extends IService<AutoProject> {
 
 }

src/main/java/cn/qg/holmes/service/auto/impl/ProjectServiceImpl.java → src/main/java/cn/qg/holmes/service/auto/impl/AutoProjectServiceImpl.java

 package cn.qg.holmes.service.auto.impl;
 
-import cn.qg.holmes.entity.auto.Project;
-import cn.qg.holmes.mapper.auto.ProjectMapper;
-import cn.qg.holmes.service.auto.ProjectService;
+import cn.qg.holmes.entity.auto.AutoProject;
+import cn.qg.holmes.mapper.auto.AutoProjectMapper;
+import cn.qg.holmes.service.auto.AutoProjectService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 @Service
-public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements ProjectService {
+public class AutoProjectServiceImpl extends ServiceImpl<AutoProjectMapper, AutoProject> implements AutoProjectService {
 
 }

src/main/resources/mapper/auto/AutoModuleMapper.xml

@@ -5,7 +5,7 @@
     <select id="getAutoModuleList" resultType="cn.qg.holmes.entity.auto.AutoModule">
         select a.*,
                p.`name` as projectName
-        from `auto_module` a, project p
+        from `auto_module` a, autoProject p
         where a.`project_id` = p.`id`
     </select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/auto/SceneTestcaseReportMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="getSceneTestcaseReportGroupByBatch" resultType="java.util.Map">
         SELECT st.`scene_id` as sceneId, st.`batch`, st.`namespace`, st.`project_id` as projectId, pro.`name` as projectName, st.`create_time` as createTime from `scene_testcase_report` st
-            left join `project` pro on st.`project_id` = pro.`id` WHERE 1=1
+            left join `autoProject` pro on st.`project_id` = pro.`id` WHERE 1=1
         <if test="projectId != null and projectId !=''">
             AND st.`project_id` = #{projectId}
         </if>