diff --git a/hospital/.classpath b/hospital/.classpath index cc39f60..3b7e256 100644 --- a/hospital/.classpath +++ b/hospital/.classpath @@ -24,7 +24,7 @@ - + diff --git a/hospital/.settings/org.eclipse.jdt.core.prefs b/hospital/.settings/org.eclipse.jdt.core.prefs index a6fee6f..1541412 100644 --- a/hospital/.settings/org.eclipse.jdt.core.prefs +++ b/hospital/.settings/org.eclipse.jdt.core.prefs @@ -1,16 +1,117 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/hospital/src/main/java/UserJoin/UserJoinDao.java b/hospital/src/main/java/UserJoin/UserJoinDao.java index 129091d..f3c36c0 100644 --- a/hospital/src/main/java/UserJoin/UserJoinDao.java +++ b/hospital/src/main/java/UserJoin/UserJoinDao.java @@ -43,16 +43,24 @@ public class UserJoinDao extends BasicDao { UserJoinVo vo = null; try { - this.psmt = this.conn.prepareStatement("SELECT * FROM user_tbl WHERE id = ? and pw = ?"); - this.psmt.setString(1, member.getU_ID()); + this.psmt = this.conn.prepareStatement("SELECT * FROM user_tbl WHERE u_ID ='?' and u_psw ='?'"); + //this.psmt = this.conn.prepareStatement("SELECT u_ID, u_psw FROM user_tbl"); + + // while(this.rs.next()) { + // member = new UserJoinVo(); + //member.setU_ID(this.rs.getString("u_ID")); + //member.setU_psw(this.rs.getString("u_psw")); + //} + this.psmt.setString(1, member.getU_ID()); this.psmt.setString(2, member.getU_psw()); - this.rs = this.psmt.executeQuery(); + this.rs = this.psmt.executeQuery(); if (this.rs.next()) { - vo = new UserJoinVo(); + // 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); + String pw = this.rs.getString("u_psw"); + vo = new UserJoinVo(id, pw); // 이거 왜 이러냐 개샤ㅐ끼야 + //vo.setU_ID(id); + //vo.setU_psw(pw); } } catch (SQLException var5) { var5.printStackTrace(); diff --git a/hospital/src/main/java/UserJoin/UserJoinVo.java b/hospital/src/main/java/UserJoin/UserJoinVo.java index 1a8a0bb..9db5ac5 100644 --- a/hospital/src/main/java/UserJoin/UserJoinVo.java +++ b/hospital/src/main/java/UserJoin/UserJoinVo.java @@ -12,6 +12,8 @@ public class UserJoinVo { public String u_divi; public String u_car_num; + + public String getU_ID() { return u_ID; } diff --git a/hospital/src/main/java/command/UserLoginCheckCommand.java b/hospital/src/main/java/command/UserLoginCheckCommand.java new file mode 100644 index 0000000..60ac37c --- /dev/null +++ b/hospital/src/main/java/command/UserLoginCheckCommand.java @@ -0,0 +1,34 @@ +package command; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import UserJoin.UserJoinDao; +import UserJoin.UserJoinVo; + +public class UserLoginCheckCommand implements Command { + + public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + UserJoinDao dao = new UserJoinDao(); + UserJoinVo member = null; + String id = request.getParameter("u_ID"); + String pw = request.getParameter("u_psw"); + System.out.println("u_ID : " + id); + System.out.println("u_psw : " + pw); + id = id.trim(); + pw = pw.trim(); + member = dao.selectMember(member); + request.setAttribute("member", member); + String path; + if (member != null) { + path = "loginOk.jsp"; + } else { + path = "loginFail.jsp"; + } + + return path; + } +} diff --git a/hospital/src/main/java/controller/Fcontroller.java b/hospital/src/main/java/controller/Fcontroller.java index 4d5a1f3..6ace557 100644 --- a/hospital/src/main/java/controller/Fcontroller.java +++ b/hospital/src/main/java/controller/Fcontroller.java @@ -15,6 +15,7 @@ import command.BoardViewCommand; import command.Command; import command.HomeCommand; import command.UserJoinCommand; +import command.UserLoginCheckCommand; import command.UserLoginCommand; import command.UserRegCommand; import command.patientJoinCommand; @@ -40,6 +41,7 @@ public class Fcontroller extends HttpServlet { list.put("/UserReg.do", new UserRegCommand()); // 임직원 회원가입 페이지 list.put ("/patientJoin.do", new patientJoinCommand()); // 환자 회원가입 페이지 list.put("/boardView.do", new BoardViewCommand()); // 데이터 보기 test 페이지 + list.put("/loginCheck.do", new UserLoginCheckCommand()); //이 부분에 계속적으로 매핑을 추가하면 됨 } diff --git a/hospital/src/main/java/patientJoin/patientJoinDao.java b/hospital/src/main/java/patientJoin/patientJoinDao.java new file mode 100644 index 0000000..86874e7 --- /dev/null +++ b/hospital/src/main/java/patientJoin/patientJoinDao.java @@ -0,0 +1,5 @@ +package patientJoin; + +public class patientJoinDao { + +} diff --git a/hospital/src/main/java/patientJoin/patientJoinVo.java b/hospital/src/main/java/patientJoin/patientJoinVo.java new file mode 100644 index 0000000..e88ac7b --- /dev/null +++ b/hospital/src/main/java/patientJoin/patientJoinVo.java @@ -0,0 +1,5 @@ +package patientJoin; + +public class patientJoinVo { + +} diff --git a/hospital/src/main/java/user/UserDao.java b/hospital/src/main/java/user/UserDao.java deleted file mode 100644 index 78b6fe6..0000000 --- a/hospital/src/main/java/user/UserDao.java +++ /dev/null @@ -1,77 +0,0 @@ -package user; - -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/java/user/UserVo.java b/hospital/src/main/java/user/UserVo.java deleted file mode 100644 index 9e2ca1b..0000000 --- a/hospital/src/main/java/user/UserVo.java +++ /dev/null @@ -1,5 +0,0 @@ -package user; - -public class UserVo { - -} diff --git a/hospital/src/main/webapp/UserJoin.jsp b/hospital/src/main/webapp/UserJoin.jsp index 8ff6862..998b509 100644 --- a/hospital/src/main/webapp/UserJoin.jsp +++ b/hospital/src/main/webapp/UserJoin.jsp @@ -86,11 +86,11 @@ 성별
- +
- +
diff --git a/hospital/src/main/webapp/UserLogin.jsp b/hospital/src/main/webapp/UserLogin.jsp index 71cec63..21ddae1 100644 --- a/hospital/src/main/webapp/UserLogin.jsp +++ b/hospital/src/main/webapp/UserLogin.jsp @@ -24,9 +24,9 @@

임직원 로그인

- + - +