2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '6b7c6d3abf535706c2ffe42bc692da90e2b49bd4'

Browse Source
This commit is contained in:
s-sakiyama
2026-10-21 14:11:41 +09:00
parent 053e33fd0b 6b7c6d3abf
commit 5489761a8b
6 changed files with 146 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java
View File

@@ -1,7 +1,6 @@
package com.example.demo.controller; package com.example.demo.controller;
import java.util.Date; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
@@ -9,23 +8,32 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import com.example.demo.form.ReturnForm; import com.example.demo.form.ReturnForm;
import com.example.demo.service.RerurnService;
@Controller @Controller
public class ReturnConfirmController { public class ReturnConfirmController {
RerurnService rerurnService;
@Autowired
ReturnConfirmController(RerurnService rerurnService) {
this.rerurnService = rerurnService;
}
@ModelAttribute @ModelAttribute
ReturnForm returnForm() { ReturnForm returnForm() {
Date date = new Date(); return new ReturnForm();
return new ReturnForm(1, "テスト名", date, date, date, "ISBN", "書籍名", "出版社", "特記事項");
} }
@RequestMapping(value = "/returnConfirm", method = { RequestMethod.POST, RequestMethod.GET }) @RequestMapping(value = "/returnConfirm", method = { RequestMethod.POST, RequestMethod.GET })
public String returnConfirm(Model model) { public String returnConfirm(Model model) {
try { try {
//仮の値を入れる
Integer id = 1;
//申請IDを元に取得 //申請IDを元に取得
//returnFormに値をセット //returnFormに値をセット
//仮の値を入れる
// 画面に返す為の情報をセット // 画面に返す為の情報をセット
model.addAttribute("returnForm", returnForm()); model.addAttribute("returnForm", rerurnService.getReturnForm(id));
return "returnConfirm"; return "returnConfirm";
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

2
team1/src/main/java/com/example/demo/controller/returnCompleteController.java
View File

@@ -9,7 +9,7 @@ import com.example.demo.form.ReturnForm;
//返却完了用のコントローラー //返却完了用のコントローラー
@Controller @Controller
public class returnCompleteController { public class ReturnCompleteController {
@ModelAttribute @ModelAttribute
ReturnForm returnForm() { ReturnForm returnForm() {

160
team1/src/main/java/com/example/demo/entity/Book_collectionEntity.java
View File

@@ -1,6 +1,6 @@
package com.example.demo.entity; package com.example.demo.entity;
import java.sql.Timestamp; import java.util.Date;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
@@ -14,7 +14,7 @@ import org.springframework.data.annotation.LastModifiedDate;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
//テーブル名 //テーブル名
@Table(name = "book_collection") @Table(name = "book_collection")
@Entity @Entity
@@ -22,102 +22,100 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class Book_collectionEntity { public class Book_collectionEntity {
//蔵書ID //蔵書ID
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id_book", nullable = false) @Column(name = "id_book", nullable = false)
private Integer idBook; private Integer idBook;
//ISBN //ISBN
@Column(name = "isbn", nullable = false, length = 13) @Column(name = "isbn", nullable = false, length = 13)
private String isBn; private String isBn;
//書籍名 //書籍名
@Column(name = "nm_book", nullable = false, length = 50) @Column(name = "nm_book", nullable = false, length = 50)
private String nmBook; private String nmBook;
//書籍名よみ //書籍名よみ
@Column(name = "kn_book", nullable = true, length = 100) @Column(name = "kn_book", nullable = true, length = 100)
private String knBook; private String knBook;
//出版社 //出版社
@Column(name = "publisher", nullable = true, length = 50) @Column(name = "publisher", nullable = true, length = 50)
private String pubLisher; private String pubLisher;
//特記事項 //特記事項
@Column(name = "note text", nullable = true) @Column(name = "note", nullable = true)
private String noteText; private String noteText;
//貸出フラグ -> charに変更する //貸出フラグ -> charに変更する
@Column(name = "flg_lending", nullable = false, columnDefinition = "default 0") @Column(name = "flg_lending", nullable = false, columnDefinition = "default 0")
private Character flgLending; private Character flgLending;
//更新者 //更新者
@Column(name = "id_update", nullable = false) @Column(name = "id_update", nullable = false)
private Integer idUpdate; private Integer idUpdate;
//更新日 //更新日
@Column(name = "date_update", nullable = false) @Column(name = "date_update", nullable = false)
@LastModifiedDate @LastModifiedDate
private Timestamp dateUpdate; private Date dateUpdate;
// public static Book_collection convertFrom(Book_collection book_collection) { // public static Book_collection convertFrom(Book_collection book_collection) {
// // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。 // // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
// return new Book_collection Entity( // return new Book_collection Entity(
// book_colletion.getIdBook(), // book_colletion.getIdBook(),
// book_colletion.getisBn(), // book_colletion.getisBn(),
// book_colletion.getnmBook(), // book_colletion.getnmBook(),
// book_colletion..getknBook(), // book_colletion..getknBook(),
// book_colletion.getpublisher(), // book_colletion.getpublisher(),
// book_colletion.getnoteText(), // book_colletion.getnoteText(),
// book_colletion.getflgLending(), // book_colletion.getflgLending(),
// book_colletion.getidUpdate(), // book_colletion.getidUpdate(),
// book_colletion.getdateUupdate() // book_colletion.getdateUupdate()
// ); // );
// //
//} //}
//public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) { //public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) {
// EmployeeEntity employeeEntity = new EmployeeEntity(); // EmployeeEntity employeeEntity = new EmployeeEntity();
// //
// employeeEntity.setIdBook(searchConditionEmployee.getIdBook()); // employeeEntity.setIdBook(searchConditionEmployee.getIdBook());
// employeeEntity.setisBn(searchConditionEmployee.getisBn()); // employeeEntity.setisBn(searchConditionEmployee.getisBn());
// employeeEntity.setnmBook(searchConditionEmployee.getnmBook()); // employeeEntity.setnmBook(searchConditionEmployee.getnmBook());
// employeeEntity.setknBook(searchConditionEmployee.knBook()); // employeeEntity.setknBook(searchConditionEmployee.knBook());
// employeeEntity.setpublisher(searchConditionEmployee.getpublisher()); // employeeEntity.setpublisher(searchConditionEmployee.getpublisher());
// employeeEntity.setnoteText(searchConditionEmployee.getnoteText()); // employeeEntity.setnoteText(searchConditionEmployee.getnoteText());
// employeeEntity.setflgLending(searchConditionEmployee.getflgLending()); // employeeEntity.setflgLending(searchConditionEmployee.getflgLending());
// employeeEntity.setidUpdate(searchConditionEmployee.getidUpdate()); // employeeEntity.setidUpdate(searchConditionEmployee.getidUpdate());
// employeeEntity.setdateUpdate(searchConditionEmployee.getdateUupdate()); // employeeEntity.setdateUpdate(searchConditionEmployee.getdateUupdate());
//
// //// public static List<book_collection> createbook_collectionList(List<EmployeeEntity> employeeEntityList) {
//// public static List<book_collection> createbook_collectionList(List<EmployeeEntity> employeeEntityList) { //// return employeeEntityList.stream().map(EmployeeEntity::createbook_collection).toList();
//// return employeeEntityList.stream().map(EmployeeEntity::createbook_collection).toList(); //// }
//// } //
// // List<book_collection> book_collectionList = new ArrayList<>();
// List<book_collection> book_collectionList = new ArrayList<>(); // for(book_collectionEntity book_collectionEntity:employeeEntityList){
// for(book_collectionEntity book_collectionEntity:employeeEntityList){ // book_collection employee = book_collectionEntity.createbook_collection(book_collectionEntity);
// book_collection employee = book_collectionEntity.createbook_collection(book_collectionEntity); // book_collectionList.add(employee);
// book_collectionList.add(employee); // }
// } // return employeeList;
// return employeeList; //
// //
// // public LoginUser createLoginUser() {
// public LoginUser createLoginUser() { // // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
// // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。 // return new LoginUser(
// return new LoginUser( // getidBook(),
// getidBook(), // getisBn(),
// getisBn(), // getnmBook(),
// getnmBook(), // getknBook(),
// getknBook(), // getpublisher(),
// getpublisher(), // getnoteText(),
// getnoteText(), // getflgLending(),
// getflgLending(), // getidUpdate(),
// getidUpdate(), // getdateUpdate()
// getdateUpdate() // );
// ); // }
// }
} }

6
team1/src/main/java/com/example/demo/entity/Borrow_booksEntity.java
View File

@@ -1,6 +1,5 @@
package com.example.demo.entity; package com.example.demo.entity;
import java.security.Timestamp;
import java.util.Date; import java.util.Date;
import jakarta.persistence.Column; import jakarta.persistence.Column;
@@ -8,8 +7,9 @@ import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType; import jakarta.persistence.GenerationType;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import jakarta.persistence.Table;
import org.hibernate.annotations.Audited.Table; //import org.hibernate.annotations.Audited.Table;
import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.annotation.LastModifiedDate;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@@ -97,5 +97,5 @@ public class Borrow_booksEntity {
* */ * */
@Column(name = "date_update", nullable = false) @Column(name = "date_update", nullable = false)
@LastModifiedDate @LastModifiedDate
private Timestamp dateUpdate; private Date dateUpdate;
} }

4
team1/src/main/java/com/example/demo/entity/EmployeeEntity.java
View File

@@ -1,6 +1,6 @@
package com.example.demo.entity; package com.example.demo.entity;
import java.security.Timestamp; import java.util.Date;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
@@ -81,7 +81,7 @@ public class EmployeeEntity {
*/ */
@Column(name = "date_update", nullable = false) @Column(name = "date_update", nullable = false)
@LastModifiedDate @LastModifiedDate
private Timestamp dateUpdate; private Date dateUpdate;
} }
// public static EmployeeEntity convertForm(Employee employee) { // public static EmployeeEntity convertForm(Employee employee) {

47
team1/src/main/java/com/example/demo/service/RerurnService.java Normal file
View File

@@ -0,0 +1,47 @@
package com.example.demo.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.example.demo.form.ReturnForm;
import com.example.demo.repository.Book_CollectionRepository;
import com.example.demo.repository.Borrow_BooksRepository;
import com.example.demo.repository.EmployeeRepository;
@Service
public class RerurnService {
Book_CollectionRepository book_CollectionRepository;
Borrow_BooksRepository borrowRepository;
EmployeeRepository employeeRepository;
@Autowired
public RerurnService(
Book_CollectionRepository book_CollectionRepository,
Borrow_BooksRepository borrowRepository,
EmployeeRepository employeeRepository) {
this.book_CollectionRepository = book_CollectionRepository;
this.borrowRepository = borrowRepository;
this.employeeRepository = employeeRepository;
}
public ReturnForm getReturnForm(int id) {
ReturnForm result = new ReturnForm();
var borrow = borrowRepository.findById(id);
result.setDateRequest(borrow.get().getDateRequest());//申請日
result.setDateBorrow(borrow.get().getDateBorrow());//貸出日
result.setDateScheduledReturn(borrow.get().getDateScheduledReturn());//返却予定日
var emp = employeeRepository.findById(borrow.get().getIdApplicant());
result.setNmEmployee(emp.get().getNmEmployee());//申請者名、社員名
var book = book_CollectionRepository.findById(borrow.get().getIdBook());
result.setIsBn(book.get().getIsBn());//ISBN
result.setNmBook(book.get().getNmBook());//書籍名
result.setPubLisher(book.get().getPubLisher());//出版社
result.setNoteText(book.get().getNoteText());
return result;
}
}