From 65e5ab418d441af97a6e846a213e98399fea653a Mon Sep 17 00:00:00 2001 From: m-endo <26-s-i-tm-nets@it-college.jp> Date: Mon, 19 Oct 2026 15:35:19 +0900 Subject: [PATCH 1/3] =?UTF-8?q?EmployeeEntity=E9=80=94=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- team1/pom.xml | 5 + .../example/demo/entity/EmployeeEntity.java | 116 +++++++++++++++++- 2 files changed, 120 insertions(+), 1 deletion(-) diff --git a/team1/pom.xml b/team1/pom.xml index 1c44108..735847e 100644 --- a/team1/pom.xml +++ b/team1/pom.xml @@ -74,6 +74,11 @@ spring-boot-starter-webmvc-test test + + com.example + HelloSpring + 0.0.1-SNAPSHOT + diff --git a/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java b/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java index 44b99e1..e3941eb 100644 --- a/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java +++ b/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java @@ -1,5 +1,119 @@ package com.example.demo.entity; -public class EmployeeEntity { +import java.util.List; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import main.java.com.example.rhizome.app.infra.entity.Employee; +import main.java.com.example.rhizome.app.infra.entity.EmployeeEntity; +import main.java.com.example.rhizome.app.infra.entity.LoginUser; +import main.java.com.example.rhizome.app.infra.entity.SearchConditionEmployee; + +/** + * EmployeeテーブルのEntity + */ + +@Entity +@Table(name = "employee") +@Data +@NoArgsConstructor +@AllArgsConstructor + +public class EmployeeEntity { + //社員ID + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id_employee", nullable = false) + private Integer idEmployee; + + //社員名 + @Column(name = "nm_employee", nullable = false) + private String nmEmployee; + + //社員よみ + @Column(name = "kn_employee", nullable = false) + private String knEmployee; + + //メールアドレス + @Column(name = "mail_address", nullable = false) + private String MailAddress; + + //パスワード + @Column(name = "password", nullable = false) + private String Password; + + //管理者フラグ + @Column(name = "flg_admin", nullable = false) + private Character FlgAdmin; + + //退職者フラグ + @Column(name = "flg_retirement", nullable = false) + private Character FlgRetirement; + + //更新者 + @Column(name = "id_update", nullable = false) + private Integer IdUpdate; + + //更新日 + @Column(name = "date_update", nullable = false) + private Integer DateUpdate; + + public static EmployeeEntity convertForm(Employee employee) { + return new EmployeeEntity( + employee.getIdEmployee(), + employee.getnmEmployee(), + employee.getknEmployee(), + employee.getMailAddress(), + employee.getPassword(), + employee.getFlgAdmin(), + employee.getFlgRetirement(), + employee.getIdUpdate(), + employee.getDateUpdate()); + + } + + public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) { + EmployeeEntity employeeEntity = new EmployeeEntity(); + + employeeEntity.setIdEmployee(searchConditionEmployee.getIdEmployee()); + employeeEntity.setNmEmployee(searchConditionEmployee.getNmEmployee()); + employeeEntity.setKnEmployee(searchConditionEmployee.getKnEmployee()); + employeeEntity.setMailAddress(searchConditionEmployee.getMailAddress()); + + return employeeEntity; + + } + + public static Employee createEmployee(EmployeeEntity employeeEntity) { + return new Employee( + employeeEntity.getIdEmployee(), + employeeEntity.getNmEmployee(), + employeeEntity.getKnEmployee(), + employeeEntity.getMailAddress(), + employeeEntity.getPassword(), + employeeEntity.getAdminAuth(), + employeeEntity.getIdDepartment()); + } + + public static List createEmployeeList(List employeeEntityList) { + return employeeEntityList.stream().map(EmployeeEntity::createEmployee).toList(); + } + + public LoginUser createLoginUser() { + getIdEmployee(), + getNmEmployee(), + getKnEmployee(), + getMailAddress(), + getPassword(), + getAdminAuth(), + getIdDepartment()); +} } From 2659bfae11bb51aeffbe6ac303e1c4ec3a47d4ac Mon Sep 17 00:00:00 2001 From: m-endo <26-s-i-tm-nets@it-college.jp> Date: Mon, 19 Oct 2026 16:47:33 +0900 Subject: [PATCH 2/3] =?UTF-8?q?EmployeeEntity=E9=80=94=E4=B8=AD=E3=81=BE?= =?UTF-8?q?=E3=81=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/entity/EmployeeEntity.java | 151 ++++++++++-------- 1 file changed, 86 insertions(+), 65 deletions(-) diff --git a/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java b/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java index e3941eb..6b61a8b 100644 --- a/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java +++ b/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java @@ -1,7 +1,5 @@ package com.example.demo.entity; -import java.util.List; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -9,13 +7,11 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; +import org.springframework.data.annotation.LastModifiedDate; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import main.java.com.example.rhizome.app.infra.entity.Employee; -import main.java.com.example.rhizome.app.infra.entity.EmployeeEntity; -import main.java.com.example.rhizome.app.infra.entity.LoginUser; -import main.java.com.example.rhizome.app.infra.entity.SearchConditionEmployee; /** * EmployeeテーブルのEntity @@ -28,92 +24,117 @@ import main.java.com.example.rhizome.app.infra.entity.SearchConditionEmployee; @AllArgsConstructor public class EmployeeEntity { - //社員ID + /** + * 社員ID + */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id_employee", nullable = false) private Integer idEmployee; - //社員名 + /** + * 社員名 + */ @Column(name = "nm_employee", nullable = false) private String nmEmployee; - //社員よみ + /** + * 社員よみ + */ @Column(name = "kn_employee", nullable = false) private String knEmployee; - //メールアドレス + /** + * メールアドレス + */ @Column(name = "mail_address", nullable = false) private String MailAddress; - //パスワード + /** + * パスワード + */ @Column(name = "password", nullable = false) private String Password; - //管理者フラグ + /** + * 管理者フラグ + */ @Column(name = "flg_admin", nullable = false) private Character FlgAdmin; - //退職者フラグ + /** + * 退職者フラグ + */ @Column(name = "flg_retirement", nullable = false) private Character FlgRetirement; - //更新者 + /** + * 更新者 + */ @Column(name = "id_update", nullable = false) private Integer IdUpdate; - //更新日 + /** + * 更新日 + */ @Column(name = "date_update", nullable = false) + @LastModifiedDate private Integer DateUpdate; - public static EmployeeEntity convertForm(Employee employee) { - return new EmployeeEntity( - employee.getIdEmployee(), - employee.getnmEmployee(), - employee.getknEmployee(), - employee.getMailAddress(), - employee.getPassword(), - employee.getFlgAdmin(), - employee.getFlgRetirement(), - employee.getIdUpdate(), - employee.getDateUpdate()); - - } - - public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) { - EmployeeEntity employeeEntity = new EmployeeEntity(); - - employeeEntity.setIdEmployee(searchConditionEmployee.getIdEmployee()); - employeeEntity.setNmEmployee(searchConditionEmployee.getNmEmployee()); - employeeEntity.setKnEmployee(searchConditionEmployee.getKnEmployee()); - employeeEntity.setMailAddress(searchConditionEmployee.getMailAddress()); - - return employeeEntity; - - } - - public static Employee createEmployee(EmployeeEntity employeeEntity) { - return new Employee( - employeeEntity.getIdEmployee(), - employeeEntity.getNmEmployee(), - employeeEntity.getKnEmployee(), - employeeEntity.getMailAddress(), - employeeEntity.getPassword(), - employeeEntity.getAdminAuth(), - employeeEntity.getIdDepartment()); - } - - public static List createEmployeeList(List employeeEntityList) { - return employeeEntityList.stream().map(EmployeeEntity::createEmployee).toList(); - } - - public LoginUser createLoginUser() { - getIdEmployee(), - getNmEmployee(), - getKnEmployee(), - getMailAddress(), - getPassword(), - getAdminAuth(), - getIdDepartment()); -} } + +// public static EmployeeEntity convertForm(Employee employee) { +// return new EmployeeEntity( +// employee.getIdEmployee(), +// employee.getnmEmployee(), +// employee.getknEmployee(), +// employee.getMailAddress(), +// employee.getPassword(), +// employee.getFlgAdmin(), +// employee.getFlgRetirement(), +// employee.getIdUpdate(), +// employee.getDateUpdate()); +// +// } +// +// public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) { +// EmployeeEntity employeeEntity = new EmployeeEntity(); +// +// employeeEntity.setIdEmployee(searchConditionEmployee.getIdEmployee()); +// employeeEntity.setNmEmployee(searchConditionEmployee.getNmEmployee()); +// employeeEntity.setKnEmployee(searchConditionEmployee.getKnEmployee()); +// employeeEntity.setMailAddress(searchConditionEmployee.getMailAddress()); +// +// return employeeEntity; +// +// } +// +// public static Employee createEmployee(EmployeeEntity employeeEntity) { +// return new Employee( +// employeeEntity.getIdEmployee(), +// employeeEntity.getNmEmployee(), +// employeeEntity.getKnEmployee(), +// employeeEntity.getMailAddress(), +// employeeEntity.getPassword(), +// employeeEntity.getFlgAdmin(), +// employeeEntity.getFlgRetirement(), +// employeeEntity.getIdUpdate(), +// employeeEntity.getDateUpdate()); +// } +// +// public static List createEmployeeList(List employeeEntityList) { +// return employeeEntityList.stream().map(EmployeeEntity::createEmployee).toList(); +// } +// +// public LoginUser createLoginUser() { +// getIdEmployee(), +// getNmEmployee(), +// getKnEmployee(), +// getMailAddress(), +// getPassword(), +// getFlgAdmin(), +// getFlgRetirement(), +// getIdUpdate(), +// getDateUpdate()); +//} +//} From 1becc3b1963119e8afc0b14d2f18932b2e9d7c47 Mon Sep 17 00:00:00 2001 From: m-endo <26-s-i-tm-nets@it-college.jp> Date: Tue, 20 Oct 2026 09:35:14 +0900 Subject: [PATCH 3/3] =?UTF-8?q?EmployeeEntity=E4=BF=AE=E6=AD=A3=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/entity/EmployeeEntity.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java b/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java index 6b61a8b..c3589d3 100644 --- a/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java +++ b/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java @@ -1,5 +1,7 @@ package com.example.demo.entity; +import java.security.Timestamp; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -35,25 +37,25 @@ public class EmployeeEntity { /** * 社員名 */ - @Column(name = "nm_employee", nullable = false) + @Column(name = "nm_employee", nullable = false, length = 50) private String nmEmployee; /** * 社員よみ */ - @Column(name = "kn_employee", nullable = false) + @Column(name = "kn_employee", nullable = false, length = 100) private String knEmployee; /** * メールアドレス */ - @Column(name = "mail_address", nullable = false) + @Column(name = "mail_address", nullable = false, length = 256) private String MailAddress; /** * パスワード */ - @Column(name = "password", nullable = false) + @Column(name = "password", nullable = false, length = 256) private String Password; /** @@ -72,15 +74,14 @@ public class EmployeeEntity { * 更新者 */ @Column(name = "id_update", nullable = false) - private Integer IdUpdate; + private Integer idUpdate; /** * 更新日 */ @Column(name = "date_update", nullable = false) @LastModifiedDate - private Integer DateUpdate; - + private Timestamp dateUpdate; } // public static EmployeeEntity convertForm(Employee employee) {