diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/result/Result.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/result/Result.java index cab6cdc..d988465 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/result/Result.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/result/Result.java @@ -16,7 +16,7 @@ public class Result { private T data; /** - * * 自定义返回体 + * 自定义返回体 * * @param data 返回体 * @return Result @@ -28,7 +28,7 @@ public class Result { } /** - * * 自定义返回体,使用ResultCodeEnum构建 + * 自定义返回体,使用ResultCodeEnum构建 * * @param body 返回体 * @param codeEnum 返回状态码 @@ -42,7 +42,7 @@ public class Result { } /** - * * 自定义返回体 + * 自定义返回体 * * @param body 返回体 * @param code 返回状态码 @@ -58,7 +58,7 @@ public class Result { } /** - * * 操作成功 + * 操作成功 * * @return Result */ @@ -67,7 +67,7 @@ public class Result { } /** - * * 操作成功 + * 操作成功 * * @param data baseCategory1List */ @@ -76,7 +76,7 @@ public class Result { } /** - * * 操作成功-状态码 + * 操作成功-状态码 * * @param codeEnum 状态码 */ @@ -85,7 +85,7 @@ public class Result { } /** - * * 操作成功-自定义返回数据和状态码 + * 操作成功-自定义返回数据和状态码 * * @param data 返回体 * @param codeEnum 状态码 @@ -95,7 +95,7 @@ public class Result { } /** - * * 操作失败-自定义返回数据和状态码 + * 操作失败-自定义返回数据和状态码 * * @param data 返回体 * @param message 错误信息 @@ -105,7 +105,7 @@ public class Result { } /** - * * 操作失败-自定义返回数据和状态码 + * 操作失败-自定义返回数据和状态码 * * @param data 返回体 * @param code 状态码 @@ -116,14 +116,14 @@ public class Result { } /** - * * 操作失败 + * 操作失败 */ public static Result error() { return Result.build(null); } /** - * * 操作失败-自定义返回数据 + * 操作失败-自定义返回数据 * * @param data 返回体 */ @@ -132,7 +132,7 @@ public class Result { } /** - * * 操作失败-状态码 + * 操作失败-状态码 * * @param codeEnum 状态码 */ @@ -141,7 +141,7 @@ public class Result { } /** - * * 操作失败-自定义返回数据和状态码 + * 操作失败-自定义返回数据和状态码 * * @param data 返回体 * @param codeEnum 状态码 @@ -151,7 +151,7 @@ public class Result { } /** - * * 操作失败-自定义返回数据和状态码 + * 操作失败-自定义返回数据和状态码 * * @param data 返回体 * @param code 状态码 @@ -162,7 +162,7 @@ public class Result { } /** - * * 操作失败-自定义返回数据和状态码 + * 操作失败-自定义返回数据和状态码 * * @param data 返回体 * @param message 错误信息 diff --git a/auth-module/module-generator-code/src/main/resources/application-dev.yml b/auth-module/module-generator-code/src/main/resources/application-dev.yml index bd0da75..853b9ec 100644 --- a/auth-module/module-generator-code/src/main/resources/application-dev.yml +++ b/auth-module/module-generator-code/src/main/resources/application-dev.yml @@ -4,4 +4,4 @@ bunny: port: 3306 database: test_auth username: bunny_test - password: Test1234 \ No newline at end of file + password: "Test1234" \ No newline at end of file diff --git a/auth-module/module-generator-code/src/main/resources/vms/server/controller/controller.java.vm b/auth-module/module-generator-code/src/main/resources/vms/server/controller/controller.java.vm index cd8d4b4..b532e7b 100644 --- a/auth-module/module-generator-code/src/main/resources/vms/server/controller/controller.java.vm +++ b/auth-module/module-generator-code/src/main/resources/vms/server/controller/controller.java.vm @@ -1,8 +1,8 @@ package ${package}.controller; -import ${package}.domain.dto.${classUppercaseName}Dto; -import ${package}.domain.entity.${classUppercaseName}Entity; -import ${package}.domain.vo.${classUppercaseName}Vo; +import ${package}.model.dto.${classUppercaseName}Dto; +import ${package}.model.entity.${classUppercaseName}Entity; +import ${package}.model.vo.${classUppercaseName}Vo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -12,9 +12,10 @@ import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import ${package}.service.${classUppercaseName}Service; -import ${package}.domain.vo.result.PageResult; -import ${package}.domain.vo.result.Result; -import ${package}.domain.vo.result.ResultCodeEnum; +import com.auth.common.model.common.result.PageResult; +import com.auth.common.model.common.result.Result; +import com.auth.common.model.common.result.ResultCodeEnum; + import java.util.List; /** @@ -33,7 +34,7 @@ public class ${classUppercaseName}Controller { private final ${classUppercaseName}Service ${classLowercaseName}Service; - @Operation(summary = "分页查询${comment}", description = "分页${comment}") + @Operation(summary = "分页查询${comment}", description = "分页查询${comment}") @GetMapping("{page}/{limit}") public Result> get${classUppercaseName}Page( @Parameter(name = "page", description = "当前页", required = true) @@ -46,6 +47,14 @@ public class ${classUppercaseName}Controller { return Result.success(pageResult); } + @Operation(summary = "根据id查询${comment}详情", description = "根据id查询${comment}详情") + @GetMapping("{id}") + public Result<${classUppercaseName}Vo> get${classUppercaseName}ById(@PathVariable("id") Long id) { + ${classUppercaseName}Vo ${classLowercaseName}Vo = ${classLowercaseName}Service.get${classUppercaseName}ById(id); + + return Result.success(${classLowercaseName}Vo); + } + @Operation(summary = "添加${comment}", description = "添加${comment}") @PostMapping() public Result add${classUppercaseName}(@Valid @RequestBody ${classUppercaseName}Dto dto) { diff --git a/auth-module/module-generator-code/src/main/resources/vms/server/mapper/mapper.java.vm b/auth-module/module-generator-code/src/main/resources/vms/server/mapper/mapper.java.vm index 0b3f0e5..9750224 100644 --- a/auth-module/module-generator-code/src/main/resources/vms/server/mapper/mapper.java.vm +++ b/auth-module/module-generator-code/src/main/resources/vms/server/mapper/mapper.java.vm @@ -4,14 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import ${package}.domain.dto.${classUppercaseName}Dto; -import ${package}.domain.entity.${classUppercaseName}Entity; -import ${package}.domain.vo.${classUppercaseName}Vo; +import ${package}.model.dto.${classUppercaseName}Dto; +import ${package}.model.entity.${classUppercaseName}Entity; +import ${package}.model.vo.${classUppercaseName}Vo; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; -import ${package}.domain.vo.result.PageResult; -import ${package}.domain.vo.result.Result; -import ${package}.domain.vo.result.ResultCodeEnum; + import java.util.List; /** @@ -26,7 +24,7 @@ import java.util.List; public interface ${classUppercaseName}Mapper extends BaseMapper<${classUppercaseName}Entity> { /** - * * 分页查询${comment}内容 + * 分页查询${comment}内容 * * @param pageParams ${comment}分页参数 * @param dto ${comment}查询表单 diff --git a/auth-module/module-generator-code/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm b/auth-module/module-generator-code/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm index ba1e6ed..aa4ed65 100644 --- a/auth-module/module-generator-code/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm +++ b/auth-module/module-generator-code/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm @@ -3,19 +3,24 @@ - + + #foreach($field in ${columnInfoList}) #end + + + + - ${baseColumnList} + id, ${baseColumnList}, create_time, update_time, create_user, update_user - select base.*, create_user.username as create_username, diff --git a/auth-module/module-generator-code/src/main/resources/vms/server/model/dto/dto.java.vm b/auth-module/module-generator-code/src/main/resources/vms/server/model/dto/dto.java.vm index 10ac102..a7b222c 100644 --- a/auth-module/module-generator-code/src/main/resources/vms/server/model/dto/dto.java.vm +++ b/auth-module/module-generator-code/src/main/resources/vms/server/model/dto/dto.java.vm @@ -1,5 +1,3 @@ -package ${package}.domain.dto; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; @@ -17,9 +15,9 @@ import java.util.Date; @Schema(name = "${classUppercaseName}DTO对象", title = "${comment}", description = "${comment}的DTO对象") public class ${classUppercaseName}Dto { - #foreach($field in ${columnInfoList}) - @Schema(name = "${field.lowercaseName}", title = "${field.comment}") - private ${field.javaType} ${field.lowercaseName}; +#foreach($field in ${columnInfoList}) +@Schema(name = "${field.lowercaseName}", title = "${field.comment}") +private ${field.javaType} ${field.lowercaseName}; - #end +#end } \ No newline at end of file diff --git a/auth-module/module-generator-code/src/main/resources/vms/server/model/entity/entity.java.vm b/auth-module/module-generator-code/src/main/resources/vms/server/model/entity/entity.java.vm index 45a1cab..9766a75 100644 --- a/auth-module/module-generator-code/src/main/resources/vms/server/model/entity/entity.java.vm +++ b/auth-module/module-generator-code/src/main/resources/vms/server/model/entity/entity.java.vm @@ -1,4 +1,3 @@ -package ${package}.domain.entity; import com.auth.common.model.common.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/auth-module/module-generator-code/src/main/resources/vms/server/model/vo/vo.java.vm b/auth-module/module-generator-code/src/main/resources/vms/server/model/vo/vo.java.vm index c222aa0..07ebfd8 100644 --- a/auth-module/module-generator-code/src/main/resources/vms/server/model/vo/vo.java.vm +++ b/auth-module/module-generator-code/src/main/resources/vms/server/model/vo/vo.java.vm @@ -1,4 +1,3 @@ -package ${package}.domain.vo; import java.util.Date; import java.math.BigDecimal; @@ -17,10 +16,10 @@ import java.time.LocalDateTime; @Schema(name = "${classUppercaseName}VO对象", title = "${comment}", description = "${comment}的VO对象") public class ${classUppercaseName}Vo { - #foreach($field in ${columnInfoList}) - @Schema(name = "${field.lowercaseName}", title = "${field.comment}") - private ${field.javaType} ${field.lowercaseName}; +#foreach($field in ${columnInfoList}) +@Schema(name = "${field.lowercaseName}", title = "${field.comment}") +private ${field.javaType} ${field.lowercaseName}; - #end +#end } diff --git a/auth-module/module-generator-code/src/main/resources/vms/server/service/impl/serviceImpl.java.vm b/auth-module/module-generator-code/src/main/resources/vms/server/service/impl/serviceImpl.java.vm index e3af511..33a0558 100644 --- a/auth-module/module-generator-code/src/main/resources/vms/server/service/impl/serviceImpl.java.vm +++ b/auth-module/module-generator-code/src/main/resources/vms/server/service/impl/serviceImpl.java.vm @@ -9,12 +9,12 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ${package}.service.${classUppercaseName}Service; -import ${package}.domain.dto.${classUppercaseName}Dto; -import ${package}.domain.entity.${classUppercaseName}Entity; -import ${package}.domain.vo.${classUppercaseName}Vo; -import ${package}.domain.vo.result.PageResult; -import ${package}.domain.vo.result.Result; -import ${package}.domain.vo.result.ResultCodeEnum; +import ${package}.model.dto.${classUppercaseName}Dto; +import ${package}.model.entity.${classUppercaseName}Entity; +import ${package}.model.vo.${classUppercaseName}Vo; +import com.auth.common.model.common.result.PageResult; +import com.auth.common.model.common.result.Result; +import com.auth.common.model.common.result.ResultCodeEnum; import java.util.List; /** @@ -30,7 +30,7 @@ import java.util.List; public class ${classUppercaseName}ServiceImpl extends ServiceImpl<${classUppercaseName}Mapper, ${classUppercaseName}Entity> implements ${classUppercaseName}Service { /** - * * ${comment} 服务实现类 + *${comment} 服务实现类 * * @param pageParams ${comment}分页查询page对象 * @param dto ${comment}分页查询对象 @@ -48,6 +48,21 @@ public class ${classUppercaseName}ServiceImpl extends ServiceImpl<${classUpperca .build(); } + /** + * 根据id查询${comment}详情 + * + * @param id 主键 + * @return ${comment}详情 ${classUppercaseName}Vo} + */ + public ${classUppercaseName}Vo get${classUppercaseName}ById(Long id){ + ${classUppercaseName}Entity ${classLowercaseName}Entity = getById(id); + + ${classUppercaseName}Vo ${classLowercaseName}Vo = new ${classUppercaseName}Vo(); + BeanUtils.copyProperties(${classLowercaseName}Entity, ${classLowercaseName}Vo); + + return ${classLowercaseName}Vo; + } + /** * 添加${comment} * @@ -55,8 +70,9 @@ public class ${classUppercaseName}ServiceImpl extends ServiceImpl<${classUpperca */ @Override public void add${classUppercaseName}(${classUppercaseName}Dto dto) { - ${classUppercaseName}Entity ${classLowercaseName} = new ${classUppercaseName}Entity(); + ${classUppercaseName}Entity ${classLowercaseName} = new ${classUppercaseName}Entity(); BeanUtils.copyProperties(dto, ${classLowercaseName}); + save(${classLowercaseName}); } @@ -67,8 +83,9 @@ public class ${classUppercaseName}ServiceImpl extends ServiceImpl<${classUpperca */ @Override public void update${classUppercaseName}(${classUppercaseName}Dto dto) { - ${classUppercaseName}Entity ${classLowercaseName} = new ${classUppercaseName}Entity(); + ${classUppercaseName}Entity ${classLowercaseName} = new ${classUppercaseName}Entity(); BeanUtils.copyProperties(dto, ${classLowercaseName}); + updateById(${classLowercaseName}); } diff --git a/auth-module/module-generator-code/src/main/resources/vms/server/service/service.java.vm b/auth-module/module-generator-code/src/main/resources/vms/server/service/service.java.vm index 875ca86..c7a0180 100644 --- a/auth-module/module-generator-code/src/main/resources/vms/server/service/service.java.vm +++ b/auth-module/module-generator-code/src/main/resources/vms/server/service/service.java.vm @@ -3,12 +3,12 @@ package ${package}.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import ${package}.domain.dto.${classUppercaseName}Dto; -import ${package}.domain.entity.${classUppercaseName}Entity; -import ${package}.domain.vo.${classUppercaseName}Vo; -import ${package}.domain.vo.result.PageResult; -import ${package}.domain.vo.result.Result; -import ${package}.domain.vo.result.ResultCodeEnum; +import ${package}.model.dto.${classUppercaseName}Dto; +import ${package}.model.entity.${classUppercaseName}Entity; +import ${package}.model.vo.${classUppercaseName}Vo; +import com.auth.common.model.common.result.PageResult; +import com.auth.common.model.common.result.Result; +import com.auth.common.model.common.result.ResultCodeEnum; import java.util.List; /** @@ -24,10 +24,18 @@ public interface ${classUppercaseName}Service extends IService<${classUppercaseN /** * 分页查询${comment} * - * @return {@link ${classUppercaseName}Vo} + * @return ${comment}分页结果 {@link ${classUppercaseName}Vo} */ PageResult<${classUppercaseName}Vo> get${classUppercaseName}Page(Page<${classUppercaseName}Entity> pageParams, ${classUppercaseName}Dto dto); + /** + * 根据id查询${comment}详情 + * + * @param id 主键 + * @return ${comment}详情 ${classUppercaseName}Vo} + */ + ${classUppercaseName}Vo get${classUppercaseName}ById(Long id); + /** * 添加${comment} *