Entities and Dto changes

This commit is contained in:
Niktia 2025-02-19 16:11:10 +03:00
parent 83d89f4921
commit 5914bda1f2
5 changed files with 5 additions and 23 deletions

View File

@ -9,5 +9,6 @@ import java.sql.Timestamp;
public class EnterDto { public class EnterDto {
private String login; private String login;
private String name; private String name;
private Timestamp entered_at; private Timestamp enteredAt;
private String enterType;
} }

View File

@ -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;
}

View File

@ -1,7 +1,6 @@
package com.example.nto.entity; package com.example.nto.entity;
import lombok.Data; import lombok.Data;
import lombok.Getter;
import javax.persistence.*; import javax.persistence.*;

View File

@ -1,15 +1,10 @@
package com.example.nto.entity; package com.example.nto.entity;
import com.example.nto.service.impl.UserDetailsServiceImpl;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.*; import lombok.*;
import org.springframework.security.core.userdetails.UserDetails; 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 javax.persistence.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.Set; import java.util.Set;
@Data @Data
@ -39,6 +34,9 @@ public class Employee implements UserDetails {
@Column(name = "last_enter") @Column(name = "last_enter")
private Timestamp lastVisit; private Timestamp lastVisit;
@Column(name= "access")
private boolean access;
@OneToMany(fetch = FetchType.EAGER) @OneToMany(fetch = FetchType.EAGER)
private Set<Authority> authorities; private Set<Authority> authorities;

View File

@ -1,15 +1,10 @@
package com.example.nto.entity; package com.example.nto.entity;
import io.micrometer.core.annotation.TimedSet;
import liquibase.pro.packaged.C;
import lombok.Data; import lombok.Data;
import lombok.Getter;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.Set;
@Data @Data
@Entity @Entity