代码优化，更新sql文件

eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java

@@ -2,10 +2,11 @@ package me.zhengjie.modules.quartz.domain;
 
 import lombok.Getter;
 import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import org.hibernate.annotations.CreationTimestamp;
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.sql.Timestamp;
 
 /**
  * @author Zheng Jie
@@ -15,7 +16,7 @@ import javax.validation.constraints.NotNull;
 @Setter
 @Entity
 @Table(name = "quartz_job")
-public class QuartzJob extends BaseEntity {
+public class QuartzJob{
 
     public static final String JOB_KEY = "JOB_KEY";
 
@@ -55,4 +56,10 @@ public class QuartzJob extends BaseEntity {
     @Column(name = "remark")
     @NotBlank
     private String remark;
+
+    @Column(name = "create_time")
+    @CreationTimestamp
+    private Timestamp createTime;
+
+    public @interface Update {}
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java

@@ -3,10 +3,11 @@ 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;
 import javax.validation.constraints.NotNull;
+import java.sql.Timestamp;
 import java.util.Set;
 
 /**
@@ -17,7 +18,7 @@ import java.util.Set;
 @Getter
 @Setter
 @Table(name="dept")
-public class Dept extends BaseEntity {
+public class Dept {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -39,4 +40,10 @@ public class Dept extends BaseEntity {
     @JsonIgnore
     @ManyToMany(mappedBy = "depts")
     private Set<Role> roles;
+
+    @Column(name = "create_time")
+    @CreationTimestamp
+    private Timestamp createTime;
+
+    public @interface Update {}
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java

@@ -3,9 +3,11 @@ package me.zhengjie.modules.system.domain;
 import lombok.Getter;
 import lombok.Setter;
 import me.zhengjie.base.BaseEntity;
+import org.hibernate.annotations.CreationTimestamp;
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.sql.Timestamp;
 import java.util.List;
 
 /**
@@ -16,7 +18,7 @@ import java.util.List;
 @Getter
 @Setter
 @Table(name="dict")
-public class Dict  extends BaseEntity {
+public class Dict{
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -31,6 +33,12 @@ public class Dict  extends BaseEntity {
     @Column(name = "remark")
     private String remark;
 
+    @Column(name = "create_time")
+    @CreationTimestamp
+    private Timestamp createTime;
+
     @OneToMany(mappedBy = "dict",cascade={CascadeType.PERSIST,CascadeType.REMOVE})
     private List<DictDetail> dictDetails;
+
+    public @interface Update {}
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java

@@ -2,9 +2,10 @@ package me.zhengjie.modules.system.domain;
 
 import lombok.Getter;
 import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import org.hibernate.annotations.CreationTimestamp;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
+import java.sql.Timestamp;
 
 /**
 * @author Zheng Jie
@@ -14,7 +15,7 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 @Table(name="dict_detail")
-public class DictDetail  extends BaseEntity {
+public class DictDetail {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -38,4 +39,10 @@ public class DictDetail  extends BaseEntity {
     @ManyToOne(fetch=FetchType.LAZY)
     @JoinColumn(name = "dict_id")
     private Dict dict;
+
+    @Column(name = "create_time")
+    @CreationTimestamp
+    private Timestamp createTime;
+
+    public @interface Update {}
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java

@@ -2,12 +2,13 @@ package me.zhengjie.modules.system.domain;
 
 import lombok.Getter;
 import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import org.hibernate.annotations.CreationTimestamp;
 import javax.persistence.*;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.sql.Timestamp;
 
 /**
 * @author Zheng Jie
@@ -17,7 +18,7 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 @Table(name="job")
-public class Job  extends BaseEntity {
+public class Job {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -40,4 +41,10 @@ public class Job  extends BaseEntity {
     @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

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java

@@ -3,10 +3,11 @@ 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;
 import javax.validation.constraints.NotNull;
+import java.sql.Timestamp;
 import java.util.Objects;
 import java.util.Set;
 
@@ -18,7 +19,7 @@ import java.util.Set;
 @Getter
 @Setter
 @Table(name = "menu")
-public class Menu  extends BaseEntity {
+public class Menu{
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -61,6 +62,12 @@ public class Menu  extends BaseEntity {
     @JsonIgnore
     private Set<Role> roles;
 
+    @Column(name = "create_time")
+    @CreationTimestamp
+    private Timestamp createTime;
+
+    public @interface Update {}
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Permission.java

@@ -3,10 +3,11 @@ 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;
 import javax.validation.constraints.NotNull;
+import java.sql.Timestamp;
 import java.util.Set;
 
 /**
@@ -17,7 +18,7 @@ import java.util.Set;
 @Getter
 @Setter
 @Table(name = "permission")
-public class Permission  extends BaseEntity {
+public class Permission{
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -35,7 +36,13 @@ public class Permission  extends BaseEntity {
 	@NotBlank
 	private String alias;
 
+	@Column(name = "create_time")
+	@CreationTimestamp
+	private Timestamp createTime;
+
 	@JsonIgnore
 	@ManyToMany(mappedBy = "permissions")
 	private Set<Role> roles;
+
+	public @interface Update {}
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java

@@ -3,10 +3,11 @@ 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;
 import javax.validation.constraints.NotNull;
+import java.sql.Timestamp;
 import java.util.Objects;
 import java.util.Set;
 
@@ -19,7 +20,7 @@ import java.util.Set;
 @Table(name = "role")
 @Getter
 @Setter
-public class Role  extends BaseEntity {
+public class Role{
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -57,6 +58,12 @@ public class Role  extends BaseEntity {
     @JoinTable(name = "roles_depts", joinColumns = {@JoinColumn(name = "role_id",referencedColumnName = "id")}, inverseJoinColumns = {@JoinColumn(name = "dept_id",referencedColumnName = "id")})
     private Set<Dept> depts;
 
+    @Column(name = "create_time")
+    @CreationTimestamp
+    private Timestamp createTime;
+
+    public @interface Update {}
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -69,6 +76,4 @@ public class Role  extends BaseEntity {
     public int hashCode() {
         return Objects.hash(id);
     }
-
-    public interface Update{}
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java

@@ -2,11 +2,12 @@ package me.zhengjie.modules.system.domain;
 
 import lombok.Getter;
 import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import org.hibernate.annotations.CreationTimestamp;
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+import java.sql.Timestamp;
 import java.util.Date;
 import java.util.Set;
 
@@ -18,7 +19,7 @@ import java.util.Set;
 @Getter
 @Setter
 @Table(name="user")
-public class User  extends BaseEntity {
+public class User{
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -45,6 +46,10 @@ public class User  extends BaseEntity {
 
     private String password;
 
+    @Column(name = "create_time")
+    @CreationTimestamp
+    private Timestamp createTime;
+
     @Column(name = "last_password_reset_time")
     private Date lastPasswordResetTime;
 
@@ -59,4 +64,6 @@ public class User  extends BaseEntity {
     @OneToOne
     @JoinColumn(name = "dept_id")
     private Dept dept;
+
+    public @interface Update {}
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/UserAvatar.java

@@ -5,7 +5,10 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import me.zhengjie.base.BaseEntity;
+import org.hibernate.annotations.CreationTimestamp;
+
 import javax.persistence.*;
+import java.sql.Timestamp;
 
 /**
  * @author Zheng Jie
@@ -16,7 +19,7 @@ import javax.persistence.*;
 @Setter
 @NoArgsConstructor
 @Table(name = "user_avatar")
-public class UserAvatar  extends BaseEntity {
+public class UserAvatar {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -28,6 +31,10 @@ public class UserAvatar  extends BaseEntity {
 
     private String size;
 
+    @Column(name = "create_time")
+    @CreationTimestamp
+    private Timestamp createTime;
+
     public UserAvatar(UserAvatar userAvatar,String realName, String path, String size) {
         this.id = ObjectUtil.isNotEmpty(userAvatar) ? userAvatar.getId() : null;
         this.realName = realName;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDTO.java

@@ -3,8 +3,8 @@ package me.zhengjie.modules.system.service.dto;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
 import lombok.Setter;
-import me.zhengjie.base.BaseDTO;
 import javax.validation.constraints.NotNull;
+import java.sql.Timestamp;
 import java.util.List;
 
 /**
@@ -13,7 +13,7 @@ import java.util.List;
 */
 @Getter
 @Setter
