Skip to content
GitLab
Commit 8cb7dc88 authored by dqjdda's avatar dqjdda
Browse files

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

parent bf7c1eeb
Hide whitespace changes
Inline Side-by-side
eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java
View file @ 8cb7dc88
......@@ -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
eladmin-system/src/main/java/me/zhengjie/modules/system/domain/UserAvatar.java
View file @ 8cb7dc88
......@@ -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)
......
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDTO.java
View file @ 8cb7dc88
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<DeptDTO> children;
private Timestamp createTime;
public String getLabel() {
return name;
}
......
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDTO.java
View file @ 8cb7dc88
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;
......
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDTO.java
View file @ 8cb7dc88
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;
......
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDTO.java
View file @ 8cb7dc88
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;
......
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java
View file @ 8cb7dc88
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<MenuDTO> children;
private Timestamp createTime;
}
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionDTO.java
View file @ 8cb7dc88
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<PermissionDTO> children;
@Override
public String toString() {
return "Permission{" +
"id=" + id +
", name='" + name + '\'' +
", pid=" + pid +
", alias='" + alias + '\'' +
", createTime=" + createTime +
'}';
}
}
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDTO.java
View file @ 8cb7dc88
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<MenuDTO> menus;
private Set<DeptDTO> depts;
private Timestamp createTime;
}
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDTO.java
View file @ 8cb7dc88
......@@ -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)
......
eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java
View file @ 8cb7dc88
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<DeptDTO, Dept> {
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
View file @ 8cb7dc88
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<DeptSmallDTO, Dept> {
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
View file @ 8cb7dc88
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<DictDetailDTO, DictDetail> {
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
View file @ 8cb7dc88
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<DictDTO, Dict> {
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
View file @ 8cb7dc88
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
View file @ 8cb7dc88
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<JobSmallDTO, Job> {
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
View file @ 8cb7dc88
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<MenuDTO, Menu> {
public interface MenuMapper extends BaseMapper<MenuDTO, Menu> {
}
eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/PermissionMapper.java
View file @ 8cb7dc88
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<PermissionDTO, Permission> {
public interface PermissionMapper extends BaseMapper<PermissionDTO, Permission> {
}
eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java
View file @ 8cb7dc88
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<RoleDTO, Role> {
public interface RoleMapper extends BaseMapper<RoleDTO, Role> {
}
eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java
View file @ 8cb7dc88
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<RoleSmallDTO, Role> {
public interface RoleSmallMapper extends BaseMapper<RoleSmallDTO, Role> {
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment