diff --git a/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java b/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java index 8eb4f49..c43ca57 100644 --- a/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java +++ b/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.security.SecureRandom; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; @@ -37,6 +38,7 @@ import geoinfo.admins.user.service.DrillingInquiryService; import geoinfo.admins.user.service.GeneralUserMngService; import geoinfo.admins.user.service.HomeTrainingService; import geoinfo.com.EgovExcel; +import geoinfo.comm.util.ScriptUtil; import geoinfo.comm.util.strUtil; import geoinfo.session.UserInfo; import geoinfo.util.ExcelMergeHeaderUtil; @@ -666,7 +668,87 @@ public class ConstructionProjectManagementController { return "admins/constructionProjectManagement/construction-user-mgmt-index"; } - + + /** + * 발주기관 계정등록 팝업 + * @param params + * @param model + * @param response + * @param request + * @return + * @throws Exception + */ + @RequestMapping(value = "admins/client/05_addUser.do") + public String showAddClientPopop(@RequestParam HashMap params, ModelMap model, HttpServletResponse response, HttpServletRequest request) throws Exception { + + if( !UserInfo.isValidSession(request, response, "admin")) { + return ""; + } + + // 지역 목록 + JSONObject jsonObj = new JSONObject(); + + List gDis = masterService.getUserGDisList(params); + jsonObj.put("gDis", gDis); + + model.put("result", jsonObj); + + return "admins/constructionProjectManagement/05_addUser"; + } + + /** + * 발주기관 계정등록 - 아이디 중복 체크 + * @param request + * @param params + * @param response + * @return + * @throws Exception + */ + @RequestMapping(value = "admins/client/duplChk.do", method = RequestMethod.POST, produces = { "application/json; charset=utf-8" }) + @ResponseBody + public Map clientDuplChk(HttpServletRequest request, @RequestParam HashMap params, HttpServletResponse response) throws Exception { + if (!UserInfo.isValidSession(request, response, "admin")) { + return null; + } + + Map result = new HashMap<>(); + + + EgovMap resultMap = masterService.selectInfoDuplClient(params); + result.put("duplCnt", resultMap.get("duplCnt")); + + return result; + } + + /** + * 발주기관 계정등록 + * @param request + * @param params + * @param response + * @return + * @throws Exception + */ + @RequestMapping(value = "admins/client/insert.do", method = RequestMethod.POST) + @ResponseBody + public Map insertClient(HttpServletRequest request, @RequestParam HashMap params, HttpServletResponse response) throws Exception { + if (!UserInfo.isValidSession(request, response, "admin")) { + return null; + } + strUtil sUtil = new strUtil(); + + String pass2 = ""; + String pass = sUtil.checkNull((String)params.get("passwd")); + + pass2 = ScriptUtil.getSha256(pass, "UTF-8").substring(0, 20); + params.put("encPasswd", pass2); + Map result = new HashMap<>(); + + int resultCnt = masterService.insertWebMemberInClient(params); + result.put("resultCnt", resultCnt); + + return result; + } + /** * 건설현장 관리 > 발주기관 계정 상세조회 화면 * @param params diff --git a/src/main/java/geoinfo/admins/user/service/GeneralUserMngMapper.java b/src/main/java/geoinfo/admins/user/service/GeneralUserMngMapper.java index 8181310..0051992 100644 --- a/src/main/java/geoinfo/admins/user/service/GeneralUserMngMapper.java +++ b/src/main/java/geoinfo/admins/user/service/GeneralUserMngMapper.java @@ -15,7 +15,11 @@ public interface GeneralUserMngMapper { public List selectInfoListExcel(HashMap params) throws Exception; public EgovMap selectInfo(HashMap params) throws Exception; + + public EgovMap selectInfoDuplClient(HashMap params) throws Exception; + public int insertWebMemberInClient(HashMap params) throws Exception; + public void selectAccessInfo(HashMap params) throws Exception; public void selectDeleteInfo(HashMap params) throws Exception; @@ -51,4 +55,6 @@ public interface GeneralUserMngMapper { public List selectUserLoginHistory(HashMap params) throws Exception; String findProjectMasterCompanyNameByUserid(String userId); + + List getUserGDisList(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/admins/user/service/GeneralUserMngService.java b/src/main/java/geoinfo/admins/user/service/GeneralUserMngService.java index 04d620e..b704c92 100644 --- a/src/main/java/geoinfo/admins/user/service/GeneralUserMngService.java +++ b/src/main/java/geoinfo/admins/user/service/GeneralUserMngService.java @@ -14,6 +14,10 @@ public interface GeneralUserMngService { public EgovMap selectInfo(HashMap params) throws Exception; + public EgovMap selectInfoDuplClient(HashMap params) throws Exception; + + public int insertWebMemberInClient(HashMap params) throws Exception; + public void selectAccessInfo(HashMap params) throws Exception; public void selectDeleteInfo(HashMap params) throws Exception; @@ -48,4 +52,6 @@ public interface GeneralUserMngService { public List selectUserLoginHistory(HashMap params) throws Exception; + public List getUserGDisList(HashMap params) throws Exception; + } diff --git a/src/main/java/geoinfo/admins/user/service/impl/GeneralUserMngServiceImpl.java b/src/main/java/geoinfo/admins/user/service/impl/GeneralUserMngServiceImpl.java index 70a8ec3..a189518 100644 --- a/src/main/java/geoinfo/admins/user/service/impl/GeneralUserMngServiceImpl.java +++ b/src/main/java/geoinfo/admins/user/service/impl/GeneralUserMngServiceImpl.java @@ -32,7 +32,17 @@ public class GeneralUserMngServiceImpl implements GeneralUserMngService { public EgovMap selectInfo(HashMap params) throws Exception { return masterMapper.selectInfo(params); } + + @Override + public EgovMap selectInfoDuplClient(HashMap params) throws Exception { + return masterMapper.selectInfoDuplClient(params); + } + @Override + public int insertWebMemberInClient(HashMap params) throws Exception { + return masterMapper.insertWebMemberInClient(params); + } + @Override public void selectAccessInfo(HashMap params) throws Exception { masterMapper.selectAccessInfo(params); @@ -118,4 +128,8 @@ public class GeneralUserMngServiceImpl implements GeneralUserMngService { return masterMapper.selectUserLoginHistory(params); } + @Override + public List getUserGDisList(HashMap params) throws Exception { + return masterMapper.getUserGDisList(params); + } } diff --git a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml index 8852056..f9ef750 100644 --- a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml +++ b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml @@ -141,6 +141,21 @@ ]]> + + + + INSERT INTO WEB_MEMBER_IN ( + USERID, PASSWD, USER_NAME, COMPANY_NAME, EMAIL, CLS, PROJECT_MASTER_COMPANY_CODE, LAST_LOGIN_DATE, LOGIN_COUNT, AGREEYN, ENCRYPT_CHANGE, LIQ_YN, GOVEMENT_CODE, CERTIFICATION_YN + ) VALUES( + #{userid}, #{encPasswd}, #{userName}, #{companyName}, #{email}, '2', #{projectMasterCompanyCode}, SYSDATE, 0, 'Y', 'Y', 'N', 0, 0 + ) + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05_addUser.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05_addUser.jsp index 0371af6..62e9b2f 100644 --- a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05_addUser.jsp +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05_addUser.jsp @@ -5,69 +5,221 @@ -사용자 추가 +국토지반정보 포털 관리시스템 - + +
@@ -197,6 +232,9 @@ $(function(){ +
+ +