diff --git a/hospital/src/main/java/UserJoin/UserJoinDao.java b/hospital/src/main/java/UserJoin/UserJoinDao.java
index a155331..129091d 100644
--- a/hospital/src/main/java/UserJoin/UserJoinDao.java
+++ b/hospital/src/main/java/UserJoin/UserJoinDao.java
@@ -4,28 +4,32 @@ import java.sql.SQLException;
import java.util.ArrayList;
import DB.BasicDao;
-import DB.MemberVo;
+import UserJoin.UserJoinVo;
public class UserJoinDao extends BasicDao {
- private final String MEMBER_LIST = "SELECT * FROM member";
- private final String MEMBER_CHECK = "SELECT * FROM member WHERE id = ? and pw = ?";
- private final String MEMBER_INSERT = "INSERT into member values(?,?,?,?,?,?,?)";
+ private final String UserJoin_LIST = "SELECT * FROM user_tbl";
+ private final String UserJoin_CHECK = "SELECT * FROM user_tbl WHERE u_ID = ? and u_psw = ?";
+ private final String UserJoin_INSERT = "INSERT into user_tbl values(?,?,?,?,?,?,?)";
- public ArrayList select() {
+ public ArrayList select() {
ArrayList list = new ArrayList();
try {
- this.psmt = this.conn.prepareStatement("SELECT * FROM member");
+ this.psmt = this.conn.prepareStatement("SELECT * FROM user_tbl");
this.rs = this.psmt.executeQuery();
while(this.rs.next()) {
- MemberVo member = new MemberVo();
- member.setId(this.rs.getString("ID"));
- member.setName(this.rs.getString("NAME"));
- member.setAddr(this.rs.getString("ADDR"));
- member.setTel(this.rs.getString("TEL"));
- member.setGender(this.rs.getString("GENDER"));
- member.setHobby(this.rs.getString("HOBBY"));
+ UserJoinVo member = new UserJoinVo();
+ member.setU_ID(this.rs.getString("u_ID"));
+ member.setU_name(this.rs.getString("u_name"));
+ member.setU_addr(this.rs.getString("u_addr"));
+ member.setU_phone(this.rs.getString("u_phone"));
+ member.setU_gender(this.rs.getString("u_gender"));
+ member.setU_post(this.rs.getString("u_post"));
+ member.setU_divi(this.rs.getString("u_divi"));
+ member.setU_birth(this.rs.getString("u_birth"));
+ member.setU_car_num(this.rs.getString("u_car_num"));
+
list.add(member);
}
} catch (SQLException var3) {
@@ -35,18 +39,20 @@ public class UserJoinDao extends BasicDao {
return list;
}
- public MemberVo selectMember(MemberVo member) {
- MemberVo vo = null;
+ public UserJoinVo selectMember(UserJoinVo member) {
+ UserJoinVo vo = null;
try {
- this.psmt = this.conn.prepareStatement("SELECT * FROM member WHERE id = ? and pw = ?");
- this.psmt.setString(1, member.getId());
- this.psmt.setString(2, member.getPw());
+ this.psmt = this.conn.prepareStatement("SELECT * FROM user_tbl WHERE id = ? and pw = ?");
+ this.psmt.setString(1, member.getU_ID());
+ this.psmt.setString(2, member.getU_psw());
this.rs = this.psmt.executeQuery();
if (this.rs.next()) {
- String id = this.rs.getString("id");
- String pw = this.rs.getString("pw");
- vo = new MemberVo(id, pw);
+ vo = new UserJoinVo();
+ String id = this.rs.getString("u_ID");
+ String pw = this.rs.getString("u_pwd");
+ vo.setU_ID(id);
+ vo.setU_psw(pw);
}
} catch (SQLException var5) {
var5.printStackTrace();
@@ -55,18 +61,21 @@ public class UserJoinDao extends BasicDao {
return vo;
}
- public int memberInsert(MemberVo member) {
+ public int memberInsert(UserJoinVo member) {
int n = 0;
try {
- this.psmt = this.conn.prepareStatement("INSERT into member values(?,?,?,?,?,?,?)");
- this.psmt.setString(1, member.getId());
- this.psmt.setString(2, member.getName());
- this.psmt.setString(3, member.getPw());
- this.psmt.setString(4, member.getAddr());
- this.psmt.setString(5, member.getTel());
- this.psmt.setString(6, member.getGender());
- this.psmt.setString(7, member.getHobby());
+ this.psmt = this.conn.prepareStatement("INSERT into user_tbl(u_ID,u_psw,u_divi,u_post,u_name,u_birth,u_gender,u_phone,u_addr,u_car_num) values(?,?,?,?,?,?,?,?,?,?)");
+ this.psmt.setString(1, member.getU_ID());
+ this.psmt.setString(2, member.getU_psw());
+ this.psmt.setString(3, member.getU_divi());
+ this.psmt.setString(4, member.getU_post());
+ this.psmt.setString(5, member.getU_name());
+ this.psmt.setString(6, member.getU_birth());
+ this.psmt.setString(7, member.getU_gender());
+ this.psmt.setString(8, member.getU_phone());
+ this.psmt.setString(9, member.getU_addr());
+ this.psmt.setString(10, member.getU_car_num());
n = this.psmt.executeUpdate();
} catch (SQLException var4) {
var4.printStackTrace();
diff --git a/hospital/src/main/java/UserJoin/UserJoinVo.java b/hospital/src/main/java/UserJoin/UserJoinVo.java
index 27a4945..1a8a0bb 100644
--- a/hospital/src/main/java/UserJoin/UserJoinVo.java
+++ b/hospital/src/main/java/UserJoin/UserJoinVo.java
@@ -8,75 +8,89 @@ public class UserJoinVo {
public String u_phone;
public String u_gender;
public String u_post;
- public Date u_birth;
+ public String u_birth;
public String u_divi;
public String u_car_num;
- public UserJoinVo(String id, String pw) {
- this.id = id;
- this.pw = pw;
- }
+ public String getU_ID() {
+ return u_ID;
+ }
- public String getName() {
- return this.name;
- }
+ public void setU_ID(String u_ID) {
+ this.u_ID = u_ID;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public String getU_name() {
+ return u_name;
+ }
- public String getAddr() {
- return this.addr;
- }
+ public void setU_name(String u_name) {
+ this.u_name = u_name;
+ }
- public void setAddr(String addr) {
- this.addr = addr;
- }
+ public String getU_psw() {
+ return u_psw;
+ }
- public String getTel() {
- return this.tel;
- }
+ public void setU_psw(String u_psw) {
+ this.u_psw = u_psw;
+ }
- public void setTel(String tel) {
- this.tel = tel;
- }
+ public String getU_addr() {
+ return u_addr;
+ }
- public String getGender() {
- return this.gender;
- }
+ public void setU_addr(String u_addr) {
+ this.u_addr = u_addr;
+ }
- public void setGender(String gender) {
- this.gender = gender;
- }
+ public String getU_phone() {
+ return u_phone;
+ }
- public String getHobby() {
- return this.hobby;
- }
+ public void setU_phone(String u_phone) {
+ this.u_phone = u_phone;
+ }
- public void setHobby(String hobby) {
- this.hobby = hobby;
- }
+ public String getU_gender() {
+ return u_gender;
+ }
- public String getId() {
- return this.id;
- }
+ public void setU_gender(String u_gender) {
+ this.u_gender = u_gender;
+ }
- public void setId(String id) {
- this.id = id;
- }
+ public String getU_post() {
+ return u_post;
+ }
- public String getPw() {
- return this.pw;
- }
+ public void setU_post(String u_post) {
+ this.u_post = u_post;
+ }
+
+ public String getU_birth() {
+ return u_birth;
+ }
+
+ public void setU_birth(String u_birth) {
+ this.u_birth = u_birth;
+ }
+
+ public String getU_divi() {
+ return u_divi;
+ }
+
+ public void setU_divi(String u_divi) {
+ this.u_divi = u_divi;
+ }
+
+ public String getU_car_num() {
+ return u_car_num;
+ }
+
+ public void setU_car_num(String u_car_num) {
+ this.u_car_num = u_car_num;
+ }
- public void setPw(String pw) {
- this.pw = pw;
- }
- public void setData(String u_birth)
- {
-
- }
- public String u_divi;
- public String u_car_num;
}
diff --git a/hospital/src/main/java/command/UserJoinCommand.java b/hospital/src/main/java/command/UserJoinCommand.java
index 01f44cc..71901c2 100644
--- a/hospital/src/main/java/command/UserJoinCommand.java
+++ b/hospital/src/main/java/command/UserJoinCommand.java
@@ -6,50 +6,57 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import DB.MemberDao;
-import DB.MemberVo;
+import UserJoin.UserJoinDao;
+import UserJoin.UserJoinVo;
public class UserJoinCommand implements Command {
public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- String id = request.getParameter("u_ID");
- String name = request.getParameter("u_name");
- String pw = request.getParameter("u_psw");
- String addr = request.getParameter("addr");
- String tel = request.getParameter("tel");
- String gender = request.getParameter("gender");
- String[] hobbies = request.getParameterValues("hobby");
- String hobbyString = "";
+ String u_ID = request.getParameter("u_ID");
+ String u_name = request.getParameter("u_name");
+ String u_psw = request.getParameter("u_psw");
+ String u_addr = request.getParameter("u_addr");
+ String u_phone = request.getParameter("u_phone");
+ String u_gender = request.getParameter("u_gender");
+ String u_divi = request.getParameter("u_divi");
+ String u_birth = request.getParameter("u_birth");
+ String u_car_num = request.getParameter("u_car_num");
+ String[] u_post = request.getParameterValues("u_post");
+ String u_postString = "";
int n;
String path;
- if (hobbies != null) {
- String[] var11 = hobbies;
- int var12 = hobbies.length;
+ if (u_post != null) {
+ String[] var11 = u_post;
+ int var12 = u_post.length;
for(n = 0; n < var12; ++n) {
path = var11[n];
- hobbyString = hobbyString + path;
- hobbyString = hobbyString + ":";
+ u_postString = u_postString + path;
+ u_postString = u_postString + ":";
}
- hobbyString = hobbyString.substring(0, hobbyString.length() - 1);
+ u_postString = u_postString.substring(0, u_postString.length() - 1);
}
- MemberVo member = new MemberVo();
- member.setId(id);
- member.setName(name);
- member.setPw(pw);
- member.setAddr(addr);
- member.setTel(tel);
- member.setGender(gender);
- member.setHobby(hobbyString);
- MemberDao dao = new MemberDao();
+ UserJoinVo member = new UserJoinVo();
+ member.setU_ID(u_ID);
+ member.setU_psw(u_psw);
+ member.setU_name(u_name);
+ member.setU_addr(u_addr);
+ member.setU_phone(u_phone);
+ member.setU_gender(u_gender);
+ member.setU_post(u_postString);
+ member.setU_divi(u_divi);
+ member.setU_birth(u_birth);
+ member.setU_car_num(u_car_num);
+
+ UserJoinDao dao = new UserJoinDao();
n = dao.memberInsert(member);
if (n != 0) {
- request.setAttribute("joinName", name);
- path = "views/student/joinOk.jsp";
+ request.setAttribute("joinName", u_name);
+ path = "joinOk.jsp";
} else {
- path = "views/student/joinFail.jsp";
+ path = "joinFail.jsp";
}
return path;
diff --git a/hospital/src/main/java/command/UserRegCommand.java b/hospital/src/main/java/command/UserRegCommand.java
new file mode 100644
index 0000000..2c1a3d6
--- /dev/null
+++ b/hospital/src/main/java/command/UserRegCommand.java
@@ -0,0 +1,17 @@
+package command;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class UserRegCommand implements Command {
+ @Override
+ public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
+ //TODO : DB작업 필요
+
+
+ return "UserJoin.jsp";
+ }
+}
diff --git a/hospital/src/main/java/controller/Fcontroller.java b/hospital/src/main/java/controller/Fcontroller.java
index f225cb4..4d5a1f3 100644
--- a/hospital/src/main/java/controller/Fcontroller.java
+++ b/hospital/src/main/java/controller/Fcontroller.java
@@ -16,6 +16,7 @@ import command.Command;
import command.HomeCommand;
import command.UserJoinCommand;
import command.UserLoginCommand;
+import command.UserRegCommand;
import command.patientJoinCommand;
import command.patientLoginCommand;
@@ -35,7 +36,8 @@ public class Fcontroller extends HttpServlet {
list.put("/home.do", new HomeCommand()); //처음 보여주는 페이지;
list.put("/UserLogin.do", new UserLoginCommand()); // 임직원 로그인 처리
list.put("/patientlogin.do", new patientLoginCommand()); // 환자 로그인 처리
- list.put ("/UserJoin.do", new UserJoinCommand()); // 임직원 회원가입 페이지
+ list.put("/UserJoin.do", new UserJoinCommand()); // 임직원 로그인 페이지
+ list.put("/UserReg.do", new UserRegCommand()); // 임직원 회원가입 페이지
list.put ("/patientJoin.do", new patientJoinCommand()); // 환자 회원가입 페이지
list.put("/boardView.do", new BoardViewCommand()); // 데이터 보기 test 페이지
//이 부분에 계속적으로 매핑을 추가하면 됨
diff --git a/hospital/src/main/java/user/UserDao.java b/hospital/src/main/java/user/UserDao.java
index f82c725..78b6fe6 100644
--- a/hospital/src/main/java/user/UserDao.java
+++ b/hospital/src/main/java/user/UserDao.java
@@ -1,5 +1,77 @@
package user;
-public class UserDao {
+import java.sql.SQLException;
+import java.util.ArrayList;
-}
+import DB.BasicDao;
+import user.UserVo;
+
+public class UserDao extends BasicDao {
+ private final String MEMBER_LIST = "SELECT * FROM member";
+ private final String MEMBER_CHECK = "SELECT * FROM member WHERE id = ? and pw = ?";
+ private final String MEMBER_INSERT = "INSERT into member values(?,?,?,?,?,?,?)";
+
+ public ArrayList select() {
+ ArrayList list = new ArrayList();
+
+ try {
+ this.psmt = this.conn.prepareStatement("SELECT * FROM member");
+ this.rs = this.psmt.executeQuery();
+
+ while(this.rs.next()) {
+ UserVo member = new UserVo();
+ member.setId(this.rs.getString("ID"));
+ member.setName(this.rs.getString("NAME"));
+ member.setAddr(this.rs.getString("ADDR"));
+ member.setTel(this.rs.getString("TEL"));
+ member.setGender(this.rs.getString("GENDER"));
+ member.setHobby(this.rs.getString("HOBBY"));
+ list.add(member);
+ }
+ } catch (SQLException var3) {
+ var3.printStackTrace();
+ }
+
+ return list;
+ }
+
+ public UserVo selectUser(UserVo user) {
+ UserVo vo = null;
+
+ try {
+ this.psmt = this.conn.prepareStatement("SELECT * FROM member WHERE id = ? and pw = ?");
+ this.psmt.setString(1, user.getu_ID());
+ this.psmt.setString(2, user.getPw());
+ this.rs = this.psmt.executeQuery();
+ if (this.rs.next()) {
+ String id = this.rs.getString("id");
+ String pw = this.rs.getString("pw");
+ vo = new userVo(id, pw);
+ }
+ } catch (SQLException var5) {
+ var5.printStackTrace();
+ }
+
+ return vo;
+ }
+
+ public int memberInsert(MemberVo member) {
+ int n = 0;
+
+ try {
+ this.psmt = this.conn.prepareStatement("INSERT into member values(?,?,?,?,?,?,?)");
+ this.psmt.setString(1, member.getId());
+ this.psmt.setString(2, member.getName());
+ this.psmt.setString(3, member.getPw());
+ this.psmt.setString(4, member.getAddr());
+ this.psmt.setString(5, member.getTel());
+ this.psmt.setString(6, member.getGender());
+ this.psmt.setString(7, member.getHobby());
+ n = this.psmt.executeUpdate();
+ } catch (SQLException var4) {
+ var4.printStackTrace();
+ }
+
+ return n;
+ }
+}
\ No newline at end of file
diff --git a/hospital/src/main/webapp/error404.jsp b/hospital/src/main/webapp/error404.jsp
new file mode 100644
index 0000000..ea39e50
--- /dev/null
+++ b/hospital/src/main/webapp/error404.jsp
@@ -0,0 +1,16 @@
+<%--
+ Created by IntelliJ IDEA.
+ User: User
+ Date: 2020-03-24
+ Time: 오전 9:19
+ To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+ 404에러입니다
+
+
+
페이지 경로가 정확하지 않습니다
+
+
diff --git a/hospital/src/main/webapp/error500.jsp b/hospital/src/main/webapp/error500.jsp
new file mode 100644
index 0000000..4fd7999
--- /dev/null
+++ b/hospital/src/main/webapp/error500.jsp
@@ -0,0 +1,16 @@
+<%--
+ Created by IntelliJ IDEA.
+ User: User
+ Date: 2020-03-24
+ Time: 오전 9:20
+ To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+ 500에러입니다
+
+
+
문제가 발생하였습니다
+
+
diff --git a/hospital/src/main/webapp/home.jsp b/hospital/src/main/webapp/home.jsp
index 9bf94bc..c235542 100644
--- a/hospital/src/main/webapp/home.jsp
+++ b/hospital/src/main/webapp/home.jsp
@@ -7,7 +7,7 @@
병원 관리 시스템
A 병원
-
+
diff --git a/hospital/src/main/webapp/index.jsp b/hospital/src/main/webapp/index.jsp
index ead8ab9..59f6e7b 100644
--- a/hospital/src/main/webapp/index.jsp
+++ b/hospital/src/main/webapp/index.jsp
@@ -5,7 +5,7 @@
병원 관리 시스템
-
+