diff --git a/pom.xml b/pom.xml index 7c26a6a9..eb5b5108 100644 --- a/pom.xml +++ b/pom.xml @@ -983,30 +983,31 @@ 1.0.0 + - org.springframework.session - spring-session-data-redis - 1.2.2.RELEASE - - - org.springframework.data - spring-data-redis - - - - - - org.springframework.data - spring-data-redis - 1.6.2.RELEASE - - - - redis.clients - jedis - 2.8.2 - + org.springframework.session + spring-session-data-redis + 1.2.2.RELEASE + + + org.springframework.data + spring-data-redis + + + + + org.springframework.data + spring-data-redis + 1.6.2.RELEASE + + + + redis.clients + jedis + 2.8.2 + + diff --git a/src/main/java/geoinfo/main/login/LoginController.java b/src/main/java/geoinfo/main/login/LoginController.java index 73f861a3..4b4d765c 100644 --- a/src/main/java/geoinfo/main/login/LoginController.java +++ b/src/main/java/geoinfo/main/login/LoginController.java @@ -332,19 +332,33 @@ public class LoginController { map.put("name", name); Map result = loginService.selectSearchPass(map); - Map resultByUserIdOrEmail = loginService.selectSearchPassByUserIdOrEmail(map); - map.put("DI", DI); - Map resultByDupinfo = loginService.selectSearchPassByDupinfo(map); + ArrayList> resultByUserIdOrEmailList = loginService.selectSearchPassByUserIdOrEmail(map); - if (result == null && resultByUserIdOrEmail == null) { + if( resultByUserIdOrEmailList.size() == 0 ) { mv.setViewName("body/account/pwNotFind"); - mv.addObject("msg", name + "님의 아이디는 등록되어있지 않습니다."); - } else if (result == null && resultByUserIdOrEmail != null) { + mv.addObject("msg", name + "님의 아이디는 등록되어있지 않습니다. '개인' 또는 '기업' 사용자 체크 부분도 확인바랍니다."); + return mv; + } + Map resultByUserIdOrEmail = resultByUserIdOrEmailList.get(0); + map.put("DI", DI); + + ArrayList> resultByDupinfoList = loginService.selectSearchPassByDupinfo(map); + + if( resultByDupinfoList.size() == 0 ) { + mv.setViewName("body/account/pwNotFind"); + mv.addObject("msg", name + "님의 모마일 인증으로 가입된 계정이 존재하지 않습니다."); + return mv; + } + Map resultByDupinfo = resultByDupinfoList.get(0); + + if (result == null && resultByUserIdOrEmail != null) { mv.setViewName("body/account/pwNotFind"); mv.addObject("msg", name + "님의 아이디 또는 이메일이 등록되어있지 않습니다."); + return mv; } else if (result == null && resultByDupinfo != null) { mv.setViewName("body/account/pwNotFind"); mv.addObject("msg", name + "님의 아이디 또는 이메일이 등록되어있지 않습니다.."); + return mv; } else { mv.setViewName("body/account/pass_post"); mv.addObject("hdnCertNum",hdnCertNum); @@ -352,27 +366,8 @@ public class LoginController { mv.addObject("userId", userId); mv.addObject("name", name); mv.addObject("cls", cls); + return mv; } - - /*if (result != null) { - mv.addObject("username", result.get("user_name")); - mv.addObject("userid", result.get("userid")); - mv.addObject("datetime", result.get("datetime")); - mv.addObject("passwd", result.get("passwd")); - - SecureRandom r = new SecureRandom(); - int l = r.nextInt(1000000000); - String newPass = Integer.toString(l); - System.out.println("rand===" + newPass); - - mv.addObject("script", "" + "" + "" + "" + "" - + "" + ""); - - } else { - mv.setViewName("body/account/pwNotFind"); - mv.addObject("msg", name + "님의 아이디는 등록되어있지 않습니다."); - }*/ - return mv; } @RequestMapping(value = "/searchPassch.do") diff --git a/src/main/java/geoinfo/main/login/service/LoginMapper.java b/src/main/java/geoinfo/main/login/service/LoginMapper.java index 63033f89..bad9acb4 100644 --- a/src/main/java/geoinfo/main/login/service/LoginMapper.java +++ b/src/main/java/geoinfo/main/login/service/LoginMapper.java @@ -1,5 +1,6 @@ package geoinfo.main.login.service; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -30,8 +31,8 @@ public interface LoginMapper { Map selectSearchPass(Map map); - Map selectSearchPassByUserIdOrEmail(Map map); - Map selectSearchPassByDupinfo(Map map); + ArrayList> selectSearchPassByUserIdOrEmail(Map map); + ArrayList> selectSearchPassByDupinfo(Map map); void updateSearchPassch(Map map); diff --git a/src/main/java/geoinfo/main/login/service/LoginService.java b/src/main/java/geoinfo/main/login/service/LoginService.java index 72da22be..d752f629 100644 --- a/src/main/java/geoinfo/main/login/service/LoginService.java +++ b/src/main/java/geoinfo/main/login/service/LoginService.java @@ -1,5 +1,6 @@ package geoinfo.main.login.service; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -22,8 +23,8 @@ public interface LoginService { Map selectSearchId(Map map) throws Exception; Map selectSearchIdByNameAndPhoneAndDupinfoIsNullAndCertificationYnFalse(Map map) throws Exception; Map selectSearchPass(Map map) throws Exception; - Map selectSearchPassByUserIdOrEmail(Map map) throws Exception; - Map selectSearchPassByDupinfo(Map map) throws Exception; + ArrayList> selectSearchPassByUserIdOrEmail(Map map) throws Exception; + ArrayList> selectSearchPassByDupinfo(Map map) throws Exception; void updateSearchPassch(Map map) throws Exception; int selectWebDownLoadLog(Map map); List> selectDownLoadContent(Map map); diff --git a/src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java b/src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java index 41e4b17d..c88ee286 100644 --- a/src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java +++ b/src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java @@ -8,6 +8,7 @@ import geoinfo.util.FileUtil; import java.io.FileNotFoundException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.HashMap; @@ -86,12 +87,12 @@ public class LoginServiceImpl implements LoginService{ } @Override - public Map selectSearchPassByUserIdOrEmail(Map map) throws Exception { + public ArrayList> selectSearchPassByUserIdOrEmail(Map map) throws Exception { return loginMapper.selectSearchPassByUserIdOrEmail(map); } @Override - public Map selectSearchPassByDupinfo(Map map) throws Exception { + public ArrayList> selectSearchPassByDupinfo(Map map) throws Exception { return loginMapper.selectSearchPassByDupinfo(map); } diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml index 7e066037..dcb8c5ea 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml @@ -187,8 +187,11 @@ SELECT CLS, USER_NAME, USERID, PASSWD, TO_CHAR(DATETIME,'YYYY-MM-DD') DATETIME, CERTIFICATION_YN FROM WEB_MEMBER_IN WHERE - TRIM(USERID) = TRIM(#{userId}) OR - TRIM(EMAIL) = TRIM(#{email}) + TRIM(CLS) = TRIM(#{cls}) AND + ( + TRIM(USERID) = TRIM(#{userId}) OR + TRIM(EMAIL) = TRIM(#{email}) + ) ]]> diff --git a/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry_project.jsp b/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry_project.jsp index 3863f9dc..00be64c8 100644 --- a/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry_project.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry_project.jsp @@ -274,7 +274,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe */ function handleRowClick(p_code) { if (!isDragging) { - openMapLoc(p_code); + onClickBtnViewOnMap(p_code); } } diff --git a/src/main/webapp/com/js/drilling/drilling-common.js b/src/main/webapp/com/js/drilling/drilling-common.js index 1899d12e..334487d0 100644 --- a/src/main/webapp/com/js/drilling/drilling-common.js +++ b/src/main/webapp/com/js/drilling/drilling-common.js @@ -1,4 +1,4 @@ -function onClickBtnViewOnMap() { +function onClickBtnViewOnMap(pCode = null) { const projectMasterCompanyName = '${mbr.projectMasterCompanyName}'; let projectCode = '${mbr.ProjectCode}'; @@ -17,24 +17,24 @@ function onClickBtnViewOnMap() { const lastTeamName = document.getElementById('last-team-name').value; const masterCompanyCode = document.getElementById('master-company-code').value; - openMap('${sessionScope.USERID}','${cls}', gl, gm, gs, gf, lastTeamName, projectMasterCompanyName, maxX-minX, maxY-minY, masterCompanyCode); + openMap('${sessionScope.USERID}','${cls}', gl, gm, gs, gf, lastTeamName, projectMasterCompanyName, maxX-minX, maxY-minY, masterCompanyCode, pCode); + } -function openMap(userid,cls, gl = null, gm = null, gs = null, gf = null, lastTeamName = null, projectMasterCompanyName = null, positionX= null, positionY= null, masterCompanyCode=null) +function openMap(userid,cls, gl = null, gm = null, gs = null, gf = null, lastTeamName = null, projectMasterCompanyName = null, positionX= null, positionY= null, masterCompanyCode=null, pCode=null) { win = 'map'; sizeX=window.screen.width; sizeY=window.screen.height; let userArea = projectMasterCompanyName; - if( userArea == null ) { - if( userid === 't3-1' ) { - userArea = "충청남도"; - } else if( userid === 't3-2' ) { - userArea = "부산광역시"; - } + let mapWin = null; + const url_base = "/map/mapMain.do?"; + let url = "userArea=" + encodeURIComponent(userArea) + "&gl=" + gl + "&gm=" + gm + "&gs=" + gs + "&gf=" + gf + "&lastTeamName=" + lastTeamName + "&masterCompanyCode=" + masterCompanyCode + "&positionX=" + positionX + "&positionY=" + positionY + "#tab_1_1"; + if( pCode ) { + url = "pcode=" + pCode + "&" + url; } - var mapWin = window.open("/map/mapMain.do?userArea=" + encodeURIComponent(userArea) + "&gl=" + gl + "&gm=" + gm + "&gs=" + gs + "&gf=" + gf + "&lastTeamName=" + lastTeamName + "&masterCompanyCode=" + masterCompanyCode + "&positionX=" + positionX + "&positionY=" + positionY + "#tab_1_1","mapWin","toolbar=no,location=no,directories=no,status=yes,menubar=no,scrollbars=yes,resizable=yes,width=" + sizeX + ",height=" + sizeY + ",left=0,top=0"); + mapWin = window.open(url_base + url,"mapWin","toolbar=no,location=no,directories=no,status=yes,menubar=no,scrollbars=yes,resizable=yes,width=" + sizeX + ",height=" + sizeY + ",left=0,top=0"); mapWin.focus(); }