-public class DeptDTO extends BaseDTO {
+public class DeptDTO{
 
     // ID
     private Long id;
@@ -30,6 +30,8 @@ public class DeptDTO extends BaseDTO {
     @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

@@ -2,7 +2,8 @@ package me.zhengjie.modules.system.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;
-import me.zhengjie.base.BaseDTO;
+
+import java.sql.Timestamp;
 
 /**
 * @author Zheng Jie
@@ -10,11 +11,13 @@ import me.zhengjie.base.BaseDTO;
 */
 @Getter
 @Setter
-public class DictDTO extends BaseDTO {
+public class DictDTO{
 
     private Long id;
 
     private String name;
 
     private String remark;
+
+    private Timestamp createTime;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDTO.java

@@ -2,7 +2,8 @@ package me.zhengjie.modules.system.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;
-import me.zhengjie.base.BaseDTO;
+
+import java.sql.Timestamp;
 
 /**
 * @author Zheng Jie
@@ -10,7 +11,7 @@ import me.zhengjie.base.BaseDTO;
 */
 @Getter
 @Setter
-public class DictDetailDTO  extends BaseDTO {
+public class DictDetailDTO{
 
     private Long id;
 
@@ -19,4 +20,6 @@ public class DictDetailDTO  extends BaseDTO {
     private String value;
 
     private String sort;
+
+    private Timestamp createTime;
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDTO.java

@@ -3,7 +3,7 @@ package me.zhengjie.modules.system.service.dto;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import me.zhengjie.base.BaseDTO;
+import java.sql.Timestamp;
 
 /**
 * @author Zheng Jie
@@ -12,7 +12,7 @@ import me.zhengjie.base.BaseDTO;
 @Getter
 @Setter
 @NoArgsConstructor
-public class JobDTO  extends BaseDTO {
+public class JobDTO{
 
     private Long id;
 
@@ -26,6 +26,8 @@ public class JobDTO  extends BaseDTO {
 
     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

@@ -2,7 +2,8 @@ package me.zhengjie.modules.system.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;
-import me.zhengjie.base.BaseDTO;
+
+import java.sql.Timestamp;
 import java.util.List;
 
 /**
@@ -11,7 +12,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class MenuDTO  extends BaseDTO {
+public class MenuDTO{
 
     private Long id;
 
@@ -36,4 +37,6 @@ public class MenuDTO  extends BaseDTO {
     private String icon;
 
     private List<MenuDTO> children;
+
+    private Timestamp createTime;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionDTO.java

@@ -2,7 +2,8 @@ package me.zhengjie.modules.system.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;
-import me.zhengjie.base.BaseDTO;
+
+import java.sql.Timestamp;
 import java.util.List;
 
 /**
@@ -11,7 +12,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class PermissionDTO  extends BaseDTO {
+public class PermissionDTO{
 
 	private Long id;
 
@@ -22,4 +23,6 @@ public class PermissionDTO  extends BaseDTO {
 	private String alias;
 
 	private List<PermissionDTO>  children;
+
+	private Timestamp createTime;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDTO.java

@@ -2,7 +2,8 @@ package me.zhengjie.modules.system.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;
-import me.zhengjie.base.BaseDTO;
+
+import java.sql.Timestamp;
 import java.util.Set;
 
 /**
@@ -11,7 +12,7 @@ import java.util.Set;
  */
 @Getter
 @Setter
-public class RoleDTO  extends BaseDTO {
+public class RoleDTO{
 
     private Long id;
 
@@ -28,4 +29,6 @@ public class RoleDTO  extends BaseDTO {
     private Set<MenuDTO> menus;
 
     private Set<DeptDTO> depts;
+
+    private Timestamp createTime;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDTO.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import me.zhengjie.base.BaseDTO;
+import java.sql.Timestamp;
 import java.util.Date;
 import java.util.Set;
 
@@ -14,7 +14,7 @@ import java.util.Set;
  */
 @Getter
 @Setter
-public class UserDTO extends BaseDTO {
+public class UserDTO {
 
     @ApiModelProperty(hidden = true)
     private Long id;
@@ -43,4 +43,6 @@ public class UserDTO extends BaseDTO {
     private DeptSmallDTO dept;
 
     private Long deptId;
+
+    private Timestamp createTime;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java

@@ -20,6 +20,7 @@ import me.zhengjie.utils.ValidationUtil;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,7 +47,8 @@ public class MenuServiceImpl implements MenuService {
     @Override
     @Cacheable
     public List<MenuDTO> queryAll(MenuQueryCriteria criteria){
-        return menuMapper.toDto(menuRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
+        Sort sort = new Sort(Sort.Direction.DESC,"id");
+        return menuMapper.toDto(menuRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),sort));
     }
 
     @Override

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/PermissionServiceImpl.java

@@ -14,6 +14,7 @@ import me.zhengjie.utils.ValidationUtil;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,7 +44,8 @@ public class PermissionServiceImpl implements PermissionService {
     @Override
     @Cacheable
     public List<PermissionDTO> queryAll(PermissionQueryCriteria criteria) {
-        return permissionMapper.toDto(permissionRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
+        Sort sort = new Sort(Sort.Direction.DESC,"id");
+        return permissionMapper.toDto(permissionRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),sort));
     }
 
     @Override