ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-11 06:57:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 💥 调整后端请求、响应参数模型命名风格

Browse Source 
XxxRequest => XxxReq
XxxVO => XxxResp
This commit is contained in:
Charles7c
2023-11-04 17:19:00 +08:00
parent 598dd3991c
commit 87f90567db
136 changed files with 828 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/request/GenConfigRequest.java → continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/req/GenConfigReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.tool.model.request;
package top.charles7c.cnadmin.tool.model.req;
import java.io.Serializable;
import java.util.ArrayList;
@@ -38,7 +38,7 @@ import top.charles7c.cnadmin.tool.model.entity.GenConfigDO;
*/
@Data
@Schema(description = "代码生成配置信息")
public class GenConfigRequest implements Serializable {
public class GenConfigReq implements Serializable {
private static final long serialVersionUID = 1L;

4
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/vo/TableVO.java → continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/resp/TableResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.tool.model.vo;
package top.charles7c.cnadmin.tool.model.resp;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -31,7 +31,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
*/
@Data
@Schema(description = "表信息")
public class TableVO implements Serializable {
public class TableResp implements Serializable {
private static final long serialVersionUID = 1L;

12
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/GeneratorService.java
View File

@@ -20,12 +20,12 @@ import java.sql.SQLException;
import java.util.List;
import top.charles7c.cnadmin.common.model.query.PageQuery;
import top.charles7c.cnadmin.common.model.vo.PageDataVO;
import top.charles7c.cnadmin.common.model.resp.PageDataResp;
import top.charles7c.cnadmin.tool.model.entity.FieldConfigDO;
import top.charles7c.cnadmin.tool.model.entity.GenConfigDO;
import top.charles7c.cnadmin.tool.model.query.TableQuery;
import top.charles7c.cnadmin.tool.model.request.GenConfigRequest;
import top.charles7c.cnadmin.tool.model.vo.TableVO;
import top.charles7c.cnadmin.tool.model.req.GenConfigReq;
import top.charles7c.cnadmin.tool.model.resp.TableResp;
/**
* 代码生成业务接口
@@ -46,7 +46,7 @@ public interface GeneratorService {
* @throws SQLException
* /
*/
PageDataVO<TableVO> pageTable(TableQuery query, PageQuery pageQuery) throws SQLException;
PageDataResp<TableResp> pageTable(TableQuery query, PageQuery pageQuery) throws SQLException;
/**
* 查询生成配置信息
@@ -73,12 +73,12 @@ public interface GeneratorService {
/**
* 保存代码生成配置信息
*
* @param request
* @param req
* 代码生成配置信息
* @param tableName
* 表名称
*/
void saveConfig(GenConfigRequest request, String tableName);
void saveConfig(GenConfigReq req, String tableName);
/**
* 生成代码

27
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java
View File

@@ -47,7 +47,7 @@ import top.charles7c.cnadmin.common.constant.StringConsts;
import top.charles7c.cnadmin.common.enums.QueryTypeEnum;
import top.charles7c.cnadmin.common.exception.ServiceException;
import top.charles7c.cnadmin.common.model.query.PageQuery;
import top.charles7c.cnadmin.common.model.vo.PageDataVO;
import top.charles7c.cnadmin.common.model.resp.PageDataResp;
import top.charles7c.cnadmin.common.util.TemplateUtils;
import top.charles7c.cnadmin.common.util.validate.CheckUtils;
import top.charles7c.cnadmin.tool.config.properties.GeneratorProperties;
@@ -57,8 +57,8 @@ import top.charles7c.cnadmin.tool.mapper.GenConfigMapper;
import top.charles7c.cnadmin.tool.model.entity.FieldConfigDO;
import top.charles7c.cnadmin.tool.model.entity.GenConfigDO;
import top.charles7c.cnadmin.tool.model.query.TableQuery;
import top.charles7c.cnadmin.tool.model.request.GenConfigRequest;
import top.charles7c.cnadmin.tool.model.vo.TableVO;
import top.charles7c.cnadmin.tool.model.req.GenConfigReq;
import top.charles7c.cnadmin.tool.model.resp.TableResp;
import top.charles7c.cnadmin.tool.service.GeneratorService;
import top.charles7c.cnadmin.tool.util.MetaUtils;
import top.charles7c.cnadmin.tool.util.Table;
@@ -80,7 +80,7 @@ public class GeneratorServiceImpl implements GeneratorService {
private final GenConfigMapper genConfigMapper;
@Override
public PageDataVO<TableVO> pageTable(TableQuery query, PageQuery pageQuery) throws SQLException {
public PageDataResp<TableResp> pageTable(TableQuery query, PageQuery pageQuery) throws SQLException {
List<Table> tableList = MetaUtils.getTables(dataSource);
String tableName = query.getTableName();
if (StrUtil.isNotBlank(tableName)) {
@@ -91,14 +91,15 @@ public class GeneratorServiceImpl implements GeneratorService {
Comparator.comparing(Table::getCreateTime)
.thenComparing(table -> Optional.ofNullable(table.getUpdateTime()).orElse(table.getCreateTime()))
.reversed());
List<TableVO> tableVOList = BeanUtil.copyToList(tableList, TableVO.class);
PageDataVO<TableVO> pageDataVO = PageDataVO.build(pageQuery.getPage(), pageQuery.getSize(), tableVOList);
for (TableVO tableVO : pageDataVO.getList()) {
List<TableResp> tableRespList = BeanUtil.copyToList(tableList, TableResp.class);
PageDataResp<TableResp> pageDataResp =
PageDataResp.build(pageQuery.getPage(), pageQuery.getSize(), tableRespList);
for (TableResp tableResp : pageDataResp.getList()) {
long count = genConfigMapper.selectCount(
Wrappers.lambdaQuery(GenConfigDO.class).eq(GenConfigDO::getTableName, tableVO.getTableName()));
tableVO.setIsConfiged(count > 0);
Wrappers.lambdaQuery(GenConfigDO.class).eq(GenConfigDO::getTableName, tableResp.getTableName()));
tableResp.setIsConfiged(count > 0);
}
return pageDataVO;
return pageDataResp;
}
@Override
@@ -166,10 +167,10 @@ public class GeneratorServiceImpl implements GeneratorService {
@Override
@Transactional(rollbackFor = Exception.class)
public void saveConfig(GenConfigRequest request, String tableName) {
public void saveConfig(GenConfigReq req, String tableName) {
// 保存字段配置
fieldConfigMapper.delete(Wrappers.lambdaQuery(FieldConfigDO.class).eq(FieldConfigDO::getTableName, tableName));
List<FieldConfigDO> fieldConfigList = request.getFieldConfigs();
List<FieldConfigDO> fieldConfigList = req.getFieldConfigs();
for (FieldConfigDO fieldConfig : fieldConfigList) {
if (fieldConfig.getShowInForm()) {
CheckUtils.throwIfNull(fieldConfig.getFormType(), "字段 [{}] 的表单类型不能为空", fieldConfig.getFieldName());
@@ -193,7 +194,7 @@ public class GeneratorServiceImpl implements GeneratorService {
fieldConfigMapper.insertBatch(fieldConfigList);
// 保存或更新生成配置信息
GenConfigDO newGenConfig = request.getGenConfig();
GenConfigDO newGenConfig = req.getGenConfig();
String frontendPath = newGenConfig.getFrontendPath();
if (StrUtil.isNotBlank(frontendPath)) {
CheckUtils.throwIf(!StrUtil.containsAll(frontendPath, "src", "views"), "前端路径配置错误");

8
continew-admin-tool/src/main/resources/templates/generator/Controller.ftl
View File

@@ -25,9 +25,9 @@ import org.springframework.web.bind.annotation.*;
import top.charles7c.cnadmin.common.annotation.CrudRequestMapping;
import top.charles7c.cnadmin.common.base.BaseController;
import ${packageName}.model.query.${classNamePrefix}Query;
import ${packageName}.model.request.${classNamePrefix}Request;
import ${packageName}.model.vo.${classNamePrefix}DetailVO;
import ${packageName}.model.vo.${classNamePrefix}VO;
import ${packageName}.model.req.${classNamePrefix}Req;
import ${packageName}.model.resp.${classNamePrefix}DetailResp;
import ${packageName}.model.resp.${classNamePrefix}Resp;
import ${packageName}.service.${classNamePrefix}Service;
/**
@@ -39,4 +39,4 @@ import ${packageName}.service.${classNamePrefix}Service;
@Tag(name = "${businessName}管理 API")
@RestController
@CrudRequestMapping(value = "/${apiModuleName}/${apiName}", api = {Api.PAGE, Api.GET, Api.ADD, Api.UPDATE, Api.DELETE, Api.EXPORT})
public class ${className} extends BaseController<${classNamePrefix}Service, ${classNamePrefix}VO, ${classNamePrefix}DetailVO, ${classNamePrefix}Query, ${classNamePrefix}Request> {}
public class ${className} extends BaseController<${classNamePrefix}Service, ${classNamePrefix}Resp, ${classNamePrefix}DetailResp, ${classNamePrefix}Query, ${classNamePrefix}Req> {}

4
continew-admin-tool/src/main/resources/templates/generator/DetailVO.ftl → continew-admin-tool/src/main/resources/templates/generator/DetailResp.ftl
View File

@@ -30,7 +30,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import top.charles7c.cnadmin.common.base.BaseDetailVO;
import top.charles7c.cnadmin.common.base.BaseDetailResp;
/**
* ${businessName}详情信息
@@ -41,7 +41,7 @@ import top.charles7c.cnadmin.common.base.BaseDetailVO;
@Data
@ExcelIgnoreUnannotated
@Schema(description = "${businessName}详情信息")
public class ${className} extends BaseDetailVO {
public class ${className} extends BaseDetailResp {
private static final long serialVersionUID = 1L;
<#if fieldConfigs??>

4
continew-admin-tool/src/main/resources/templates/generator/Request.ftl → continew-admin-tool/src/main/resources/templates/generator/Req.ftl
View File

@@ -31,7 +31,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.charles7c.cnadmin.common.base.BaseRequest;
import top.charles7c.cnadmin.common.base.BaseReq;
/**
* 创建或修改${businessName}信息
@@ -41,7 +41,7 @@ import top.charles7c.cnadmin.common.base.BaseRequest;
*/
@Data
@Schema(description = "创建或修改${businessName}信息")
public class ${className} extends BaseRequest {
public class ${className} extends BaseReq {
private static final long serialVersionUID = 1L;
<#if fieldConfigs??>

4
continew-admin-tool/src/main/resources/templates/generator/VO.ftl → continew-admin-tool/src/main/resources/templates/generator/Resp.ftl
View File

@@ -27,7 +27,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.charles7c.cnadmin.common.base.BaseVO;
import top.charles7c.cnadmin.common.base.BaseResp;
/**
* ${businessName}信息
@@ -37,7 +37,7 @@ import top.charles7c.cnadmin.common.base.BaseVO;
*/
@Data
@Schema(description = "${businessName}信息")
public class ${className} extends BaseVO {
public class ${className} extends BaseResp {
private static final long serialVersionUID = 1L;
<#if fieldConfigs??>

8
continew-admin-tool/src/main/resources/templates/generator/Service.ftl
View File

@@ -18,9 +18,9 @@ package ${packageName}.${subPackageName};
import top.charles7c.cnadmin.common.base.BaseService;
import ${packageName}.model.query.${classNamePrefix}Query;
import ${packageName}.model.request.${classNamePrefix}Request;
import ${packageName}.model.vo.${classNamePrefix}DetailVO;
import ${packageName}.model.vo.${classNamePrefix}VO;
import ${packageName}.model.req.${classNamePrefix}Req;
import ${packageName}.model.resp.${classNamePrefix}DetailResp;
import ${packageName}.model.resp.${classNamePrefix}Resp;
/**
* ${businessName}业务接口
@@ -28,4 +28,4 @@ import ${packageName}.model.vo.${classNamePrefix}VO;
* @author ${author}
* @since ${date}
*/
public interface ${className} extends BaseService<${classNamePrefix}VO, ${classNamePrefix}DetailVO, ${classNamePrefix}Query, ${classNamePrefix}Request> {}
public interface ${className} extends BaseService<${classNamePrefix}Resp, ${classNamePrefix}DetailResp, ${classNamePrefix}Query, ${classNamePrefix}Req> {}

8
continew-admin-tool/src/main/resources/templates/generator/ServiceImpl.ftl
View File

@@ -24,9 +24,9 @@ import top.charles7c.cnadmin.common.base.BaseServiceImpl;
import ${packageName}.mapper.${classNamePrefix}Mapper;
import ${packageName}.model.entity.${classNamePrefix}DO;
import ${packageName}.model.query.${classNamePrefix}Query;
import ${packageName}.model.request.${classNamePrefix}Request;
import ${packageName}.model.vo.${classNamePrefix}DetailVO;
import ${packageName}.model.vo.${classNamePrefix}VO;
import ${packageName}.model.req.${classNamePrefix}Req;
import ${packageName}.model.resp.${classNamePrefix}DetailResp;
import ${packageName}.model.resp.${classNamePrefix}Resp;
import ${packageName}.service.${classNamePrefix}Service;
/**
@@ -37,4 +37,4 @@ import ${packageName}.service.${classNamePrefix}Service;
*/
@Service
@RequiredArgsConstructor
public class ${className} extends BaseServiceImpl<${classNamePrefix}Mapper, ${classNamePrefix}DO, ${classNamePrefix}VO, ${classNamePrefix}DetailVO, ${classNamePrefix}Query, ${classNamePrefix}Request> implements ${classNamePrefix}Service {}
public class ${className} extends BaseServiceImpl<${classNamePrefix}Mapper, ${classNamePrefix}DO, ${classNamePrefix}Resp, ${classNamePrefix}DetailResp, ${classNamePrefix}Query, ${classNamePrefix}Req> implements ${classNamePrefix}Service {}