From 8cb7dc886f1b56bb331d9a5225f0c66e90655f3e Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Thu, 24 Oct 2019 21:06:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=AE=9E=E4=BD=93=E5=9F=BA?= =?UTF-8?q?=E7=B1=BB=E3=80=81DTO=E5=9F=BA=E7=B1=BB=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=83=A8=E5=88=86=E5=AE=9E=E4=BD=93=E7=BB=A7=E6=89=BF?= =?UTF-8?q?=E5=9F=BA=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/zhengjie/aspect/LimitAspect.java | 2 +- .../java/me/zhengjie/aspect/LimitType.java | 7 ++- .../main/java/me/zhengjie/base/BaseDTO.java | 21 ++++++++ .../java/me/zhengjie/base/BaseEntity.java | 52 +++++++++++++++++++ .../BaseMapper.java} | 4 +- .../main/java/me/zhengjie/utils/FileUtil.java | 17 +++--- .../java/me/zhengjie/utils/QueryHelp.java | 2 + .../java/me/zhengjie/utils/StringUtils.java | 2 +- .../me/zhengjie/utils/StringUtilsTest.java | 2 +- .../java/me/zhengjie/aspect/LogAspect.java | 4 +- .../service/mapper/LogErrorMapper.java | 4 +- .../service/mapper/LogSmallMapper.java | 4 +- .../modules/quartz/domain/QuartzJob.java | 14 +---- .../zhengjie/modules/system/domain/Dept.java | 17 +++--- .../zhengjie/modules/system/domain/Dict.java | 11 ++-- .../modules/system/domain/DictDetail.java | 11 ++-- .../zhengjie/modules/system/domain/Job.java | 14 +++-- .../zhengjie/modules/system/domain/Menu.java | 9 +--- .../modules/system/domain/Permission.java | 20 +------ .../zhengjie/modules/system/domain/Role.java | 17 +----- .../zhengjie/modules/system/domain/User.java | 25 +-------- .../modules/system/domain/UserAvatar.java | 10 ++-- .../modules/system/service/dto/DeptDTO.java | 14 +++-- .../modules/system/service/dto/DictDTO.java | 10 ++-- .../system/service/dto/DictDetailDTO.java | 10 ++-- .../modules/system/service/dto/JobDTO.java | 12 ++--- .../modules/system/service/dto/MenuDTO.java | 14 +++-- .../system/service/dto/PermissionDTO.java | 25 +++------ .../modules/system/service/dto/RoleDTO.java | 13 +++-- .../modules/system/service/dto/UserDTO.java | 13 +++-- .../system/service/mapper/DeptMapper.java | 4 +- .../service/mapper/DeptSmallMapper.java | 4 +- .../service/mapper/DictDetailMapper.java | 4 +- .../system/service/mapper/DictMapper.java | 4 +- .../system/service/mapper/JobMapper.java | 4 +- .../system/service/mapper/JobSmallMapper.java | 4 +- .../system/service/mapper/MenuMapper.java | 4 +- .../service/mapper/PermissionMapper.java | 4 +- .../system/service/mapper/RoleMapper.java | 4 +- .../service/mapper/RoleSmallMapper.java | 5 +- .../system/service/mapper/UserMapper.java | 6 +-- .../template/generator/admin/Mapper.ftl | 4 +- .../java/me/zhengjie/domain/LocalStorage.java | 27 ++-------- .../zhengjie/service/dto/LocalStorageDTO.java | 19 +++---- .../service/impl/PictureServiceImpl.java | 5 +- .../service/mapper/LocalStorageMapper.java | 4 +- 46 files changed, 230 insertions(+), 256 deletions(-) create mode 100644 eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java create mode 100644 eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java rename eladmin-common/src/main/java/me/zhengjie/{mapper/EntityMapper.java => base/BaseMapper.java} (85%) diff --git a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java b/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java index e4d6fb0d..17e2c469 100644 --- a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java +++ b/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java @@ -44,7 +44,7 @@ public class LimitAspect { String key = limit.key(); if (StringUtils.isEmpty(key)) { if (limitType == LimitType.IP) { - key = StringUtils.getIP(request); + key = StringUtils.getIp(request); } else { key = signatureMethod.getName(); } diff --git a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java b/eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java index 6f383047..1c304eea 100644 --- a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java +++ b/eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java @@ -1,7 +1,12 @@ package me.zhengjie.aspect; +/** + * 限流枚举 + * @author / + */ public enum LimitType { + // 默认 CUSTOMER, -// by ip addr + // by ip addr IP; } diff --git a/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java b/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java new file mode 100644 index 00000000..903904df --- /dev/null +++ b/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java @@ -0,0 +1,21 @@ +package me.zhengjie.base; + +import lombok.Getter; +import lombok.Setter; +import java.io.Serializable; +import java.sql.Timestamp; + +/** + * @author Zheng Jie + * @Date 2019年10月24日20:48:53 + */ +@Getter +@Setter +public class BaseDTO implements Serializable { + + private Boolean isDelete; + + private Timestamp createTime; + + private Timestamp updateTime; +} diff --git a/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java b/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java new file mode 100644 index 00000000..a1fdda06 --- /dev/null +++ b/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java @@ -0,0 +1,52 @@ +package me.zhengjie.base; + +import lombok.*; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; +import javax.persistence.Column; +import javax.persistence.MappedSuperclass; +import java.io.Serializable; +import java.sql.Timestamp; +import java.lang.reflect.Field; + +/** + * @author Zheng Jie + * @Date 2019年10月24日20:46:32 + */ +@Getter +@Setter +@MappedSuperclass +public class BaseEntity implements Serializable { + + // 删除标识 + @Column(name = "is_delete", columnDefinition = "bit default 0") + private Boolean isDelete = false; + + @Column(name = "create_time") + @CreationTimestamp + private Timestamp createTime; + + @Column(name = "update_time") + @UpdateTimestamp + private Timestamp updateTime; + + public @interface New {} + + public @interface Update {} + + @Override + public String toString() { + ToStringBuilder builder = new ToStringBuilder(this); + Field[] fields = this.getClass().getDeclaredFields(); + try { + for (Field f : fields) { + f.setAccessible(true); + builder.append(f.getName(), f.get(this)).append("\n"); + } + } catch (Exception e) { + builder.append("toString builder encounter an error"); + } + return builder.toString(); + } +} diff --git a/eladmin-common/src/main/java/me/zhengjie/mapper/EntityMapper.java b/eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java similarity index 85% rename from eladmin-common/src/main/java/me/zhengjie/mapper/EntityMapper.java rename to eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java index be8696dd..82609e50 100644 --- a/eladmin-common/src/main/java/me/zhengjie/mapper/EntityMapper.java +++ b/eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java @@ -1,4 +1,4 @@ -package me.zhengjie.mapper; +package me.zhengjie.base; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; * @author Zheng Jie * @date 2018-11-23 */ -public interface EntityMapper { +public interface BaseMapper { /** * DTO转Entity diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java index ae526fda..151f0283 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java @@ -145,7 +145,8 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { if (!dest.getParentFile().exists()) { dest.getParentFile().mkdirs(); } - file.transferTo(dest);// 文件写入 + // 文件写入 + file.transferTo(dest); return dest; } catch (Exception e) { e.printStackTrace(); @@ -197,7 +198,9 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { return "音乐"; } else if(video.contains(type)){ return "视频"; - } else return "其他"; + } else { + return "其他"; + } } public static String getFileTypeByMimeType(String type) { @@ -215,8 +218,8 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { * 判断两个文件是否相同 */ public static boolean check(File file1, File file2) { - String img1Md5 = getMD5(file1); - String img2Md5 = getMD5(file2); + String img1Md5 = getMd5(file1); + String img2Md5 = getMd5(file2); return img1Md5.equals(img2Md5); } @@ -244,7 +247,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { return b; } - private static String getMD5(byte[] bytes) { + private static String getMd5(byte[] bytes) { // 16进制字符 char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}; try { @@ -266,8 +269,8 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { return null; } - public static String getMD5(File file) { - return getMD5(getByte(file)); + public static String getMd5(File file) { + return getMd5(getByte(file)); } } diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java index fa668408..7c82dc1e 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java @@ -69,6 +69,7 @@ public class QueryHelp { join = root.join(name, JoinType.RIGHT); } break; + default: break; } } } @@ -105,6 +106,7 @@ public class QueryHelp { list.add(getExpression(attributeName,join,root).in((Collection) val)); } break; + default: break; } } field.setAccessible(accessible); diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java index e5f3c587..d440bcb9 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java @@ -107,7 +107,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** * 获取ip地址 */ - public static String getIP(HttpServletRequest request) { + public static String getIp(HttpServletRequest request) { String ip = request.getHeader("x-forwarded-for"); if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("Proxy-Client-IP"); diff --git a/eladmin-common/src/test/java/me/zhengjie/utils/StringUtilsTest.java b/eladmin-common/src/test/java/me/zhengjie/utils/StringUtilsTest.java index 6811b9cc..12e875a8 100644 --- a/eladmin-common/src/test/java/me/zhengjie/utils/StringUtilsTest.java +++ b/eladmin-common/src/test/java/me/zhengjie/utils/StringUtilsTest.java @@ -38,6 +38,6 @@ public class StringUtilsTest { @Test public void testGetIP() { - assertEquals("127.0.0.1", getIP(new MockHttpServletRequest())); + assertEquals("127.0.0.1", getIp(new MockHttpServletRequest())); } } \ No newline at end of file diff --git a/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java b/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java index ca2ad5b6..989a74c6 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java +++ b/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java @@ -52,7 +52,7 @@ public class LogAspect { currentTime = System.currentTimeMillis(); result = joinPoint.proceed(); Log log = new Log("INFO",System.currentTimeMillis() - currentTime); - logService.save(getUsername(), StringUtils.getIP(RequestHolder.getHttpServletRequest()),joinPoint, log); + logService.save(getUsername(), StringUtils.getIp(RequestHolder.getHttpServletRequest()),joinPoint, log); return result; } @@ -66,7 +66,7 @@ public class LogAspect { public void logAfterThrowing(JoinPoint joinPoint, Throwable e) { Log log = new Log("ERROR",System.currentTimeMillis() - currentTime); log.setExceptionDetail(ThrowableUtil.getStackTrace(e).getBytes()); - logService.save(getUsername(), StringUtils.getIP(RequestHolder.getHttpServletRequest()), (ProceedingJoinPoint)joinPoint, log); + logService.save(getUsername(), StringUtils.getIp(RequestHolder.getHttpServletRequest()), (ProceedingJoinPoint)joinPoint, log); } public String getUsername() { diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogErrorMapper.java b/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogErrorMapper.java index f4ca6170..8e033ac1 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogErrorMapper.java +++ b/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogErrorMapper.java @@ -1,7 +1,7 @@ package me.zhengjie.service.mapper; +import me.zhengjie.base.BaseMapper; import me.zhengjie.domain.Log; -import me.zhengjie.mapper.EntityMapper; import me.zhengjie.service.dto.LogErrorDTO; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-5-22 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface LogErrorMapper extends EntityMapper { +public interface LogErrorMapper extends BaseMapper { } \ No newline at end of file diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogSmallMapper.java b/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogSmallMapper.java index 4d5d200f..630be522 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogSmallMapper.java +++ b/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogSmallMapper.java @@ -1,7 +1,7 @@ package me.zhengjie.service.mapper; +import me.zhengjie.base.BaseMapper; import me.zhengjie.domain.Log; -import me.zhengjie.mapper.EntityMapper; import me.zhengjie.service.dto.LogSmallDTO; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-5-22 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface LogSmallMapper extends EntityMapper { +public interface LogSmallMapper extends BaseMapper { } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java index faa62c2e..56216a1e 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java @@ -1,13 +1,10 @@ package me.zhengjie.modules.quartz.domain; import lombok.Data; -import org.hibernate.annotations.UpdateTimestamp; - +import me.zhengjie.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.sql.Timestamp; /** * @author Zheng Jie @@ -16,7 +13,7 @@ import java.sql.Timestamp; @Data @Entity @Table(name = "quartz_job") -public class QuartzJob implements Serializable { +public class QuartzJob extends BaseEntity { public static final String JOB_KEY = "JOB_KEY"; @@ -56,11 +53,4 @@ public class QuartzJob implements Serializable { @Column(name = "remark") @NotBlank private String remark; - - // 创建日期 - @UpdateTimestamp - @Column(name = "update_time") - private Timestamp updateTime; - - public interface Update{} } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java index 36dd1863..1b392aa8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java @@ -2,12 +2,12 @@ package me.zhengjie.modules.system.domain; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; -import org.hibernate.annotations.CreationTimestamp; +import lombok.Getter; +import lombok.Setter; +import me.zhengjie.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.sql.Timestamp; -import java.io.Serializable; import java.util.Set; /** @@ -15,9 +15,10 @@ import java.util.Set; * @date 2019-03-25 */ @Entity -@Data +@Getter +@Setter @Table(name="dept") -public class Dept implements Serializable { +public class Dept extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -39,10 +40,4 @@ public class Dept implements Serializable { @JsonIgnore @ManyToMany(mappedBy = "depts") private Set roles; - - @Column(name = "create_time") - @CreationTimestamp - private Timestamp createTime; - - public @interface Update {} } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java index 033681af..d9c6ca1d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java @@ -1,6 +1,10 @@ package me.zhengjie.modules.system.domain; import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import me.zhengjie.base.BaseEntity; + import javax.persistence.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -12,9 +16,10 @@ import java.util.List; * @date 2019-04-10 */ @Entity -@Data +@Getter +@Setter @Table(name="dict") -public class Dict implements Serializable { +public class Dict extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -31,6 +36,4 @@ public class Dict implements Serializable { @OneToMany(mappedBy = "dict",cascade={CascadeType.PERSIST,CascadeType.REMOVE}) private List dictDetails; - - public @interface Update {} } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java index d6c7b3be..48e52c00 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java @@ -1,6 +1,10 @@ package me.zhengjie.modules.system.domain; import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import me.zhengjie.base.BaseEntity; + import javax.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -10,9 +14,10 @@ import java.io.Serializable; * @date 2019-04-10 */ @Entity -@Data +@Getter +@Setter @Table(name="dict_detail") -public class DictDetail implements Serializable { +public class DictDetail extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -36,6 +41,4 @@ public class DictDetail implements Serializable { @ManyToOne(fetch=FetchType.LAZY) @JoinColumn(name = "dict_id") private Dict dict; - - public @interface Update {} } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java index 940e1df6..e6f6b82c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java @@ -1,6 +1,9 @@ package me.zhengjie.modules.system.domain; import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import me.zhengjie.base.BaseEntity; import org.hibernate.annotations.*; import javax.persistence.*; import javax.persistence.Entity; @@ -15,9 +18,10 @@ import java.io.Serializable; * @date 2019-03-29 */ @Entity -@Data +@Getter +@Setter @Table(name="job") -public class Job implements Serializable { +public class Job extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -40,10 +44,4 @@ public class Job implements Serializable { @OneToOne @JoinColumn(name = "dept_id") private Dept dept; - - @Column(name = "create_time") - @CreationTimestamp - private Timestamp createTime; - - public @interface Update {} } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java index addf5b16..20ab89ca 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java @@ -3,6 +3,7 @@ package me.zhengjie.modules.system.domain; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; import lombok.Setter; +import me.zhengjie.base.BaseEntity; import org.hibernate.annotations.CreationTimestamp; import javax.persistence.*; import javax.validation.constraints.NotBlank; @@ -20,7 +21,7 @@ import java.util.Set; @Getter @Setter @Table(name = "menu") -public class Menu implements Serializable { +public class Menu extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -63,12 +64,6 @@ public class Menu implements Serializable { @JsonIgnore private Set roles; - @CreationTimestamp - @Column(name = "create_time") - private Timestamp createTime; - - public interface Update{} - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Permission.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Permission.java index 1d97b55c..d0305a4d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Permission.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Permission.java @@ -3,6 +3,7 @@ package me.zhengjie.modules.system.domain; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; import lombok.Setter; +import me.zhengjie.base.BaseEntity; import org.hibernate.annotations.CreationTimestamp; import javax.persistence.*; import javax.validation.constraints.NotBlank; @@ -19,7 +20,7 @@ import java.util.Set; @Getter @Setter @Table(name = "permission") -public class Permission implements Serializable{ +public class Permission extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -40,21 +41,4 @@ public class Permission implements Serializable{ @JsonIgnore @ManyToMany(mappedBy = "permissions") private Set roles; - - @CreationTimestamp - @Column(name = "create_time") - private Timestamp createTime; - - @Override - public String toString() { - return "Permission{" + - "id=" + id + - ", name='" + name + '\'' + - ", pid=" + pid + - ", alias='" + alias + '\'' + - ", createTime=" + createTime + - '}'; - } - - public interface Update{} } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java index c44c97fb..39e93114 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java @@ -3,6 +3,7 @@ package me.zhengjie.modules.system.domain; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; import lombok.Setter; +import me.zhengjie.base.BaseEntity; import org.hibernate.annotations.CreationTimestamp; import javax.persistence.*; import javax.validation.constraints.NotBlank; @@ -21,7 +22,7 @@ import java.util.Set; @Table(name = "role") @Getter @Setter -public class Role implements Serializable { +public class Role extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -59,20 +60,6 @@ public class Role implements Serializable { @JoinTable(name = "roles_depts", joinColumns = {@JoinColumn(name = "role_id",referencedColumnName = "id")}, inverseJoinColumns = {@JoinColumn(name = "dept_id",referencedColumnName = "id")}) private Set depts; - @CreationTimestamp - @Column(name = "create_time") - private Timestamp createTime; - - @Override - public String toString() { - return "Role{" + - "id=" + id + - ", name='" + name + '\'' + - ", remark='" + remark + '\'' + - ", createDateTime=" + createTime + - '}'; - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java index 0bb62850..9eef82dd 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java @@ -2,13 +2,11 @@ package me.zhengjie.modules.system.domain; import lombok.Getter; import lombok.Setter; -import org.hibernate.annotations.CreationTimestamp; +import me.zhengjie.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; -import java.io.Serializable; -import java.sql.Timestamp; import java.util.Date; import java.util.Set; @@ -20,7 +18,7 @@ import java.util.Set; @Getter @Setter @Table(name="user") -public class User implements Serializable { +public class User extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -47,10 +45,6 @@ public class User implements Serializable { private String password; - @CreationTimestamp - @Column(name = "create_time") - private Timestamp createTime; - @Column(name = "last_password_reset_time") private Date lastPasswordResetTime; @@ -65,19 +59,4 @@ public class User implements Serializable { @OneToOne @JoinColumn(name = "dept_id") private Dept dept; - - @Override - public String toString() { - return "User{" + - "id=" + id + - ", username='" + username + '\'' + - ", email='" + email + '\'' + - ", enabled=" + enabled + - ", password='" + password + '\'' + - ", createTime=" + createTime + - ", lastPasswordResetTime=" + lastPasswordResetTime + - '}'; - } - - public @interface Update {} } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/UserAvatar.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/UserAvatar.java index bba30dc2..f7470d10 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/UserAvatar.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/UserAvatar.java @@ -2,7 +2,10 @@ package me.zhengjie.modules.system.domain; import cn.hutool.core.util.ObjectUtil; import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; +import me.zhengjie.base.BaseEntity; import javax.persistence.*; import java.sql.Timestamp; @@ -12,10 +15,11 @@ import java.sql.Timestamp; * @date 2019年9月7日 16:16:59 */ @Entity -@Table(name = "user_avatar") -@Data +@Getter +@Setter @NoArgsConstructor -public class UserAvatar { +@Table(name = "user_avatar") +public class UserAvatar extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDTO.java index 23f151e1..3001b827 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDTO.java @@ -1,19 +1,19 @@ package me.zhengjie.modules.system.service.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; - +import lombok.Getter; +import lombok.Setter; +import me.zhengjie.base.BaseDTO; import javax.validation.constraints.NotNull; -import java.sql.Timestamp; -import java.io.Serializable; import java.util.List; /** * @author Zheng Jie * @date 2019-03-25 */ -@Data -public class DeptDTO implements Serializable { +@Getter +@Setter +public class DeptDTO extends BaseDTO { // ID private Long id; @@ -30,8 +30,6 @@ public class DeptDTO implements Serializable { @JsonInclude(JsonInclude.Include.NON_EMPTY) private List children; - private Timestamp createTime; - public String getLabel() { return name; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDTO.java index e05ff4e8..3b011e23 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDTO.java @@ -1,14 +1,16 @@ package me.zhengjie.modules.system.service.dto; -import lombok.Data; -import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +import me.zhengjie.base.BaseDTO; /** * @author Zheng Jie * @date 2019-04-10 */ -@Data -public class DictDTO implements Serializable { +@Getter +@Setter +public class DictDTO extends BaseDTO { private Long id; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDTO.java index 71add096..f513ebe2 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDTO.java @@ -1,14 +1,16 @@ package me.zhengjie.modules.system.service.dto; -import lombok.Data; -import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +import me.zhengjie.base.BaseDTO; /** * @author Zheng Jie * @date 2019-04-10 */ -@Data -public class DictDetailDTO implements Serializable { +@Getter +@Setter +public class DictDetailDTO extends BaseDTO { private Long id; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDTO.java index c9c1259f..08e59c69 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDTO.java @@ -1,20 +1,18 @@ package me.zhengjie.modules.system.service.dto; -import lombok.Data; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; - -import java.sql.Timestamp; -import java.io.Serializable; +import me.zhengjie.base.BaseDTO; /** * @author Zheng Jie * @date 2019-03-29 */ -@Data +@Getter +@Setter @NoArgsConstructor -public class JobDTO implements Serializable { +public class JobDTO extends BaseDTO { private Long id; @@ -28,8 +26,6 @@ public class JobDTO implements Serializable { private String deptSuperiorName; - private Timestamp createTime; - public JobDTO(String name, Boolean enabled) { this.name = name; this.enabled = enabled; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java index 3b9aaae6..c0896ff9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java @@ -1,17 +1,17 @@ package me.zhengjie.modules.system.service.dto; -import lombok.Data; - -import java.sql.Timestamp; +import lombok.Getter; +import lombok.Setter; +import me.zhengjie.base.BaseDTO; import java.util.List; -import java.util.Set; /** * @author Zheng Jie * @date 2018-12-17 */ -@Data -public class MenuDTO { +@Getter +@Setter +public class MenuDTO extends BaseDTO { private Long id; @@ -36,6 +36,4 @@ public class MenuDTO { private String icon; private List children; - - private Timestamp createTime; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionDTO.java index 3ae4eb6a..e4589e67 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionDTO.java @@ -1,17 +1,17 @@ package me.zhengjie.modules.system.service.dto; -import lombok.Data; - -import java.io.Serializable; -import java.sql.Timestamp; +import lombok.Getter; +import lombok.Setter; +import me.zhengjie.base.BaseDTO; import java.util.List; /** * @author Zheng Jie * @date 2018-12-03 */ -@Data -public class PermissionDTO implements Serializable{ +@Getter +@Setter +public class PermissionDTO extends BaseDTO { private Long id; @@ -21,18 +21,5 @@ public class PermissionDTO implements Serializable{ private String alias; - private Timestamp createTime; - private List children; - - @Override - public String toString() { - return "Permission{" + - "id=" + id + - ", name='" + name + '\'' + - ", pid=" + pid + - ", alias='" + alias + '\'' + - ", createTime=" + createTime + - '}'; - } } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDTO.java index c6d68073..4d8ab7a1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDTO.java @@ -1,16 +1,17 @@ package me.zhengjie.modules.system.service.dto; -import lombok.Data; -import java.io.Serializable; -import java.sql.Timestamp; +import lombok.Getter; +import lombok.Setter; +import me.zhengjie.base.BaseDTO; import java.util.Set; /** * @author Zheng Jie * @date 2018-11-23 */ -@Data -public class RoleDTO implements Serializable { +@Getter +@Setter +public class RoleDTO extends BaseDTO { private Long id; @@ -27,6 +28,4 @@ public class RoleDTO implements Serializable { private Set menus; private Set depts; - - private Timestamp createTime; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDTO.java index 3065471b..848c1789 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDTO.java @@ -2,9 +2,9 @@ package me.zhengjie.modules.system.service.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import java.io.Serializable; -import java.sql.Timestamp; +import lombok.Getter; +import lombok.Setter; +import me.zhengjie.base.BaseDTO; import java.util.Date; import java.util.Set; @@ -12,8 +12,9 @@ import java.util.Set; * @author Zheng Jie * @date 2018-11-23 */ -@Data -public class UserDTO implements Serializable { +@Getter +@Setter +public class UserDTO extends BaseDTO { @ApiModelProperty(hidden = true) private Long id; @@ -31,8 +32,6 @@ public class UserDTO implements Serializable { @JsonIgnore private String password; - private Timestamp createTime; - private Date lastPasswordResetTime; @ApiModelProperty(hidden = true) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java index 75eadbf5..ba3be01d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java @@ -1,6 +1,6 @@ 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; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-03-25 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface DeptMapper extends EntityMapper { +public interface DeptMapper extends BaseMapper { } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java index ede9aad3..c964081d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java @@ -1,6 +1,6 @@ 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; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-03-25 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface DeptSmallMapper extends EntityMapper { +public interface DeptSmallMapper extends BaseMapper { } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java index 7f483190..f82c1bd5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java @@ -1,6 +1,6 @@ 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; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-04-10 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface DictDetailMapper extends EntityMapper { +public interface DictDetailMapper extends BaseMapper { } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java index ab5a4bd3..c5b70a25 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java @@ -1,6 +1,6 @@ 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; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-04-10 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface DictMapper extends EntityMapper { +public interface DictMapper extends BaseMapper { } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java index b4d2b347..59565dfa 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java @@ -1,6 +1,6 @@ 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 { +public interface JobMapper extends BaseMapper { @Mapping(source = "deptSuperiorName", target = "deptSuperiorName") JobDTO toDto(Job job, String deptSuperiorName); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java index 425cb4a0..96282b2c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java @@ -1,6 +1,6 @@ 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; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-03-29 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface JobSmallMapper extends EntityMapper { +public interface JobSmallMapper extends BaseMapper { } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java index 8cdaf63b..6887537f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java @@ -1,7 +1,7 @@ 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; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2018-12-17 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface MenuMapper extends EntityMapper { +public interface MenuMapper extends BaseMapper { } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/PermissionMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/PermissionMapper.java index f86c9d4c..6d8f32f2 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/PermissionMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/PermissionMapper.java @@ -1,7 +1,7 @@ package me.zhengjie.modules.system.service.mapper; import me.zhengjie.modules.system.domain.Permission; -import me.zhengjie.mapper.EntityMapper; +import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.service.dto.PermissionDTO; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2018-11-23 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface PermissionMapper extends EntityMapper { +public interface PermissionMapper extends BaseMapper { } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java index 9acaf31b..248b1ed0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java @@ -1,7 +1,7 @@ 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; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2018-11-23 */ @Mapper(componentModel = "spring", uses = {PermissionMapper.class, MenuMapper.class, DeptMapper.class}, unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface RoleMapper extends EntityMapper { +public interface RoleMapper extends BaseMapper { } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java index 53d97ccb..ae23cdd3 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java @@ -1,8 +1,7 @@ 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; @@ -12,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-5-23 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface RoleSmallMapper extends EntityMapper { +public interface RoleSmallMapper extends BaseMapper { } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java index 248003a3..13654868 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java @@ -1,20 +1,18 @@ 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 { +public interface UserMapper extends BaseMapper { @Mapping(source = "user.userAvatar.realName",target = "avatar") UserDTO toDto(User user); diff --git a/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl b/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl index bf4f3e90..0b207a7b 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl @@ -1,6 +1,6 @@ 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 diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java b/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java index 2072c68a..cbe37c00 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java @@ -1,29 +1,22 @@ 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; diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java index 7ad11cb1..d05b81b3 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java @@ -1,17 +1,16 @@ 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 diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java index f6b56c30..2c3f42d5 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java +++ b/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 diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java b/eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java index 45175f5f..cc013849 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java @@ -1,6 +1,6 @@ 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 { +public interface LocalStorageMapper extends BaseMapper { } \ No newline at end of file