diff --git a/team1/pom.xml b/team1/pom.xml index 1c44108..75ae850 100644 --- a/team1/pom.xml +++ b/team1/pom.xml @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-starter-webmvc - + com.mysql mysql-connector-j @@ -74,8 +74,13 @@ spring-boot-starter-webmvc-test test + + com.example + HelloSpring + 0.0.1-SNAPSHOT + - + @@ -120,5 +125,7 @@ - + + + \ No newline at end of file diff --git a/team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java b/team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java new file mode 100644 index 0000000..19609f5 --- /dev/null +++ b/team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java @@ -0,0 +1,64 @@ +package com.example.demo.controller; + +import java.util.logging.Level; +import java.util.logging.Logger; + +import jakarta.servlet.http.HttpSession; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import com.example.demo.form.ApprovalForm; + +/** + * 書籍貸出承認確認用のコントローラ + */ +@Controller +public class ApprovalConfirmController { + + // ログ出力用インスタンス + private final static Logger LOGGER = Logger.getLogger(ApprovalConfirmController.class.getName()); + + // エラーメッセージ用の定数フィールド + private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; + + HttpSession httpSession; + Request request; + + @Autowired + public ApprovalConfirmController( + HttpSession httpSession, + Request request) { + this.httpSession = httpSession; + this.request = request; + } + + @ModelAttribute + public ApprovalForm approvalForm() { + return new ApprovalForm(); + } + + @RequestMapping(value = "/ApprovalConfirm", method = RequestMethod.POST) + public String AprrvalForm(ApprovalForm ApprovalForm, Model model) { + + try { + + + return a ; + } catch (Exception e) { + // ログイン情報の破棄 + httpSession.invalidate(); + + e.printStackTrace(); + + // エラーログ出力 + LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e); + // エラー画面遷移 + return "error"; + } + } +} diff --git a/team1/src/main/java/com/example/demo/controller/LendingListController.java b/team1/src/main/java/com/example/demo/controller/LendingListController.java new file mode 100644 index 0000000..3f9c2bc --- /dev/null +++ b/team1/src/main/java/com/example/demo/controller/LendingListController.java @@ -0,0 +1,35 @@ +package com.example.demo.controller; + +import org.springframework.stereotype.Controller; + +@Controller +public class LendingListController { + +// @GetMapping("/lendingList") +// public String show(Model model) { +// List x = xservice.getX(); +// model.addAttribute("Y", x); +// return "Y"; +// } + + +// HttpSession session; +// +// @Autowired +// public SelectListController(HttpSession session) { +// this.session=session; +// } + +// @RequestMapping("/lendingList") +// public String lendList() { +// return "lendingList"; +// } + +// @RequestMapping(value = lendingList, method = RequestMethod.POST) +// public String select( , Model model) { +// model.addAttribute( +// ); +// return lendingList; +// +// } +} diff --git a/team1/src/main/java/com/example/demo/controller/a.java b/team1/src/main/java/com/example/demo/controller/a.java deleted file mode 100644 index 56820af..0000000 --- a/team1/src/main/java/com/example/demo/controller/a.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.demo.controller; - -public class a { - -} diff --git a/team1/src/main/java/com/example/demo/entity/Borrow_booksEntity.java b/team1/src/main/java/com/example/demo/entity/Borrow_booksEntity.java index 6aec336..84cbce4 100644 --- a/team1/src/main/java/com/example/demo/entity/Borrow_booksEntity.java +++ b/team1/src/main/java/com/example/demo/entity/Borrow_booksEntity.java @@ -54,7 +54,7 @@ public class Borrow_booksEntity { * ステータス * */ @Column(name = "status", nullable = false, columnDefinition = "default 1") - private char status; + private Character status; /* * 承認者 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..107738a 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,141 @@ package com.example.demo.entity; -public class EmployeeEntity { +import java.security.Timestamp; +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 org.springframework.data.annotation.LastModifiedDate; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 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, length = 50) + private String nmEmployee; + + /** + * 社員よみ + */ + @Column(name = "kn_employee", nullable = false, length = 100) + private String knEmployee; + + /** + * メールアドレス + */ + @Column(name = "mail_address", nullable = false, length = 256) + private String MailAddress; + + /** + * パスワード + */ + @Column(name = "password", nullable = false, length = 256) + 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 Timestamp 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.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()); +//} +//} \ No newline at end of file diff --git a/team1/src/main/java/com/example/demo/entity/a.java b/team1/src/main/java/com/example/demo/entity/a.java deleted file mode 100644 index ef469ec..0000000 --- a/team1/src/main/java/com/example/demo/entity/a.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.demo.entity; - -public class a { - -} diff --git a/team1/src/main/java/com/example/demo/repository/EmployeeRepository.java b/team1/src/main/java/com/example/demo/repository/EmployeeRepository.java index 09f5cf4..b273e3b 100644 --- a/team1/src/main/java/com/example/demo/repository/EmployeeRepository.java +++ b/team1/src/main/java/com/example/demo/repository/EmployeeRepository.java @@ -1,5 +1,7 @@ package com.example.demo.repository; +import java.util.Optional; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -7,5 +9,6 @@ import com.example.demo.entity.EmployeeEntity; @Repository public interface EmployeeRepository extends JpaRepository { + Optional findByMailAddressAndPassword(String mailAddress, String password); } \ No newline at end of file diff --git a/team1/src/main/java/com/example/demo/service/ApprovalBorrowBooks.java b/team1/src/main/java/com/example/demo/service/ApprovalBorrowBooks.java new file mode 100644 index 0000000..8140377 --- /dev/null +++ b/team1/src/main/java/com/example/demo/service/ApprovalBorrowBooks.java @@ -0,0 +1,5 @@ +package com.example.demo.service; + +public interface ApprovalBorrowBooks { + +} diff --git a/team1/src/main/java/com/example/demo/service/Impl/ApprovalBorrowBooksImpl.java b/team1/src/main/java/com/example/demo/service/Impl/ApprovalBorrowBooksImpl.java new file mode 100644 index 0000000..65a96fe --- /dev/null +++ b/team1/src/main/java/com/example/demo/service/Impl/ApprovalBorrowBooksImpl.java @@ -0,0 +1,31 @@ +package com.example.demo.service.Impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.repository.Borrow_BooksRepository; +import com.example.demo.service.ApprovalBorrowBooks; + +@Service +@Transactional +public class ApprovalBorrowBooksImpl implements ApprovalBorrowBooks { + + Borrow_BooksRepository borrowbooksRepository; + + @Autowired + public ApprovalBorrowBooksImpl(Borrow_BooksRepository borrowbooksRepository) { + this.borrowbooksRepository = borrowbooksRepository; + } + + /* 申請情報から全件取得 + * @return 取得した情報すべて + */ + public List selectAll() { + return ???Entity.create???List(???Repository.findAll()); + } + + +} \ No newline at end of file diff --git a/team1/src/main/java/com/example/demo/service/LendingListService.java b/team1/src/main/java/com/example/demo/service/LendingListService.java new file mode 100644 index 0000000..7251871 --- /dev/null +++ b/team1/src/main/java/com/example/demo/service/LendingListService.java @@ -0,0 +1,27 @@ +package com.example.demo.service; + +import javax.transaction.Transactional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.example.demo.entity.EmployeeEntity; +import com.example.demo.repository.Book_CollectionRepository; +import com.example.demo.repository.Borrow_BooksRepository; + +@Service +@Transactional +public class LendingListService { + + @Autowired + private Book_CollectionRepository collection; + @Autowired + private Borrow_BooksRepository borrow; + @Autowired + private EmployeeEntity employee; + + public List getcollectionWithborrow(){ + return collection; + } + +} diff --git a/team1/src/main/java/com/example/demo/service/S.java b/team1/src/main/java/com/example/demo/service/S.java new file mode 100644 index 0000000..3380be8 --- /dev/null +++ b/team1/src/main/java/com/example/demo/service/S.java @@ -0,0 +1,5 @@ +package com.example.demo.service; + +public class S { + +} diff --git a/team1/src/main/resources/templates/approvalComplete.html b/team1/src/main/resources/templates/approvalComplete.html new file mode 100644 index 0000000..a462f51 --- /dev/null +++ b/team1/src/main/resources/templates/approvalComplete.html @@ -0,0 +1,15 @@ + + + + + + + + + + 書籍貸出承認確認 + + + + + \ No newline at end of file diff --git a/team1/src/main/resources/templates/approvalConfirm.html b/team1/src/main/resources/templates/approvalConfirm.html new file mode 100644 index 0000000..06c1604 --- /dev/null +++ b/team1/src/main/resources/templates/approvalConfirm.html @@ -0,0 +1,141 @@ + + + + + + + + + + 書籍貸出承認確認 + + +

登録内容確認　　　 +
+ ログイン者名： + +
+

+ + + + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
申請ID + +
申請者名 + +
申請日 + +
ISBN + +
書籍名 + +
出版社 + +
特記事項 + +
貸出日 + +
返却予定日 + +
+ + + \ No newline at end of file diff --git a/team1/src/main/resources/templates/approvalRejected.html b/team1/src/main/resources/templates/approvalRejected.html new file mode 100644 index 0000000..a462f51 --- /dev/null +++ b/team1/src/main/resources/templates/approvalRejected.html @@ -0,0 +1,15 @@ + + + + + + + + + + 書籍貸出承認確認 + + + + + \ No newline at end of file diff --git a/team1/src/main/resources/templates/lendingList.html b/team1/src/main/resources/templates/lendingList.html new file mode 100644 index 0000000..b4515b6 --- /dev/null +++ b/team1/src/main/resources/templates/lendingList.html @@ -0,0 +1,44 @@ + + + + + +貸出中書籍一覧 + + + +

+
+ +
+ メニューに戻る +

検索結果

+ + + + 申請ID + 申請者名 + 書籍名 + 申請日 + 貸出日 + 返却予定日 + 操作 + + + + + + + + + + + +
+ + +
+ + + + \ No newline at end of file