diff --git a/src/main/java/com/example/nto/dto/EnterDto.java b/src/main/java/com/example/nto/dto/EnterDto.java index 738ad1b..293571f 100644 --- a/src/main/java/com/example/nto/dto/EnterDto.java +++ b/src/main/java/com/example/nto/dto/EnterDto.java @@ -9,5 +9,6 @@ import java.sql.Timestamp; public class EnterDto { private String login; private String name; - private Timestamp entered_at; + private Timestamp enteredAt; + private String enterType; } diff --git a/src/main/java/com/example/nto/dto/RegisterDto.java b/src/main/java/com/example/nto/dto/RegisterDto.java deleted file mode 100644 index 073d13f..0000000 --- a/src/main/java/com/example/nto/dto/RegisterDto.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.nto.dto; - -import lombok.Data; - -@Data -public class RegisterDto { - private Long id; - private String login; - private String name; - private String password; -} diff --git a/src/main/java/com/example/nto/entity/Code.java b/src/main/java/com/example/nto/entity/Code.java index 71e34b9..eb74e42 100644 --- a/src/main/java/com/example/nto/entity/Code.java +++ b/src/main/java/com/example/nto/entity/Code.java @@ -1,7 +1,6 @@ package com.example.nto.entity; import lombok.Data; -import lombok.Getter; import javax.persistence.*; diff --git a/src/main/java/com/example/nto/entity/Employee.java b/src/main/java/com/example/nto/entity/Employee.java index 0bdb0a7..8870284 100644 --- a/src/main/java/com/example/nto/entity/Employee.java +++ b/src/main/java/com/example/nto/entity/Employee.java @@ -1,15 +1,10 @@ package com.example.nto.entity; -import com.example.nto.service.impl.UserDetailsServiceImpl; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.*; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; import javax.persistence.*; import java.sql.Timestamp; -import java.time.LocalDateTime; import java.util.Set; @Data @@ -39,6 +34,9 @@ public class Employee implements UserDetails { @Column(name = "last_enter") private Timestamp lastVisit; + @Column(name= "access") + private boolean access; + @OneToMany(fetch = FetchType.EAGER) private Set authorities; diff --git a/src/main/java/com/example/nto/entity/Enter.java b/src/main/java/com/example/nto/entity/Enter.java index c229c96..76bae47 100644 --- a/src/main/java/com/example/nto/entity/Enter.java +++ b/src/main/java/com/example/nto/entity/Enter.java @@ -1,15 +1,10 @@ package com.example.nto.entity; -import io.micrometer.core.annotation.TimedSet; -import liquibase.pro.packaged.C; import lombok.Data; -import lombok.Getter; import javax.persistence.*; import java.sql.Timestamp; -import java.time.LocalDateTime; -import java.util.Set; @Data @Entity