From da3b79b06bef44ca4e1ce5cc3a2b8a1b7292fa8e Mon Sep 17 00:00:00 2001
From: o-matsuda <26-o-matsuda-stellatecnica@it-college.co.jp>
Date: Wed, 30 Sep 2026 10:56:35 +0900
Subject: [PATCH] =?UTF-8?q?=E6=AE=B5=E9=9A=8E=EF=BC=92=E5=AE=8C=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/rhizome/example/dao/EmployeeDAO.java | 15 +++++++--
 src/com/rhizome/example/main/Main.java       |  8 +++--
 src/com/rhizome/example/util/DbUtil.java     | 34 +++++---------------
 3 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/src/com/rhizome/example/dao/EmployeeDAO.java b/src/com/rhizome/example/dao/EmployeeDAO.java
index ef63c49..4eb953a 100644
--- a/src/com/rhizome/example/dao/EmployeeDAO.java
+++ b/src/com/rhizome/example/dao/EmployeeDAO.java
@@ -13,6 +13,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.rhizome.example.dto.EmployeeDTO;
 import com.rhizome.example.util.DbUtil;
 
 public class EmployeeDAO {
@@ -48,8 +49,8 @@ public class EmployeeDAO {
 	 * @throws SQLException
 	 * @throws ClassNotFoundException
 	 */
-	public List<String> selectAll() throws SQLException, ClassNotFoundException {
-		List<String> rtnList = new ArrayList<>();
+	public List<EmployeeDTO> selectAll() throws SQLException, ClassNotFoundException {
+		List<EmployeeDTO> rtnList = new ArrayList<>();
 		StringBuilder sql = new StringBuilder();
 		sql.append(" SELECT ");
 		sql.append("    " + "*");
@@ -59,8 +60,16 @@ public class EmployeeDAO {
 
 			this.stmt = con.prepareStatement(sql.toString());
 			rs = stmt.executeQuery();
+			//DBのカラムをリストに追加
 			while (rs.next()) {
-				rtnList.add(rs.getString(NM_EMPLOYEE));
+				EmployeeDTO dto = new EmployeeDTO();
+				dto.setEmpid(rs.getInt(ID_EMPLOYEE));
+				dto.setName(rs.getString(NM_EMPLOYEE));
+				dto.setKana(rs.getString(KN_EMPLOYEE));
+				dto.setMail(rs.getString(MAIL_ADDRESS));
+				dto.setPass(rs.getString(PASSWORD));
+				dto.setDepid(rs.getInt(ID_DEPARTMENT));
+				rtnList.add(dto);
 			}
 		} finally {
 			DbUtil.closeStatement(this.stmt);
diff --git a/src/com/rhizome/example/main/Main.java b/src/com/rhizome/example/main/Main.java
index 14fb220..26bee26 100644
--- a/src/com/rhizome/example/main/Main.java
+++ b/src/com/rhizome/example/main/Main.java
@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Scanner;
 
 import com.rhizome.example.dao.EmployeeDAO;
+import com.rhizome.example.dto.EmployeeDTO;
 import com.rhizome.example.util.DbUtil;
 
 /**
@@ -76,7 +77,7 @@ public class Main {
 	 * @throws SQLException
 	 */
 	public static void empSelect() throws ClassNotFoundException, SQLException {
-		List<String> empList = new ArrayList<>();
+		List<EmployeeDTO> empList = new ArrayList<>();
 		Connection con = DbUtil.getConnection();
 		EmployeeDAO empDao = new EmployeeDAO(con);
 		System.out.println("1:全検索 2:条件検索 それ以外:戻る");
@@ -89,8 +90,9 @@ public class Main {
 			default:
 				return;
 			}
-			for (String emp : empList) {
-				System.out.println(emp);
+			for (EmployeeDTO emp : empList) {
+				System.out.println(emp.getEmpid() + "\t" + emp.getName() + "\t" + emp.getKana() + "\t"
+						+ emp.getMail() + "\t" + emp.getPass() + "\t" + emp.getDepid());
 			}
 		} finally {
 			DbUtil.closeConnection(empDao.con);
diff --git a/src/com/rhizome/example/util/DbUtil.java b/src/com/rhizome/example/util/DbUtil.java
index 6f0ee87..95e2e4d 100644
--- a/src/com/rhizome/example/util/DbUtil.java
+++ b/src/com/rhizome/example/util/DbUtil.java
@@ -44,21 +44,9 @@ public class DbUtil {
 	 * 				  生成されたConnectionを返却する
 	 * 				  ※Connection生成には上記の定数を活用してください
 	 */
-	public static Connection getConnection() {
-		try {
-			Class.forName("com.mysql.cj.jdbc.Driver");
-			con = DriverManager.getConnection(
-					"jdbc:mysql://127.0.0.1:3306/rezodb" // データベース
-					, "rezouser" // ユーザー名
-					, "Rezo_0000" // パスワード
-			);
-			// forName()で例外発生
-		} catch (ClassNotFoundException e) {
-			e.printStackTrace();
-			// getConnection()で例外発生
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
+	public static Connection getConnection() throws SQLException {
+			//データベースへの接続
+			con = DriverManager.getConnection(DB_URL, DB_USER ,DB_PASS);
 		return con;
 	}
 
@@ -71,14 +59,10 @@ public class DbUtil {
 	 * 例外			：SQLException
 	 * 処理			：引数のDBステートメントがnullでない場合、そのDBステートメントをクローズする
 	 */
-	public static void closeStatement(PreparedStatement ps) {
+	public static void closeStatement(PreparedStatement ps) throws SQLException {
+		//DBステートメントのクローズ
 		if (ps != null) {
-			try {
 				ps.close(); //DBステートメントをクローズ
-				//例外処理
-			} catch (SQLException e) {
-				e.printStackTrace(); 
-			}
 		}
 	}
 	/*
@@ -90,13 +74,11 @@ public class DbUtil {
 	 * 例外			：SQLException
 	 * 処理			：引数のコネクションがnullでない場合、そのコネクションを切断する
 	 */
-	public static void closeConnection(Connection con) {
+	public static void closeConnection(Connection con) throws SQLException {
+		//コネクションの切断
 		if (con != null) {
-			try {
 				con.close(); //コネクション切断
-			} catch (SQLException e) {
-				e.printStackTrace(); 
 			}
 		}
 	}
-}
+