Merge branch '2.3dev'

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java

 package me.zhengjie.modules.system.service.mapper;
 
-import me.zhengjie.mapper.EntityMapper;
+import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Dept;
 import me.zhengjie.modules.system.service.dto.DeptDTO;
 import org.mapstruct.Mapper;
@@ -10,7 +10,7 @@ import org.mapstruct.ReportingPolicy;
 * @author Zheng Jie
 * @date 2019-03-25
 */
-@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DeptMapper extends EntityMapper<DeptDTO, Dept> {
+@Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface DeptMapper extends BaseMapper<DeptDTO, Dept> {
 
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java

 package me.zhengjie.modules.system.service.mapper;
 
-import me.zhengjie.mapper.EntityMapper;
+import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Dept;
 import me.zhengjie.modules.system.service.dto.DeptSmallDTO;
 import org.mapstruct.Mapper;
@@ -10,7 +10,7 @@ import org.mapstruct.ReportingPolicy;
 * @author Zheng Jie
 * @date 2019-03-25
 */
-@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DeptSmallMapper extends EntityMapper<DeptSmallDTO, Dept> {
+@Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface DeptSmallMapper extends BaseMapper<DeptSmallDTO, Dept> {
 
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java

 package me.zhengjie.modules.system.service.mapper;
 
-import me.zhengjie.mapper.EntityMapper;
+import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.DictDetail;
 import me.zhengjie.modules.system.service.dto.DictDetailDTO;
 import org.mapstruct.Mapper;
@@ -10,7 +10,7 @@ import org.mapstruct.ReportingPolicy;
 * @author Zheng Jie
 * @date 2019-04-10
 */
-@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DictDetailMapper extends EntityMapper<DictDetailDTO, DictDetail> {
+@Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface DictDetailMapper extends BaseMapper<DictDetailDTO, DictDetail> {
 
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java

 package me.zhengjie.modules.system.service.mapper;
 
-import me.zhengjie.mapper.EntityMapper;
+import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Dict;
 import me.zhengjie.modules.system.service.dto.DictDTO;
 import org.mapstruct.Mapper;
@@ -10,7 +10,7 @@ import org.mapstruct.ReportingPolicy;
 * @author Zheng Jie
 * @date 2019-04-10
 */
-@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DictMapper extends EntityMapper<DictDTO, Dict> {
+@Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface DictMapper extends BaseMapper<DictDTO, Dict> {
 
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java

 package me.zhengjie.modules.system.service.mapper;
 
-import me.zhengjie.mapper.EntityMapper;
+import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Job;
 import me.zhengjie.modules.system.service.dto.JobDTO;
 import org.mapstruct.Mapper;
@@ -12,7 +12,7 @@ import org.mapstruct.ReportingPolicy;
 * @date 2019-03-29
 */
 @Mapper(componentModel = "spring",uses = {DeptMapper.class},unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface JobMapper extends EntityMapper<JobDTO, Job> {
+public interface JobMapper extends BaseMapper<JobDTO, Job> {
 
     @Mapping(source = "deptSuperiorName", target = "deptSuperiorName")
     JobDTO toDto(Job job, String deptSuperiorName);

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java

 package me.zhengjie.modules.system.service.mapper;
 
-import me.zhengjie.mapper.EntityMapper;
+import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Job;
 import me.zhengjie.modules.system.service.dto.JobSmallDTO;
 import org.mapstruct.Mapper;
@@ -10,7 +10,7 @@ import org.mapstruct.ReportingPolicy;
 * @author Zheng Jie
 * @date 2019-03-29
 */
-@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface JobSmallMapper extends EntityMapper<JobSmallDTO, Job> {
+@Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface JobSmallMapper extends BaseMapper<JobSmallDTO, Job> {
 
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java

 package me.zhengjie.modules.system.service.mapper;
 
+import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Menu;
-import me.zhengjie.mapper.EntityMapper;
 import me.zhengjie.modules.system.service.dto.MenuDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
@@ -10,7 +10,7 @@ import org.mapstruct.ReportingPolicy;
  * @author Zheng Jie
  * @date 2018-12-17
  */
-@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface MenuMapper extends EntityMapper<MenuDTO, Menu> {
+@Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface MenuMapper extends BaseMapper<MenuDTO, Menu> {
 
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/PermissionMapper.java

-package me.zhengjie.modules.system.service.mapper;
-
-import me.zhengjie.modules.system.domain.Permission;
-import me.zhengjie.mapper.EntityMapper;
-import me.zhengjie.modules.system.service.dto.PermissionDTO;
-import org.mapstruct.Mapper;
-import org.mapstruct.ReportingPolicy;
-
-/**
- * @author Zheng Jie
- * @date 2018-11-23
- */
-@Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface PermissionMapper extends EntityMapper<PermissionDTO, Permission> {
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java

 package me.zhengjie.modules.system.service.mapper;
 
+import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Role;
-import me.zhengjie.mapper.EntityMapper;
 import me.zhengjie.modules.system.service.dto.RoleDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
@@ -10,7 +10,7 @@ import org.mapstruct.ReportingPolicy;
  * @author Zheng Jie
  * @date 2018-11-23
  */
-@Mapper(componentModel = "spring", uses = {PermissionMapper.class, MenuMapper.class, DeptMapper.class}, unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface RoleMapper extends EntityMapper<RoleDTO, Role> {
+@Mapper(componentModel = "spring", uses = {MenuMapper.class, DeptMapper.class}, unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface RoleMapper extends BaseMapper<RoleDTO, Role> {
 
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java

 package me.zhengjie.modules.system.service.mapper;
 
-import me.zhengjie.mapper.EntityMapper;
+import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Role;
-import me.zhengjie.modules.system.service.dto.RoleDTO;
 import me.zhengjie.modules.system.service.dto.RoleSmallDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
@@ -11,7 +10,7 @@ import org.mapstruct.ReportingPolicy;
  * @author Zheng Jie
  * @date 2019-5-23
  */
-@Mapper(componentModel = "spring", uses = {}, unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface RoleSmallMapper extends EntityMapper<RoleSmallDTO, Role> {
+@Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface RoleSmallMapper extends BaseMapper<RoleSmallDTO, Role> {
 
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java

 package me.zhengjie.modules.system.service.mapper;
 
+import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.User;
-import me.zhengjie.mapper.EntityMapper;
 import me.zhengjie.modules.system.service.dto.UserDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
 
-import java.util.List;
-
 /**
  * @author Zheng Jie
  * @date 2018-11-23
  */
 @Mapper(componentModel = "spring",uses = {RoleMapper.class, DeptMapper.class, JobMapper.class},unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface UserMapper extends EntityMapper<UserDTO, User> {
+public interface UserMapper extends BaseMapper<UserDTO, User> {
 
     @Mapping(source = "user.userAvatar.realName",target = "avatar")
     UserDTO toDto(User user);

eladmin-system/src/main/resources/config/application-dev.yml

@@ -45,13 +45,12 @@ spring:
 jwt:
   header: Authorization
   secret: mySecret
-  # token 过期时间 6个小时
-  expiration: 21000000
-  auth:
-    # 授权路径
-    path: /login
-    # 获取用户信息
-    account: /info
+  # token 过期时间/毫秒，6小时  1小时 = 3600000 毫秒
+  expiration: 21600000
+  # 在线用户key
+  online: online-token
+  # 验证码
+  codeKey: code-key
 
 #是否允许生成代码，生产环境设置为false
 generator:

eladmin-system/src/main/resources/config/application-prod.yml

@@ -49,11 +49,10 @@ jwt:
   secret: mySecret
   # token 过期时间 2个小时
   expiration: 7200000
-  auth:
-    # 授权路径
-    path: /login
-    # 获取用户信息
-    account: /info
+  # 在线用户key
+  online: online-token
+  # 验证码
+  codeKey: code-key
 
 #是否允许生成代码，生产环境设置为false
 generator:

eladmin-system/src/main/resources/config/application.yml

@@ -29,6 +29,17 @@ spring:
     #连接超时时间
     timeout: 5000
 
+task:
+  pool:
+    # 核心线程池大小
+    core-pool-size: 10
+    # 最大线程数
+    max-pool-size: 30
+    # 活跃时间
+    keep-alive-seconds: 60
+    # 队列容量
+    queue-capacity: 50
+
 #七牛云
 qiniu:
   # 文件大小 /M

eladmin-system/src/main/resources/template/generator/admin/Controller.ftl

@@ -4,7 +4,6 @@ import me.zhengjie.aop.log.Log;
 import ${package}.domain.${className};
 import ${package}.service.${className}Service;
 import ${package}.service.dto.${className}QueryCriteria;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -12,6 +11,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
 
 /**
 * @author ${author}
@@ -19,41 +20,52 @@ import io.swagger.annotations.*;
 */
 @Api(tags = "${className}管理")
 @RestController
-@RequestMapping("api")
+@RequestMapping("/api/${changeClassName}")
 public class ${className}Controller {
 
-    @Autowired
-    private ${className}Service ${changeClassName}Service;
+    private final ${className}Service ${changeClassName}Service;
 
+    public ${className}Controller(${className}Service ${changeClassName}Service) {
+        this.${changeClassName}Service = ${changeClassName}Service;
+    }
+
+    @Log("导出数据")
+    @ApiOperation("导出数据")
+    @GetMapping(value = "/download")
+    @PreAuthorize("@el.check('${changeClassName}:list')")
+    public void download(HttpServletResponse response, ${className}QueryCriteria criteria) throws IOException {
+        ${changeClassName}Service.download(${changeClassName}Service.queryAll(criteria), response);
+    }
+
+    @GetMapping
     @Log("查询${className}")
-    @ApiOperation(value = "查询${className}")
-    @GetMapping(value = "/${changeClassName}")
-    @PreAuthorize("hasAnyRole('ADMIN','${upperCaseClassName}_ALL','${upperCaseClassName}_SELECT')")
+    @ApiOperation("查询${className}")
+    @PreAuthorize("@el.check('${changeClassName}:list')")
     public ResponseEntity get${className}s(${className}QueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity(${changeClassName}Service.queryAll(criteria,pageable),HttpStatus.OK);
+        return new ResponseEntity<>(${changeClassName}Service.queryAll(criteria,pageable),HttpStatus.OK);
     }
 
+    @PostMapping
     @Log("新增${className}")
-    @ApiOperation(value = "新增${className}")
-    @PostMapping(value = "/${changeClassName}")
-    @PreAuthorize("hasAnyRole('ADMIN','${upperCaseClassName}_ALL','${upperCaseClassName}_CREATE')")
+    @ApiOperation("新增${className}")
+    @PreAuthorize("@el.check('${changeClassName}:add')")
     public ResponseEntity create(@Validated @RequestBody ${className} resources){
-        return new ResponseEntity(${changeClassName}Service.create(resources),HttpStatus.CREATED);
+        return new ResponseEntity<>(${changeClassName}Service.create(resources),HttpStatus.CREATED);
     }
 
+    @PutMapping
     @Log("修改${className}")
-    @ApiOperation(value = "修改${className}")
-    @PutMapping(value = "/${changeClassName}")
-    @PreAuthorize("hasAnyRole('ADMIN','${upperCaseClassName}_ALL','${upperCaseClassName}_EDIT')")
+    @ApiOperation("修改${className}")
+    @PreAuthorize("@el.check('${changeClassName}:edit')")
     public ResponseEntity update(@Validated @RequestBody ${className} resources){
         ${changeClassName}Service.update(resources);
         return new ResponseEntity(HttpStatus.NO_CONTENT);
     }
 
+    @DeleteMapping(value = "/{${pkChangeColName}}")
     @Log("删除${className}")
-    @ApiOperation(value = "删除${className}")
-    @DeleteMapping(value = "/${changeClassName}/{${pkChangeColName}}")
-    @PreAuthorize("hasAnyRole('ADMIN','${upperCaseClassName}_ALL','${upperCaseClassName}_DELETE')")
+    @ApiOperation("删除${className}")
+    @PreAuthorize("@el.check('${changeClassName}:del')")
     public ResponseEntity delete(@PathVariable ${pkColumnType} ${pkChangeColName}){
         ${changeClassName}Service.delete(${pkChangeColName});
         return new ResponseEntity(HttpStatus.OK);

eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl

 package ${package}.service.mapper;
 
-import me.zhengjie.mapper.EntityMapper;
+import me.zhengjie.base.BaseMapper;
 import ${package}.domain.${className};
 import ${package}.service.dto.${className}DTO;
 import org.mapstruct.Mapper;
@@ -10,7 +10,7 @@ import org.mapstruct.ReportingPolicy;
 * @author ${author}
 * @date ${date}
 */
-@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface ${className}Mapper extends EntityMapper<${className}DTO, ${className}> {
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface ${className}Mapper extends BaseMapper<${className}DTO, ${className}> {
 
 }
\ No newline at end of file

eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl

 package ${package}.service.dto;
 
 import lombok.Data;
-<#if hasTimestamp>
+<#if queryHasTimestamp>
 import java.sql.Timestamp;
 </#if>
-<#if hasBigDecimal>
+<#if queryHasBigDecimal>
 import java.math.BigDecimal;
 </#if>
 <#if queryColumns??>

eladmin-system/src/main/resources/template/generator/admin/Repository.ftl

@@ -8,16 +8,11 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 * @author ${author}
 * @date ${date}
 */
-public interface ${className}Repository extends JpaRepository<${className}, ${pkColumnType}>, JpaSpecificationExecutor {
+public interface ${className}Repository extends JpaRepository<${className}, ${pkColumnType}>, JpaSpecificationExecutor<${className}> {
 <#if columns??>
     <#list columns as column>
         <#if column.columnKey = 'UNI'>
 
-    /**
-     * findBy${column.capitalColumnName}
-     * @param ${column.columnName}
-     * @return
-     */
     ${className} findBy${column.capitalColumnName}(${column.columnType} ${column.columnName});
         </#if>
     </#list>

eladmin-system/src/main/resources/template/generator/admin/Service.ftl

@@ -3,64 +3,45 @@ package ${package}.service;
 import ${package}.domain.${className};
 import ${package}.service.dto.${className}DTO;
 import ${package}.service.dto.${className}QueryCriteria;
-import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
 import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
 
 /**
 * @author ${author}
 * @date ${date}
 */
-//@CacheConfig(cacheNames = "${changeClassName}")
 public interface ${className}Service {
 
     /**
     * 查询数据分页
-    * @param criteria
-    * @param pageable
-    * @return
+    * @param criteria 条件参数
+    * @param pageable 分页参数
+    * @return Map<String,Object>
     */
-    //@Cacheable
     Map<String,Object> queryAll(${className}QueryCriteria criteria, Pageable pageable);
 
     /**
     * 查询所有数据不分页
-    * @param criteria
-    * @return
+    * @param criteria 条件参数
+    * @return List<${className}DTO>
     */
-    //@Cacheable
     List<${className}DTO> queryAll(${className}QueryCriteria criteria);
 
     /**
      * 根据ID查询
-     * @param ${pkChangeColName}
-     * @return
+     * @param ${pkChangeColName} ID
+     * @return ${className}DTO
      */
-    //@Cacheable(key = "#p0")
     ${className}DTO findById(${pkColumnType} ${pkChangeColName});
 
-    /**
-     * 创建
-     * @param resources
-     * @return
-     */
-    //@CacheEvict(allEntries = true)
     ${className}DTO create(${className} resources);
 
-    /**
-     * 编辑
-     * @param resources
-     */
-    //@CacheEvict(allEntries = true)
     void update(${className} resources);
 
-    /**
-     * 删除
-     * @param ${pkChangeColName}
-     */
-    //@CacheEvict(allEntries = true)
     void delete(${pkColumnType} ${pkChangeColName});
+
+    void download(List<${className}DTO> all, HttpServletResponse response) throws IOException;
 }
\ No newline at end of file

eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl

@@ -11,16 +11,15 @@ import me.zhengjie.exception.EntityExistException;
     </#list>
 </#if>
 import me.zhengjie.utils.ValidationUtil;
+import me.zhengjie.utils.FileUtil;
 import ${package}.repository.${className}Repository;
 import ${package}.service.${className}Service;
 import ${package}.service.dto.${className}DTO;
 import ${package}.service.dto.${className}QueryCriteria;
 import ${package}.service.mapper.${className}Mapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import java.util.Optional;
 <#if !auto && pkColumnType = 'Long'>
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
@@ -28,46 +27,61 @@ import cn.hutool.core.util.IdUtil;
 <#if !auto && pkColumnType = 'String'>
 import cn.hutool.core.util.IdUtil;
 </#if>
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
 
 /**
 * @author ${author}
 * @date ${date}
 */
 @Service
+@CacheConfig(cacheNames = "${changeClassName}")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
 public class ${className}ServiceImpl implements ${className}Service {
 
-    @Autowired
-    private ${className}Repository ${changeClassName}Repository;
+    private final ${className}Repository ${changeClassName}Repository;
 
-    @Autowired
-    private ${className}Mapper ${changeClassName}Mapper;
+    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
+    @Cacheable
     public Map<String,Object> queryAll(${className}QueryCriteria criteria, Pageable pageable){
         Page<${className}> page = ${changeClassName}Repository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
         return PageUtil.toPage(page.map(${changeClassName}Mapper::toDto));
     }
 
     @Override
+    @Cacheable
     public List<${className}DTO> queryAll(${className}QueryCriteria criteria){
         return ${changeClassName}Mapper.toDto(${changeClassName}Repository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
     }
 
     @Override
+    @Cacheable(key = "#p0")
     public ${className}DTO findById(${pkColumnType} ${pkChangeColName}) {
-        Optional<${className}> ${changeClassName} = ${changeClassName}Repository.findById(${pkChangeColName});
-        ValidationUtil.isNull(${changeClassName},"${className}","${pkChangeColName}",${pkChangeColName});
-        return ${changeClassName}Mapper.toDto(${changeClassName}.get());
+        ${className} ${changeClassName} = ${changeClassName}Repository.findById(${pkChangeColName}).orElseGet(${className}::new);
+        ValidationUtil.isNull(${changeClassName}.get${pkCapitalColName}(),"${className}","${pkChangeColName}",${pkChangeColName});
+        return ${changeClassName}Mapper.toDto(${changeClassName});
     }
 
     @Override
+    @CacheEvict(allEntries = true)
     @Transactional(rollbackFor = Exception.class)
     public ${className}DTO create(${className} resources) {
 <#if !auto && pkColumnType = 'Long'>
@@ -90,11 +104,11 @@ public class ${className}ServiceImpl implements ${className}Service {
     }
 
     @Override
+    @CacheEvict(allEntries = true)
     @Transactional(rollbackFor = Exception.class)
     public void update(${className} resources) {
-        Optional<${className}> optional${className} = ${changeClassName}Repository.findById(resources.get${pkCapitalColName}());
-        ValidationUtil.isNull( optional${className},"${className}","id",resources.get${pkCapitalColName}());
-        ${className} ${changeClassName} = optional${className}.get();
+        ${className} ${changeClassName} = ${changeClassName}Repository.findById(resources.get${pkCapitalColName}()).orElseGet(${className}::new);
+        ValidationUtil.isNull( ${changeClassName}.get${pkCapitalColName}(),"${className}","id",resources.get${pkCapitalColName}());
 <#if columns??>
     <#list columns as column>
         <#if column.columnKey = 'UNI'>
@@ -113,8 +127,29 @@ public class ${className}ServiceImpl implements ${className}Service {
     }
 
     @Override
+    @CacheEvict(allEntries = true)
     @Transactional(rollbackFor = Exception.class)
     public void delete(${pkColumnType} ${pkChangeColName}) {
         ${changeClassName}Repository.deleteById(${pkChangeColName});
     }
+
+
+    @Override
+    public void download(List<${className}DTO> all, HttpServletResponse response) throws IOException {
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (${className}DTO ${changeClassName} : all) {
+            Map<String,Object> map = new LinkedHashMap<>();
+        <#list columns as column>
+            <#if column.columnKey != 'PRI'>
+            <#if column.columnComment != ''>
+            map.put("${column.columnComment}", ${changeClassName}.get${column.capitalColumnName}());
+            <#else>
+            map.put(" ${column.changeColumnName}",  ${changeClassName}.get${column.capitalColumnName}());
+            </#if>
+            </#if>
+        </#list>
+            list.add(map);
+        }
+        FileUtil.downloadExcel(list, response);
+    }
 }
\ No newline at end of file