v1.0.6 优化代码生成模板

This commit is contained in:
zhuoda
2020-01-13 10:48:32 +08:00
parent bcc376e7bc
commit 94873f8821
17 changed files with 29 additions and 32 deletions

View File

@@ -1,7 +1,6 @@
package ${basePackage}.module.${modulePackage}.controller;
import ${basePackage}.common.constant.SwaggerTagConst;
import ${basePackage}.common.domain.PageInfoDTO;
import ${basePackage}.common.domain.PageResultDTO;
import ${basePackage}.common.domain.ResponseDTO;
import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}DTO;
import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}QueryDTO;
@@ -32,7 +31,7 @@ public class ${moduleClass}Controller {
@ApiOperation(value = "分页查询${tableDesc}",notes = "@author ${author}")
@PostMapping("/${moduleVar}/page/query")
public ResponseDTO<PageInfoDTO<${moduleClass}DTO>> queryByPage(@RequestBody ${moduleClass}QueryDTO queryDTO) {
public ResponseDTO<PageResultDTO<${moduleClass}DTO>> queryByPage(@RequestBody ${moduleClass}QueryDTO queryDTO) {
return ${moduleVar}Service.queryByPage(queryDTO);
}

View File

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.baomidou.mybatisplus.plugins.pagination.Pagination;
import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}QueryDTO;
import ${basePackage}.module.${modulePackage}.domain.entity.${moduleClass}Entity;
import ${basePackage}.utils.PaginationUtil;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;

View File

@@ -1,6 +1,6 @@
package ${basePackage}.module.${modulePackage}.domain.dto;
import ${basePackage}.common.domain.PageBaseDTO;
import ${basePackage}.common.domain.PageParamDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
#foreach ($queryImport in $queryImports)
@@ -18,7 +18,7 @@ $queryImport
* @since JDK1.8
*/
@Data
public class ${moduleClass}QueryDTO extends PageBaseDTO {
public class ${moduleClass}QueryDTO extends PageParamDTO {
#foreach ($queryField in $queryFieldList)

View File

@@ -1,14 +1,14 @@
package ${basePackage}.module.${modulePackage}.service;
import com.baomidou.mybatisplus.plugins.Page;
import ${basePackage}.common.domain.PageInfoDTO;
import ${basePackage}.common.domain.PageResultDTO;
import ${basePackage}.common.domain.ResponseDTO;
import ${basePackage}.module.${modulePackage}.dao.${moduleClass}Dao;
import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}DTO;
import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}QueryDTO;
import ${basePackage}.module.${modulePackage}.domain.entity.${moduleClass}Entity;
import ${basePackage}.utils.PaginationUtil;
import com.gangquan360.smartutil.bean.SmartBeanUtil;
import ${basePackage}.util.SmartPaginationUtil;
import ${basePackage}.util.SmartBeanUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -37,12 +37,12 @@ public class ${moduleClass}Service {
* @description 分页查询
* @date ${date}
*/
public ResponseDTO<PageInfoDTO<${moduleClass}DTO>> queryByPage(${moduleClass}QueryDTO queryDTO) {
Page page = PaginationUtil.convert2PageQueryInfo(queryDTO);
public ResponseDTO<PageResultDTO<${moduleClass}DTO>> queryByPage(${moduleClass}QueryDTO queryDTO) {
Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO);
List<${moduleClass}Entity> entities = ${moduleVar}Dao.queryByPage(page, queryDTO);
List<${moduleClass}DTO> dtoList = SmartBeanUtil.copyList(entities, ${moduleClass}DTO.class);
page.setRecords(dtoList);
PageInfoDTO<${moduleClass}DTO> pageResultDTO = PaginationUtil.convert2PageInfoDTO(page);
PageResultDTO<${moduleClass}DTO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page);
return ResponseDTO.succData(pageResultDTO);
}