Book_collectionのEntity

.project

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>last-group-delevelopment-team1</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

team1/pom.xml

@@ -43,7 +43,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webmvc</artifactId>
 		</dependency>
- 
+
 		<dependency>
 			<groupId>com.mysql</groupId>
 			<artifactId>mysql-connector-j</artifactId>
@@ -75,7 +75,7 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
- 
+
 	<build>
 		<plugins>
 			<plugin>
@@ -120,7 +120,5 @@
 			</plugin>
 		</plugins>
 	</build>
- 
+
 </project>
- 
- 

team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java

@@ -1,64 +0,0 @@
-//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;
-//	ApprovalForm approvalform;
-//
-//	@Autowired
-//	public ApprovalConfirmController(
-//			HttpSession httpSession,
-//			ApprovalForm approvalform) {
-//		this.httpSession = httpSession;
-//		this.approvalform = approvalform;
-//	}
-//
-//	@ModelAttribute
-//	public ApprovalForm approvalForm() {
-//		return new ApprovalForm();
-//	}
-//
-//	@RequestMapping(value = "/ApprovalConfirm", method = RequestMethod.POST)
-//	public String AprrvalForm(ApprovalForm ApprovalForm, Model model) {
-//		
-//		try {
-//
-//			
-//			return;
-//		} catch (Exception e) {
-//			// ログイン情報の破棄
-//			httpSession.invalidate();
-//
-//			e.printStackTrace();
-//
-//			// エラーログ出力
-//			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-//			// エラー画面遷移
-//			return "error";
-//		}
-//	}
-//}

team1/src/main/java/com/example/demo/controller/a.java

@@ -0,0 +1,5 @@
+package com.example.demo.controller;
+
+public class a {
+
+}

team1/src/main/java/com/example/demo/entity/Book_collectionEntity.java

@@ -1,6 +1,6 @@
 package com.example.demo.entity;
- 
+
-import java.sql.Timestamp;
+import java.sql.Date;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -9,13 +9,10 @@ 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;
- 
+
-//テーブル名
 @Table(name = "book_collection")
 @Entity
 @Data
