加入实体基类、DTO基类、修改部分实体继承基类

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/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;
@@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy;
 * @date ${date}
 */
 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface ${className}Mapper extends EntityMapper<${className}DTO, ${className}> {
+public interface ${className}Mapper extends BaseMapper<${className}DTO, ${className}> {
 
 }
\ No newline at end of file

eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java

 package me.zhengjie.domain;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
+import lombok.*;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.CreationTimestamp;
-import org.hibernate.annotations.UpdateTimestamp;
-
+import me.zhengjie.base.BaseEntity;
 import javax.persistence.*;
-import java.sql.Timestamp;
-import java.io.Serializable;
 
 /**
 * @author Zheng Jie
 * @date 2019-09-05
 */
+@Getter
+@Setter
 @Entity
-@Data
 @Table(name="local_storage")
-@AllArgsConstructor
 @NoArgsConstructor
-public class LocalStorage implements Serializable {
+public class LocalStorage extends BaseEntity {
 
-    // ID
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
@@ -57,16 +50,6 @@ public class LocalStorage implements Serializable {
     @Column(name = "operate")
     private String operate;
 
-    // 创建日期
-    @Column(name = "create_time")
-    @CreationTimestamp
-    private Timestamp createTime;
-
-    // 修改日期
-    @Column(name = "update_time")
-    @UpdateTimestamp
-    private Timestamp updateTime;
-
     public LocalStorage(String realName,String name, String suffix, String path, String type, String size, String operate) {
         this.realName = realName;
         this.name = name;

eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java

 package me.zhengjie.service.dto;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import java.sql.Timestamp;
-import java.io.Serializable;
-
+import lombok.Getter;
+import lombok.Setter;
+import me.zhengjie.base.BaseDTO;
 
 /**
 * @author Zheng Jie
 * @date 2019-09-05
 */
-@Data
-public class LocalStorageDTO implements Serializable {
+@Getter
+@Setter
+public class LocalStorageDTO extends BaseDTO {
 
     // ID
     private Long id;
@@ -32,10 +31,4 @@ public class LocalStorageDTO implements Serializable {
 
     // 操作人
     private String operate;
-
-    // 创建日期
-    private Timestamp createTime;
-
-    // 修改日期
-    private Timestamp updateTime;
 }
\ No newline at end of file

eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java

@@ -56,7 +56,7 @@ public class PictureServiceImpl implements PictureService {
     public Picture upload(MultipartFile multipartFile, String username) {
         File file = FileUtil.toFile(multipartFile);
         // 验证是否重复上传
-        Picture picture = pictureRepository.findByMd5Code(FileUtil.getMD5(file));
+        Picture picture = pictureRepository.findByMd5Code(FileUtil.getMd5(file));
         if(picture != null){
            return picture;
         }
@@ -70,7 +70,7 @@ public class PictureServiceImpl implements PictureService {
         picture = JSON.parseObject(jsonObject.get("data").toString(), Picture.class);
         picture.setSize(FileUtil.getSize(Integer.parseInt(picture.getSize())));
         picture.setUsername(username);
-        picture.setMd5Code(FileUtil.getMD5(file));
+        picture.setMd5Code(FileUtil.getMd5(file));
         picture.setFilename(FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename())+"."+FileUtil.getExtensionName(multipartFile.getOriginalFilename()));
         pictureRepository.save(picture);
         //删除临时文件
@@ -97,7 +97,6 @@ public class PictureServiceImpl implements PictureService {
         } catch(Exception e){
             pictureRepository.delete(picture);
         }
-
     }
 
     @Override

eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java

 package me.zhengjie.service.mapper;
 
-import me.zhengjie.mapper.EntityMapper;
+import me.zhengjie.base.BaseMapper;
 import me.zhengjie.domain.LocalStorage;
 import me.zhengjie.service.dto.LocalStorageDTO;
 import org.mapstruct.Mapper;
@@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy;
 * @date 2019-09-05
 */
 @Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface LocalStorageMapper extends EntityMapper<LocalStorageDTO, LocalStorage> {
+public interface LocalStorageMapper extends BaseMapper<LocalStorageDTO, LocalStorage> {
 
 }
\ No newline at end of file