diff --git a/test-admin/pom.xml b/test-admin/pom.xml index 022c2c2..14e0dba 100644 --- a/test-admin/pom.xml +++ b/test-admin/pom.xml @@ -17,13 +17,6 @@ - - - org.springframework.boot - spring-boot-devtools - true - - org.springdoc diff --git a/test-test/pom.xml b/test-test/pom.xml index 36ea1aa..6aae8f6 100644 --- a/test-test/pom.xml +++ b/test-test/pom.xml @@ -22,6 +22,11 @@ com.test test-common + + org.projectlombok + lombok + provided + diff --git a/test-test/src/main/java/com/test/test/controller/TestApiController.java b/test-test/src/main/java/com/test/test/controller/TestApiController.java index 983a6bd..25bce50 100644 --- a/test-test/src/main/java/com/test/test/controller/TestApiController.java +++ b/test-test/src/main/java/com/test/test/controller/TestApiController.java @@ -2,8 +2,10 @@ package com.test.test.controller; import java.util.List; +import com.test.test.domain.qo.TestApiListQO; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -23,7 +25,6 @@ import com.test.common.core.page.TableDataInfo; * 接口Controller * * @author xiaoe - * @date 2025-02-08 */ @RestController @RequestMapping("/test/api") @@ -35,7 +36,7 @@ public class TestApiController extends BaseController { * 查询接口列表 */ @GetMapping("/list") - public TableDataInfo list(TestApi testApi) { + public TableDataInfo list(@Validated TestApiListQO testApi) { startPage(); List list = testApiService.selectTestApiList(testApi); return getDataTable(list); @@ -46,7 +47,7 @@ public class TestApiController extends BaseController { */ @Log(title = "接口", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, TestApi testApi) { + public void export(HttpServletResponse response, TestApiListQO testApi) { List list = testApiService.selectTestApiList(testApi); ExcelUtil util = new ExcelUtil(TestApi.class); util.exportExcel(response, list, "接口数据"); diff --git a/test-test/src/main/java/com/test/test/controller/TestApiGroupController.java b/test-test/src/main/java/com/test/test/controller/TestApiGroupController.java index 05b895a..103b3cf 100644 --- a/test-test/src/main/java/com/test/test/controller/TestApiGroupController.java +++ b/test-test/src/main/java/com/test/test/controller/TestApiGroupController.java @@ -3,13 +3,8 @@ package com.test.test.controller; import java.util.List; import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -20,14 +15,11 @@ import com.test.common.core.domain.AjaxResult; import com.test.common.enums.BusinessType; import com.test.test.domain.TestApiGroup; import com.test.test.service.ITestApiGroupService; -import com.test.common.utils.poi.ExcelUtil; -import com.test.common.core.page.TableDataInfo; /** * 接口节点Controller * * @author xiaoe - * @date 2025-02-10 */ @RestController @RequestMapping("/test/group") @@ -39,29 +31,9 @@ public class TestApiGroupController extends BaseController { * 查询接口节点列表 */ @GetMapping("/list") - public TableDataInfo list(TestApiGroup testApiGroup) { - startPage(); - List list = testApiGroupService.selectTestApiGroupList(testApiGroup); - return getDataTable(list); - } - - /** - * 导出接口节点列表 - */ - @Log(title = "接口节点", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, TestApiGroup testApiGroup) { - List list = testApiGroupService.selectTestApiGroupList(testApiGroup); - ExcelUtil util = new ExcelUtil(TestApiGroup.class); - util.exportExcel(response, list, "接口节点数据"); - } - - /** - * 获取接口节点详细信息 - */ - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(testApiGroupService.selectTestApiGroupById(id)); + public AjaxResult list() { + List list = testApiGroupService.selectTestApiGroupList(); + return success(list); } /** @@ -77,7 +49,7 @@ public class TestApiGroupController extends BaseController { * 修改接口节点 */ @Log(title = "接口节点", businessType = BusinessType.UPDATE) - @PutMapping("/edit") + @PostMapping("/edit") public AjaxResult edit(@RequestBody TestApiGroup testApiGroup) { return toAjax(testApiGroupService.updateTestApiGroup(testApiGroup)); } @@ -86,8 +58,8 @@ public class TestApiGroupController extends BaseController { * 删除接口节点 */ @Log(title = "接口节点", businessType = BusinessType.DELETE) - @DeleteMapping("/del/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(testApiGroupService.deleteTestApiGroupByIds(ids)); + @PostMapping("/del/{id}") + public AjaxResult remove(@PathVariable Long id) { + return toAjax(testApiGroupService.deleteTestApiGroupById(id)); } } diff --git a/test-test/src/main/java/com/test/test/domain/TestApi.java b/test-test/src/main/java/com/test/test/domain/TestApi.java index de447d0..867115a 100644 --- a/test-test/src/main/java/com/test/test/domain/TestApi.java +++ b/test-test/src/main/java/com/test/test/domain/TestApi.java @@ -1,24 +1,30 @@ package com.test.test.domain; import com.test.common.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; import com.test.common.annotation.Excel; /** * 接口对象 test_api * * @author xiaoe - * @date 2025-02-08 */ +@Setter +@Getter +@ToString public class TestApi extends BaseEntity { - private static final long serialVersionUID = 1L; /** * 接口id */ private Long id; + /** 节点id */ + @Excel(name = "节点id") + private Long groupId; + /** * 接口名称 */ @@ -60,85 +66,4 @@ public class TestApi extends BaseEntity { */ private String delFlag; - public void setId(Long id) { - this.id = id; - } - - public Long getId() { - return id; - } - - public void setName(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setMethod(String method) { - this.method = method; - } - - public String getMethod() { - return method; - } - - public void setUri(String uri) { - this.uri = uri; - } - - public String getUri() { - return uri; - } - - public void setHeader(String header) { - this.header = header; - } - - public String getHeader() { - return header; - } - - public void setParam(String param) { - this.param = param; - } - - public String getParam() { - return param; - } - - public void setBody(String body) { - this.body = body; - } - - public String getBody() { - return body; - } - - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } - - public String getDelFlag() { - return delFlag; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("method", getMethod()) - .append("uri", getUri()) - .append("header", getHeader()) - .append("param", getParam()) - .append("body", getBody()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } diff --git a/test-test/src/main/java/com/test/test/domain/TestApiGroup.java b/test-test/src/main/java/com/test/test/domain/TestApiGroup.java index 5e6485b..1101954 100644 --- a/test-test/src/main/java/com/test/test/domain/TestApiGroup.java +++ b/test-test/src/main/java/com/test/test/domain/TestApiGroup.java @@ -1,20 +1,21 @@ package com.test.test.domain; import com.test.common.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; import com.test.common.annotation.Excel; /** * 接口节点对象 test_api_group * * @author xiaoe - * @date 2025-02-10 */ +@Setter +@Getter +@ToString public class TestApiGroup extends BaseEntity { - private static final long serialVersionUID = 1L; - /** 节点id */ private Long id; @@ -24,45 +25,4 @@ public class TestApiGroup extends BaseEntity /** 删除标志(0代表存在 2代表删除) */ private String delFlag; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; - } - - public String getDelFlag() - { - return delFlag; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } diff --git a/test-test/src/main/java/com/test/test/domain/qo/TestApiListQO.java b/test-test/src/main/java/com/test/test/domain/qo/TestApiListQO.java new file mode 100644 index 0000000..2ddcbeb --- /dev/null +++ b/test-test/src/main/java/com/test/test/domain/qo/TestApiListQO.java @@ -0,0 +1,14 @@ +package com.test.test.domain.qo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Data +public class TestApiListQO { + + @NotNull(message = "父节点id不能为空") + private Long groupId; + private String name; + private String method; + private String uri; +} diff --git a/test-test/src/main/java/com/test/test/mapper/TestApiGroupMapper.java b/test-test/src/main/java/com/test/test/mapper/TestApiGroupMapper.java index 988751d..3b6d0e1 100644 --- a/test-test/src/main/java/com/test/test/mapper/TestApiGroupMapper.java +++ b/test-test/src/main/java/com/test/test/mapper/TestApiGroupMapper.java @@ -7,25 +7,15 @@ import com.test.test.domain.TestApiGroup; * 接口节点Mapper接口 * * @author xiaoe - * @date 2025-02-10 */ public interface TestApiGroupMapper { - /** - * 查询接口节点 - * - * @param id 接口节点主键 - * @return 接口节点 - */ - public TestApiGroup selectTestApiGroupById(Long id); - /** * 查询接口节点列表 * - * @param testApiGroup 接口节点 * @return 接口节点集合 */ - public List selectTestApiGroupList(TestApiGroup testApiGroup); + public List selectTestApiGroupList(); /** * 新增接口节点 @@ -50,12 +40,4 @@ public interface TestApiGroupMapper * @return 结果 */ public int deleteTestApiGroupById(Long id); - - /** - * 批量删除接口节点 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteTestApiGroupByIds(Long[] ids); } diff --git a/test-test/src/main/java/com/test/test/mapper/TestApiMapper.java b/test-test/src/main/java/com/test/test/mapper/TestApiMapper.java index 8518809..172ba24 100644 --- a/test-test/src/main/java/com/test/test/mapper/TestApiMapper.java +++ b/test-test/src/main/java/com/test/test/mapper/TestApiMapper.java @@ -3,12 +3,12 @@ package com.test.test.mapper; import java.util.List; import com.test.test.domain.TestApi; +import com.test.test.domain.qo.TestApiListQO; /** * 接口Mapper接口 * * @author xiaoe - * @date 2025-02-08 */ public interface TestApiMapper { /** @@ -25,7 +25,7 @@ public interface TestApiMapper { * @param testApi 接口 * @return 接口集合 */ - public List selectTestApiList(TestApi testApi); + public List selectTestApiList(TestApiListQO testApi); /** * 新增接口 diff --git a/test-test/src/main/java/com/test/test/service/ITestApiGroupService.java b/test-test/src/main/java/com/test/test/service/ITestApiGroupService.java index 18c661a..dbd5c08 100644 --- a/test-test/src/main/java/com/test/test/service/ITestApiGroupService.java +++ b/test-test/src/main/java/com/test/test/service/ITestApiGroupService.java @@ -1,35 +1,26 @@ package com.test.test.service; import java.util.List; + import com.test.test.domain.TestApiGroup; /** * 接口节点Service接口 - * + * * @author xiaoe - * @date 2025-02-10 */ -public interface ITestApiGroupService -{ - /** - * 查询接口节点 - * - * @param id 接口节点主键 - * @return 接口节点 - */ - public TestApiGroup selectTestApiGroupById(Long id); +public interface ITestApiGroupService { /** * 查询接口节点列表 - * - * @param testApiGroup 接口节点 + * * @return 接口节点集合 */ - public List selectTestApiGroupList(TestApiGroup testApiGroup); + public List selectTestApiGroupList(); /** * 新增接口节点 - * + * * @param testApiGroup 接口节点 * @return 结果 */ @@ -37,23 +28,15 @@ public interface ITestApiGroupService /** * 修改接口节点 - * + * * @param testApiGroup 接口节点 * @return 结果 */ public int updateTestApiGroup(TestApiGroup testApiGroup); - /** - * 批量删除接口节点 - * - * @param ids 需要删除的接口节点主键集合 - * @return 结果 - */ - public int deleteTestApiGroupByIds(Long[] ids); - /** * 删除接口节点信息 - * + * * @param id 接口节点主键 * @return 结果 */ diff --git a/test-test/src/main/java/com/test/test/service/ITestApiService.java b/test-test/src/main/java/com/test/test/service/ITestApiService.java index 3d6f19a..54e8c79 100644 --- a/test-test/src/main/java/com/test/test/service/ITestApiService.java +++ b/test-test/src/main/java/com/test/test/service/ITestApiService.java @@ -3,12 +3,12 @@ package com.test.test.service; import java.util.List; import com.test.test.domain.TestApi; +import com.test.test.domain.qo.TestApiListQO; /** * 接口Service接口 * * @author xiaoe - * @date 2025-02-08 */ public interface ITestApiService { /** @@ -25,7 +25,7 @@ public interface ITestApiService { * @param testApi 接口 * @return 接口集合 */ - public List selectTestApiList(TestApi testApi); + public List selectTestApiList(TestApiListQO testApi); /** * 新增接口 diff --git a/test-test/src/main/java/com/test/test/service/impl/TestApiGroupServiceImpl.java b/test-test/src/main/java/com/test/test/service/impl/TestApiGroupServiceImpl.java index d7a0053..04ad896 100644 --- a/test-test/src/main/java/com/test/test/service/impl/TestApiGroupServiceImpl.java +++ b/test-test/src/main/java/com/test/test/service/impl/TestApiGroupServiceImpl.java @@ -13,7 +13,6 @@ import com.test.test.service.ITestApiGroupService; * 接口节点Service业务层处理 * * @author xiaoe - * @date 2025-02-10 */ @Service public class TestApiGroupServiceImpl implements ITestApiGroupService @@ -21,28 +20,15 @@ public class TestApiGroupServiceImpl implements ITestApiGroupService @Resource private TestApiGroupMapper testApiGroupMapper; - /** - * 查询接口节点 - * - * @param id 接口节点主键 - * @return 接口节点 - */ - @Override - public TestApiGroup selectTestApiGroupById(Long id) - { - return testApiGroupMapper.selectTestApiGroupById(id); - } - /** * 查询接口节点列表 * - * @param testApiGroup 接口节点 * @return 接口节点 */ @Override - public List selectTestApiGroupList(TestApiGroup testApiGroup) + public List selectTestApiGroupList() { - return testApiGroupMapper.selectTestApiGroupList(testApiGroup); + return testApiGroupMapper.selectTestApiGroupList(); } /** @@ -71,18 +57,6 @@ public class TestApiGroupServiceImpl implements ITestApiGroupService return testApiGroupMapper.updateTestApiGroup(testApiGroup); } - /** - * 批量删除接口节点 - * - * @param ids 需要删除的接口节点主键 - * @return 结果 - */ - @Override - public int deleteTestApiGroupByIds(Long[] ids) - { - return testApiGroupMapper.deleteTestApiGroupByIds(ids); - } - /** * 删除接口节点信息 * diff --git a/test-test/src/main/java/com/test/test/service/impl/TestApiServiceImpl.java b/test-test/src/main/java/com/test/test/service/impl/TestApiServiceImpl.java index 4a0a99a..20349a9 100644 --- a/test-test/src/main/java/com/test/test/service/impl/TestApiServiceImpl.java +++ b/test-test/src/main/java/com/test/test/service/impl/TestApiServiceImpl.java @@ -3,6 +3,7 @@ package com.test.test.service.impl; import java.util.List; import com.test.common.utils.DateUtils; +import com.test.test.domain.qo.TestApiListQO; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import com.test.test.mapper.TestApiMapper; @@ -13,7 +14,6 @@ import com.test.test.service.ITestApiService; * 接口Service业务层处理 * * @author xiaoe - * @date 2025-02-08 */ @Service public class TestApiServiceImpl implements ITestApiService { @@ -38,7 +38,7 @@ public class TestApiServiceImpl implements ITestApiService { * @return 接口 */ @Override - public List selectTestApiList(TestApi testApi) { + public List selectTestApiList(TestApiListQO testApi) { return testApiMapper.selectTestApiList(testApi); } diff --git a/test-test/src/main/resources/mapper/test/TestApiGroupMapper.xml b/test-test/src/main/resources/mapper/test/TestApiGroupMapper.xml index 62be649..b8a1479 100644 --- a/test-test/src/main/resources/mapper/test/TestApiGroupMapper.xml +++ b/test-test/src/main/resources/mapper/test/TestApiGroupMapper.xml @@ -18,16 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, name, del_flag, create_by, create_time, update_by, update_time from test_api_group - - - and name like concat('%', #{name}, '%') - - - - @@ -66,11 +58,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from test_api_group where id = #{id} - - - delete from test_api_group where id in - - #{id} - - \ No newline at end of file diff --git a/test-test/src/main/resources/mapper/test/TestApiMapper.xml b/test-test/src/main/resources/mapper/test/TestApiMapper.xml index 89c9a85..6221c10 100644 --- a/test-test/src/main/resources/mapper/test/TestApiMapper.xml +++ b/test-test/src/main/resources/mapper/test/TestApiMapper.xml @@ -5,45 +5,35 @@ - - - - - - - - - - - - + + + + + + + + + + + + + - select id, - name, - method, - uri, - header, - param, - body, - del_flag, - create_by, - create_time, - update_by, - update_time - from test_api + select id, group_id, name, method, uri, header, param, body, del_flag, create_by, create_time, update_by, update_time from test_api @@ -55,6 +45,7 @@ insert into test_api + group_id, name, method, uri, @@ -68,6 +59,7 @@ update_time, + #{groupId}, #{name}, #{method}, #{uri}, @@ -85,6 +77,7 @@ update test_api + group_id = #{groupId}, name = #{name}, method = #{method}, uri = #{uri}, @@ -101,9 +94,7 @@ - delete - from test_api - where id = #{id} + delete from test_api where id = #{id} diff --git a/test-ui/src/api/test/api.js b/test-ui/src/api/test/api.js index 250fc31..e38bc9e 100644 --- a/test-ui/src/api/test/api.js +++ b/test-ui/src/api/test/api.js @@ -45,18 +45,9 @@ export function delApi(id) { // 查询接口节点列表 -export function listGroup(query) { +export function listGroup() { return request({ url: '/test/group/list', - method: 'get', - params: query - }) -} - -// 查询接口节点详细 -export function getGroup(id) { - return request({ - url: '/test/group/' + id, method: 'get' }) }