diff --git a/.project b/.project new file mode 100644 index 0000000..a59a30a --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + last-group-delevelopment-team1 + + + + + + + + diff --git a/team1/pom.xml b/team1/pom.xml index 735847e..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 @@ -80,7 +80,7 @@ 0.0.1-SNAPSHOT - + @@ -125,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/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/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/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