diff --git a/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl b/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl index 703bc479..237ad73d 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl @@ -20,6 +20,7 @@ import ${package}.domain.${className}; import ${package}.service.${className}Service; import ${package}.service.dto.${className}QueryCriteria; import org.springframework.data.domain.Pageable; +import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -35,17 +36,14 @@ import javax.servlet.http.HttpServletResponse; * @author ${author} * @date ${date} **/ -@Api(tags = "${apiAlias}管理") @RestController +@RequiredArgsConstructor +@Api(tags = "${apiAlias}管理") @RequestMapping("/api/${changeClassName}") public class ${className}Controller { private final ${className}Service ${changeClassName}Service; - public ${className}Controller(${className}Service ${changeClassName}Service) { - this.${changeClassName}Service = ${changeClassName}Service; - } - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") diff --git a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl index d47bf194..5dd3d1b6 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl @@ -27,6 +27,7 @@ import me.zhengjie.exception.EntityExistException; import me.zhengjie.utils.ValidationUtil; import me.zhengjie.utils.FileUtil; +import lombok.RequiredArgsConstructor; import ${package}.repository.${className}Repository; import ${package}.service.${className}Service; import ${package}.service.dto.${className}Dto; @@ -60,18 +61,13 @@ import java.util.LinkedHashMap; * @date ${date} **/ @Service +@RequiredArgsConstructor @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class ${className}ServiceImpl implements ${className}Service { private final ${className}Repository ${changeClassName}Repository; - private final ${className}Mapper ${changeClassName}Mapper; - public ${className}ServiceImpl(${className}Repository ${changeClassName}Repository, ${className}Mapper ${changeClassName}Mapper) { - this.${changeClassName}Repository = ${changeClassName}Repository; - this.${changeClassName}Mapper = ${changeClassName}Mapper; - } - @Override public Map queryAll(${className}QueryCriteria criteria, Pageable pageable){ Page<${className}> page = ${changeClassName}Repository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);