xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-11-04 18:33:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v1.0.6 优化代码生成模板

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailService.java
View File

@@ -50,7 +50,7 @@ public class EmailService {
List<EmailEntity> entities = emailDao.queryByPage(page, queryDTO); List<EmailEntity> entities = emailDao.queryByPage(page, queryDTO);
List<EmailVO> dtoList = SmartBeanUtil.copyList(entities, EmailVO.class); List<EmailVO> dtoList = SmartBeanUtil.copyList(entities, EmailVO.class);
page.setRecords(dtoList); page.setRecords(dtoList);
PageResultDTO<EmailVO> pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page); PageResultDTO<EmailVO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page);
return ResponseDTO.succData(pageResultDTO); return ResponseDTO.succData(pageResultDTO);
} }

2
smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeService.java
View File

@@ -122,7 +122,7 @@ public class EmployeeService {
} }
} }
} }
return ResponseDTO.succData(SmartPaginationUtil.convert2PageInfoDTO(pageParam, employeeList, EmployeeVO.class)); return ResponseDTO.succData(SmartPaginationUtil.convert2PageResultDTO(pageParam, employeeList, EmployeeVO.class));
} }
/** /**

2
smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileService.java
View File

@@ -158,7 +158,7 @@ public class FileService {
e.setFileUrl(fileService.getFileUrl(e.getFilePath()).getData()); e.setFileUrl(fileService.getFileUrl(e.getFilePath()).getData());
}); });
} }
PageResultDTO<FileVO> pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page, fileList); PageResultDTO<FileVO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page, fileList);
return ResponseDTO.succData(pageResultDTO); return ResponseDTO.succData(pageResultDTO);
} }

3
smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatService.java
View File

@@ -12,7 +12,6 @@ import com.gangquan360.smartadmin.config.SmartHeartBeatConfig;
import com.gangquan360.smartadmin.util.SmartBeanUtil; import com.gangquan360.smartadmin.util.SmartBeanUtil;
import com.gangquan360.smartadmin.util.SmartPaginationUtil; import com.gangquan360.smartadmin.util.SmartPaginationUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -84,7 +83,7 @@ public class HeartBeatService extends AbstractHeartBeatCommand {
public ResponseDTO<PageResultDTO<HeartBeatRecordVO>> pageQuery(PageParamDTO pageParamDTO) { public ResponseDTO<PageResultDTO<HeartBeatRecordVO>> pageQuery(PageParamDTO pageParamDTO) {
Page pageQueryInfo = SmartPaginationUtil.convert2PageQueryInfo(pageParamDTO); Page pageQueryInfo = SmartPaginationUtil.convert2PageQueryInfo(pageParamDTO);
List<HeartBeatRecordVO> recordVOList = heartBeatRecordDao.pageQuery(pageQueryInfo); List<HeartBeatRecordVO> recordVOList = heartBeatRecordDao.pageQuery(pageQueryInfo);
PageResultDTO<HeartBeatRecordVO> pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(pageQueryInfo, recordVOList); PageResultDTO<HeartBeatRecordVO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(pageQueryInfo, recordVOList);
return ResponseDTO.succData(pageResultDTO); return ResponseDTO.succData(pageResultDTO);
} }

2
smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogService.java
View File

@@ -48,7 +48,7 @@ public class UserLoginLogService {
List<UserLoginLogEntity> entities = userLoginLogDao.queryByPage(page, queryDTO); List<UserLoginLogEntity> entities = userLoginLogDao.queryByPage(page, queryDTO);
List<UserLoginLogDTO> dtoList = SmartBeanUtil.copyList(entities, UserLoginLogDTO.class); List<UserLoginLogDTO> dtoList = SmartBeanUtil.copyList(entities, UserLoginLogDTO.class);
page.setRecords(dtoList); page.setRecords(dtoList);
PageResultDTO<UserLoginLogDTO> pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page); PageResultDTO<UserLoginLogDTO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page);
return ResponseDTO.succData(pageResultDTO); return ResponseDTO.succData(pageResultDTO);
} }

2
smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogService.java
View File

@@ -40,7 +40,7 @@ public class UserOperateLogService {
List<UserOperateLogEntity> entities = userOperateLogDao.queryByPage(page, queryDTO); List<UserOperateLogEntity> entities = userOperateLogDao.queryByPage(page, queryDTO);
List<UserOperateLogDTO> dtoList = SmartBeanUtil.copyList(entities, UserOperateLogDTO.class); List<UserOperateLogDTO> dtoList = SmartBeanUtil.copyList(entities, UserOperateLogDTO.class);
page.setRecords(dtoList); page.setRecords(dtoList);
PageResultDTO<UserOperateLogDTO> pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page); PageResultDTO<UserOperateLogDTO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page);
return ResponseDTO.succData(pageResultDTO); return ResponseDTO.succData(pageResultDTO);
} }

6
smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeService.java
View File

@@ -58,7 +58,7 @@ public class NoticeService {
Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO);
List<NoticeVO> dtoList = noticeDao.queryByPage(page, queryDTO); List<NoticeVO> dtoList = noticeDao.queryByPage(page, queryDTO);
page.setRecords(dtoList); page.setRecords(dtoList);
PageResultDTO<NoticeVO> pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page); PageResultDTO<NoticeVO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page);
return ResponseDTO.succData(pageResultDTO); return ResponseDTO.succData(pageResultDTO);
} }
@@ -82,7 +82,7 @@ public class NoticeService {
} }
}); });
page.setRecords(dtoList); page.setRecords(dtoList);
PageResultDTO<NoticeReceiveDTO> pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page); PageResultDTO<NoticeReceiveDTO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page);
return ResponseDTO.succData(pageResultDTO); return ResponseDTO.succData(pageResultDTO);
} }
@@ -97,7 +97,7 @@ public class NoticeService {
Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO);
List<NoticeVO> dtoList = noticeDao.queryUnreadByPage(page, requestToken.getRequestUserId(), JudgeEnum.YES.getValue()); List<NoticeVO> dtoList = noticeDao.queryUnreadByPage(page, requestToken.getRequestUserId(), JudgeEnum.YES.getValue());
page.setRecords(dtoList); page.setRecords(dtoList);
PageResultDTO<NoticeVO> pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page); PageResultDTO<NoticeVO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page);
return ResponseDTO.succData(pageResultDTO); return ResponseDTO.succData(pageResultDTO);
} }

2
smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionService.java
View File

@@ -33,7 +33,7 @@ public class PositionService {
Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO);
List<PositionEntity> entityList = positionDao.selectByPage(page, queryDTO); List<PositionEntity> entityList = positionDao.selectByPage(page, queryDTO);
page.setRecords(entityList.stream().map(e -> SmartBeanUtil.copy(e, PositionResultVO.class)).collect(Collectors.toList())); page.setRecords(entityList.stream().map(e -> SmartBeanUtil.copy(e, PositionResultVO.class)).collect(Collectors.toList()));
PageResultDTO<PositionResultVO> pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page); PageResultDTO<PositionResultVO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page);
return ResponseDTO.succData(pageResultDTO); return ResponseDTO.succData(pageResultDTO);
} }

4
smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskService.java
View File

@@ -56,7 +56,7 @@ public class QuartzTaskService {
Page pageParam = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); Page pageParam = SmartPaginationUtil.convert2PageQueryInfo(queryDTO);
List<QuartzTaskVO> taskList = quartzTaskDao.queryList(pageParam, queryDTO); List<QuartzTaskVO> taskList = quartzTaskDao.queryList(pageParam, queryDTO);
pageParam.setRecords(taskList); pageParam.setRecords(taskList);
return ResponseDTO.succData(SmartPaginationUtil.convert2PageInfoDTO(pageParam)); return ResponseDTO.succData(SmartPaginationUtil.convert2PageResultDTO(pageParam));
} }
/** /**
@@ -69,7 +69,7 @@ public class QuartzTaskService {
Page pageParam = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); Page pageParam = SmartPaginationUtil.convert2PageQueryInfo(queryDTO);
List<QuartzTaskLogVO> taskList = quartzTaskLogDao.queryList(pageParam, queryDTO); List<QuartzTaskLogVO> taskList = quartzTaskLogDao.queryList(pageParam, queryDTO);
pageParam.setRecords(taskList); pageParam.setRecords(taskList);
return ResponseDTO.succData(SmartPaginationUtil.convert2PageInfoDTO(pageParam)); return ResponseDTO.succData(SmartPaginationUtil.convert2PageResultDTO(pageParam));
} }
/** /**

2
smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeService.java
View File

@@ -55,7 +55,7 @@ public class RoleEmployeeService {
DepartmentEntity departmentEntity = departmentDao.selectById(employeeDTO.getDepartmentId()); DepartmentEntity departmentEntity = departmentDao.selectById(employeeDTO.getDepartmentId());
employeeDTO.setDepartmentName(departmentEntity.getName()); employeeDTO.setDepartmentName(departmentEntity.getName());
}); });
PageResultDTO<EmployeeVO> pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page, employeeDTOS, EmployeeVO.class); PageResultDTO<EmployeeVO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page, employeeDTOS, EmployeeVO.class);
return ResponseDTO.succData(pageResultDTO); return ResponseDTO.succData(pageResultDTO);
} }

2
smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigService.java
View File

@@ -84,7 +84,7 @@ public class SystemConfigService {
public ResponseDTO<PageResultDTO<SystemConfigVO>> getSystemConfigPage(SystemConfigQueryDTO queryDTO) { public ResponseDTO<PageResultDTO<SystemConfigVO>> getSystemConfigPage(SystemConfigQueryDTO queryDTO) {
Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO);
List<SystemConfigEntity> entityList = systemConfigDao.selectSystemSettingList(page, queryDTO); List<SystemConfigEntity> entityList = systemConfigDao.selectSystemSettingList(page, queryDTO);
PageResultDTO<SystemConfigVO> pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page, entityList, SystemConfigVO.class); PageResultDTO<SystemConfigVO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page, entityList, SystemConfigVO.class);
return ResponseDTO.succData(pageResultDTO); return ResponseDTO.succData(pageResultDTO);
} }

6
smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartPaginationUtil.java
View File

@@ -16,7 +16,7 @@ import java.util.List;
public class SmartPaginationUtil { public class SmartPaginationUtil {
public static <T> PageResultDTO<T> convert2PageInfoDTO(Page<T> page) { public static <T> PageResultDTO<T> convert2PageResultDTO(Page<T> page) {
PageResultDTO<T> result = new PageResultDTO<>(); PageResultDTO<T> result = new PageResultDTO<>();
result.setPageNum(page.getCurrent()); result.setPageNum(page.getCurrent());
result.setPageSize(page.getSize()); result.setPageSize(page.getSize());
@@ -51,7 +51,7 @@ public class SmartPaginationUtil {
* @author yandanyang * @author yandanyang
* @date 2018年5月16日 下午6:05:28 * @date 2018年5月16日 下午6:05:28
*/ */
public static <T, E> PageResultDTO<T> convert2PageInfoDTO(Page page, List<E> sourceList, Class<T> targetClazz) { public static <T, E> PageResultDTO<T> convert2PageResultDTO(Page page, List<E> sourceList, Class<T> targetClazz) {
PageResultDTO pageResultDTO = setPage(page); PageResultDTO pageResultDTO = setPage(page);
List<T> records = SmartBeanUtil.copyList(sourceList, targetClazz); List<T> records = SmartBeanUtil.copyList(sourceList, targetClazz);
page.setRecords(records); page.setRecords(records);
@@ -68,7 +68,7 @@ public class SmartPaginationUtil {
* @author yandanyang * @author yandanyang
* @date 2018年5月16日 下午6:05:28 * @date 2018年5月16日 下午6:05:28
*/ */
public static <T, E> PageResultDTO<T> convert2PageInfoDTO(Page page, List<E> sourceList) { public static <T, E> PageResultDTO<T> convert2PageResultDTO(Page page, List<E> sourceList) {
PageResultDTO pageResultDTO = setPage(page); PageResultDTO pageResultDTO = setPage(page);
page.setRecords(sourceList); page.setRecords(sourceList);
pageResultDTO.setList(sourceList); pageResultDTO.setList(sourceList);

5
smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Controller.java.vm
View File

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

1
smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Dao.java.vm
View File

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

4
smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/QueryDTO.java.vm
View File

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

12
smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Service.java.vm
View File

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

4
smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/module/codegenerator/CodeGeneratorServiceTest.java
View File

@@ -33,8 +33,8 @@ public class CodeGeneratorServiceTest extends BaseTest {
List<CodeGeneratorQueryColumnDTO> queryColumnList = Lists.newArrayList(createTimeBetween,like); List<CodeGeneratorQueryColumnDTO> queryColumnList = Lists.newArrayList(createTimeBetween,like);
CodeGeneratorDTO codeGenerator = CodeGeneratorDTO.builder() CodeGeneratorDTO codeGenerator = CodeGeneratorDTO.builder()
.author("yandanyang") .author("zhuoda")
.company("钢圈") .company("1024创新( www.1024lab.net )")
.tableName("t_notice") .tableName("t_notice")
.tablePrefix("t_") .tablePrefix("t_")
.basePackage("com.gangquan360.smartadmin") .basePackage("com.gangquan360.smartadmin")