From a495e6a37ea072a131e0f5323f5b9281ee0c60dd Mon Sep 17 00:00:00 2001 From: Daniil Makeev Date: Wed, 19 Feb 2025 10:09:08 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=20=D1=81=D0=BB=D0=BE=D0=B9=20domain=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=81?= =?UTF-8?q?=D1=83=D1=89=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20QrCode=20=D0=B8=20?= =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D1=8B=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D1=8B=20=D1=81=D1=83=D1=89?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20Visit=20=D0=BA=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B0=D1=8F=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C?= =?UTF-8?q?=20=D1=85=D1=80=D0=B0=D0=BD=D0=B8=D1=82=20QrCode,=20=D0=BA?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B9=20=D0=B1=D1=8B=D0=BB=20?= =?UTF-8?q?=D0=BE=D1=82=D1=81=D0=BA=D0=B0=D0=BD=D1=80=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/qrcode/QrCode.java | 19 +++++++++++++++++++ .../onomatopoeiaback/domain/visit/Visit.java | 14 +++++++++++--- .../domain/visit/VisitDTO.java | 2 +- 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/example/onomatopoeiaback/domain/qrcode/QrCode.java diff --git a/src/main/java/com/example/onomatopoeiaback/domain/qrcode/QrCode.java b/src/main/java/com/example/onomatopoeiaback/domain/qrcode/QrCode.java new file mode 100644 index 0000000..0210efe --- /dev/null +++ b/src/main/java/com/example/onomatopoeiaback/domain/qrcode/QrCode.java @@ -0,0 +1,19 @@ +package com.example.onomatopoeiaback.domain.qrcode; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.Getter; +import lombok.Setter; + +@Entity(name = "QR_CODE") +@Getter +@Setter +public class QrCode { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; +} diff --git a/src/main/java/com/example/onomatopoeiaback/domain/visit/Visit.java b/src/main/java/com/example/onomatopoeiaback/domain/visit/Visit.java index 7d76a6b..6d4e231 100644 --- a/src/main/java/com/example/onomatopoeiaback/domain/visit/Visit.java +++ b/src/main/java/com/example/onomatopoeiaback/domain/visit/Visit.java @@ -1,9 +1,13 @@ package com.example.onomatopoeiaback.domain.visit; +import com.example.onomatopoeiaback.domain.qrcode.QrCode; import jakarta.persistence.*; import lombok.Getter; +import lombok.NonNull; import lombok.Setter; +import java.time.LocalDateTime; + @Table(name = "code") @Entity @Getter @@ -11,8 +15,12 @@ import lombok.Setter; public class Visit { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private long id; - - private long value; + private Long id; + @NonNull + @ManyToOne + private QrCode qrCode; + @NonNull private VisitType visitType; + @NonNull + private LocalDateTime visitTime; } diff --git a/src/main/java/com/example/onomatopoeiaback/domain/visit/VisitDTO.java b/src/main/java/com/example/onomatopoeiaback/domain/visit/VisitDTO.java index 91a2909..e105c2b 100644 --- a/src/main/java/com/example/onomatopoeiaback/domain/visit/VisitDTO.java +++ b/src/main/java/com/example/onomatopoeiaback/domain/visit/VisitDTO.java @@ -6,6 +6,6 @@ import lombok.Setter; @Getter @Setter public class VisitDTO { - private long value; + private Long QrCodeId; private VisitType visitType; }