@@ -31,28 +28,28 @@ public class Book_collectionEntity {
 	private Integer idBook;
 	
 	//ISBN
-	@Column(name = "isbn", nullable = false, length = 13)
+	@Column(name = "isbn", nullable = false)
 	private String isBn;
 	
 	//書籍名
-	@Column(name = "nm_book", nullable = false, length = 50)
+	@Column(name = "nm_book", nullable = false)
     private String nmBook;
 	
 	//書籍名よみ
-	@Column(name = "kn_book", nullable = true, length = 100)
+	@Column(name = "kn_book", nullable = true)
     private String knBook;
 	
 	//出版社
-	@Column(name = "publisher", nullable = true, length = 50)
+	@Column(name = "publisher", nullable = true)
     private String pubLisher;
 	
 	//特記事項
 	@Column(name = "note text", nullable = true)
     private String noteText;
 	
-	//貸出フラグ   -> charに変更する
+	//貸出フラグ
-	@Column(name = "flg_lending", nullable = false, columnDefinition = "default 0")
+	@Column(name = "flg_lending", length = 1, nullable = false)
-    private Character flgLending;
+    private String flgLending;
 	
 	//更新者
 	@Column(name = "id_update", nullable = false)
@@ -60,8 +57,7 @@ public class Book_collectionEntity {
 	
 	//更新日
     @Column(name = "date_update", nullable = false)
-    @LastModifiedDate
+    private Date dateUpdate;
-    private Timestamp dateUpdate;
     
 //	public static Book_collection convertFrom(Book_collection book_collection) {
 //    // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
@@ -84,7 +80,7 @@ public class Book_collectionEntity {
 //    employeeEntity.setIdBook(searchConditionEmployee.getIdBook());
 //    employeeEntity.setisBn(searchConditionEmployee.getisBn());
 //    employeeEntity.setnmBook(searchConditionEmployee.getnmBook());
- 
+
 //    employeeEntity.setknBook(searchConditionEmployee.knBook());
 //    employeeEntity.setpublisher(searchConditionEmployee.getpublisher());
 //    employeeEntity.setnoteText(searchConditionEmployee.getnoteText());

team1/src/main/java/com/example/demo/entity/Borrow_booksEntity.java

@@ -1,101 +1,5 @@
 package com.example.demo.entity;
 
-import java.security.Timestamp;
-import java.util.Date;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-
-import org.hibernate.annotations.Audited.Table;
-import org.springframework.data.annotation.LastModifiedDate;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Entity
-@Table(name = "borrow_books")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-
 public class Borrow_booksEntity {
 
-	/*
-	 * 申請ID
-	 * */
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name = "id_request", nullable = false)
-	private Integer idRequest;
-
-	/*
-	 * 申請者ID
-	 * */
-	@Column(name = "id_applicant", nullable = false)
-	private Integer idApplicant;
-
-	/*
-	 * 蔵書ID
-	 * */
-	@Column(name = "id_book", nullable = false)
-	private Integer idBook;
-
-	/*
-	 * 申請日
-	 * */
-	@Column(name = "date_request", nullable = false)
-	private Date dateRequest;
-
-	/*
-	 * ステータス
-	 * */
-	@Column(name = "status", nullable = false, columnDefinition = "default 1")
-	private Character status;
-
-	/*
-	 * 承認者
-	 * */
-	@Column(name = "id_approval", nullable = true)
-	private Integer idApproval;
-
-	/*
-	 * 承認日
-	 * */
-	@Column(name = "date_approval", nullable = true)
-	private Date dateApproval;
-
-	/*
-	 * 貸出日
-	 * */
-	@Column(name = "date_borrow", nullable = false)
-	private Date dateBorrow;
-
-	/*
-	 * 返却予定日
-	 * */
-	@Column(name = "date_scheduled_return", nullable = false)
-	private Date dateScheduledReturn;
-
-	/*
-	 * 返却日
-	 * */
-	@Column(name = "date_return", nullable = true)
-	private Date dateReturn;
-
-	/*
-	 * 更新者
-	 * */
-	@Column(name = "id_update", nullable = false)
-	private Integer idUpdate;
-
-	/*
-	 * 更新日
-	 * */
-	@Column(name = "date_update", nullable = false)
-	@LastModifiedDate
-	private Timestamp dateUpdate;
 }

team1/src/main/java/com/example/demo/entity/EmployeeEntity.java

@@ -1,141 +1,5 @@
 package com.example.demo.entity;
 
-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<Employee> createEmployeeList(List<EmployeeEntity> employeeEntityList) {
-//		return employeeEntityList.stream().map(EmployeeEntity::createEmployee).toList();
-//	}
-//
-//	public LoginUser createLoginUser() {
-//		getIdEmployee(),
-//		getNmEmployee(),
-//		getKnEmployee(),
-//		getMailAddress(),
-//		getPassword(),
-//		getFlgAdmin(),
-//		getFlgRetirement(),
-//		getIdUpdate(),
-//		getDateUpdate());
-//}
-//}

team1/src/main/java/com/example/demo/entity/a.java

@@ -0,0 +1,5 @@
+package com.example.demo.entity;
+
+public class a {
+
+}

team1/src/main/java/com/example/demo/repository/Book_CollectionRepository.java

@@ -1,11 +0,0 @@
-package com.example.demo.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import com.example.demo.entity.Book_collectionEntity;
-
-@Repository
-public interface Book_CollectionRepository extends JpaRepository<Book_collectionEntity, Integer> {
-
-}

team1/src/main/java/com/example/demo/repository/Borrow_BooksRepository.java

@@ -1,18 +0,0 @@
-package com.example.demo.repository;
-
-import java.util.Optional;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import com.example.demo.entity.Borrow_booksEntity;
-
-@Repository
-public interface Borrow_BooksRepository extends JpaRepository<Borrow_booksEntity, Integer> {
-
-	/*
-	* 申請者IDで検索
-	* */
-	Optional<Borrow_booksEntity> findByIdApplicant(Integer idApplicant);
-
-}

team1/src/main/java/com/example/demo/repository/EmployeeRepository.java

@@ -1,14 +0,0 @@
-package com.example.demo.repository;
-
-import java.util.Optional;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import com.example.demo.entity.EmployeeEntity;
-
-@Repository
-public interface EmployeeRepository extends JpaRepository<EmployeeEntity, Integer> {
-	Optional<EmployeeEntity> findByMailAddressAndPassword(String mailAddress, String password);
-
-}

team1/src/main/java/com/example/demo/service/Impl/ApprovalBorrowBooksImpl.java

@@ -1,31 +0,0 @@
-//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());
-//	}
-//	
-//	
-//}

team1/src/main/resources/templates/applicationList.html

@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-    <!-- 外部のスクリプトファイルを読み込む -->
-    <script th:src="@{/js/common.js}"></script>
-    <!-- CSSの読み込み -->
-    <link rel="stylesheet" th:href="@{/css/all.css}">
-    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>検索</title>
-</head>
-
-<body>
-    <div class="rightSection">
-        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-    </div>
-
-<div class="header-spacing"></div>
-<a href="showMenu">メニューに戻る</a>
-
-<div class="header-spacing"></div>
-<h1><span>検索結果</span></h1>
-
-<div class="header-spacing"></div>
-<th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}">
-    <!-- 検索結果が1件以上ある場合 -->
-    <table class="table-grid table-striped table-hover">
-        <thead>
-        <tr>
-            <th style="width: 100px;">申請ID</th>
-            <th style="width: 100px;">申請者名</th>
-            <th style="width: 100px;">書籍名</th>
-            <th style="width: 100px;">申請日</th>
-            <th style="width: 100px;">貸出日</th>
-            <th style="width: 100px;">返却予定日</th>
-            <th style="width: 100px;">操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr th:each="employeeInfoForm : ${employeeInfoFormList}">
-            <td th:text="${employeeInfoForm.idRequest}"></td>
-            <td th:text="${employeeInfoForm.nmApplicant}"></td>
-            <td th:text="${employeeInfoForm.nmBook}"></td>
-            <td th:text="${employeeInfoForm.dateRequest}"></td>
-            <td th:text="${employeeInfoForm.dateBorrow}"></td>
-            <td th:text="${employeeInfoForm.dateReturn}"></td>
-            <td th:text="${employeeInfoForm.dateRequest}"></td>
-			
-			
-						<td>
-							<form action="/approve" method="get">
-								<input name="idRequest" th:value="${employeeInfoForm.idRequest}" type="hidden">
-								<input type="submit" value="承認">
-							</form>
-						</td>
-        </tr>
-        </tbody>
-    </table>
-</th:block>
-
-<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
-    <!-- 検索結果が0件の場合 -->
-    現在書籍貸出の申請はありません。
-</th:block>
-
-</body>
-
-</html>

team1/src/main/resources/templates/approvalConfirm.html

@@ -1,141 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-	  <!-- 外部のスクリプトファイルを読み込む -->
-	  <script th:src="@{/js/common.js}"></script>
-	  <!-- CSSの読み込み -->
-	  <link rel="stylesheet" th:href="@{/css/all.css}">
-	  <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-	  <title>書籍貸出承認確認</title>
-</head>
-<body>
-	<h1>登録内容確認　　　
-	    <div class="rightSection">
-	        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-	        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-	    </div>
-	</h1>
-	<!-- 変数名は変更したが、中身は変更していない -->
-	<!-- ボタンや遷移も手を付けていない -->
-	<form action="insertEmployee"
-	      id="insertForm"
-	      method="post"
-	      th:object="${insertEmployeeForm}">
-
-	    <div class="msgBox error" th:if="${messageError != null}">
-	        <span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
-	    </div>
-	    <table>
-	        <tr>
-	            <th class="header">申請ID</th>
-	            <td>
-	                <label>
-	                    <input class="readOnly"
-	                           name="idRquest"
-	                           readonly="readonly"
-	                           type="text"
-	                           value="自動で設定されます"/>
-	                </label>
-	            </td>
-	        </tr>
-	        <tr>
-	            <th class="header">申請者名</th>
-	            <td>
-	                <label>
-	                    <input class="readOnly"
-	                           name="nmEmployee"
-	                           readonly="readonly"
-	                           th:value="*{nmEmployee}"
-	                           type="text"/>
-	                </label>
-	            </td>
-	        </tr>
-	        <tr>
-	            <th class="header">申請日</th>
-	            <td>
-	                <label>
-	                    <input class="readOnly"
-	                           name="dataRequest"
-	                           readonly="readonly"
-	                           th:value="*{dataRequest}"
-	                           type="text"/>
-	                </label>
-	            </td>
-	        </tr>
-	        <tr>
-	            <th class="header">ISBN</th>
-	            <td>
-	                <label>
-	                    <input class="readOnly"
-	                           name="isBn"
-	                           readonly="readonly"
-	                           th:value="*{isBn}"
-	                           type="text"/>
-	                </label>
-	            </td>
-	        </tr>
-	        <tr>
-	            <th class="header">書籍名</th>
-	            <td>
-	                <label>
-	                    <input class="readOnly"
-	                           name="nmBook"
-	                           readonly="readonly"
-	                           th:value="*{nmBook}"
-	                           type="text"/>
-	                </label>
-	            </td>
-	        </tr>
-			<tr>
-	            <th class="header">出版社</th>
-	            <td>
-	                <label>
-	                    <input class="readOnly"
-	                           name="publisher"
-	                           readonly="readonly"
-	                           th:value="*{publisher}"
-		                          type="text"/>
-		               </label>
-		           </td>
-		       </tr>
-			   <tr>
-	               <th class="header">特記事項</th>
-	               <td>
-	                  <label>
-		                 <input class="readOnly"
-		                         name="note"
-	                         readonly="readonly"
-	                         th:value="*{note}"
-	                             type="text"/>
-	                   </label>
-	               </td>
-	           </tr>
-			   <tr>
-			        <th class="header">貸出日</th>
-			             <td>
-							<label>
-			              <input class="readOnly"
-			                      name="dateBorrow"
-			                  readonly="readonly"
-							  th:value="*{dateBorrow}"
-			                       type="text"/>
-			               </label>
-			             </td>
-			    </tr>
-			    <tr>
-			        <th class="header">返却予定日</th>
-			            <td>
-			                <label>
-			                       <input class="readOnly"
-			                              name="dateScheduledReturn"
-			                              readonly="readonly"
-			                              th:value="*{date_scheduled_return}"
-			                              type="text"/>
-			                 </label>
-			           </td>
-			    </tr>
-			</table>
-	</form>
-</body>
-</html>