From 1fbcbff10dbe3bfb2382be5e316081f152d84e00 Mon Sep 17 00:00:00 2001
From: myname
Date: Wed, 30 Oct 2024 09:25:29 +0900
Subject: [PATCH] # WARNING: head commit changed in the meantime
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-10-30 관리자 로그 수정
---
.../log/clg/web/EgovLoginLogController.java | 17 +
.../user/check/WebUserCheckController.java | 337 ++++++++++++++++++
.../user/counsel/WebCounselController.java | 179 +++++++++-
.../user/onlineCounsel/lawCounselStep02.jsp | 42 ++-
.../user/onlineCounsel/lawCounselStep03.jsp | 81 +++++
.../web/user/onlineCounsel/lawWrite.jsp | 174 +++++++--
.../jsp/sym/log/clg/EgovLoginLogList.jsp | 76 +---
.../jsp/sym/log/clg/NSelectWebLogList.jsp | 78 +---
8 files changed, 826 insertions(+), 158 deletions(-)
create mode 100644 src/main/java/seed/com/user/check/WebUserCheckController.java
create mode 100644 src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/lawCounselStep03.jsp
diff --git a/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java b/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java
index 616f8960..fc79847e 100644
--- a/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java
+++ b/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java
@@ -110,11 +110,28 @@ public class EgovLoginLogController {
loginLog.setSearchSortOrd("desc");
}
List adminLogList = loginLogService.selectAmdinLog(loginLog);
+
+ int adminLogListCnt = 0;
+
+ if (adminLogList.size()>0) {
+ adminLogListCnt = adminLogList.get(0).getTotCnt();
+ }
+
+ paginationInfo.setTotalRecordCount(adminLogListCnt);
+ model.addAttribute("paginationInfo", paginationInfo);
+ model.addAttribute("adminLogList", adminLogList);
+
+ /*
int adminLogListCnt = loginLogService.selectAmdinLogTotCnt(loginLog);
paginationInfo.setTotalRecordCount(adminLogListCnt);
model.addAttribute("paginationInfo", paginationInfo);
model.addAttribute("adminLogList", adminLogList);
+ */
return "sym/log/clg/EgovLoginLogList";
+
+
+
+
}
/**
diff --git a/src/main/java/seed/com/user/check/WebUserCheckController.java b/src/main/java/seed/com/user/check/WebUserCheckController.java
new file mode 100644
index 00000000..84c92775
--- /dev/null
+++ b/src/main/java/seed/com/user/check/WebUserCheckController.java
@@ -0,0 +1,337 @@
+package seed.com.user.check;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.Random;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.sci.v2.ipin.secu.SciSecuManager;
+import com.sci.v2.ipin.secu.hmac.SciHmac;
+
+import kcc.com.utl.fcc.service.EgovNumberUtil;
+import kcc.com.utl.fcc.service.EgovStringUtil;
+import seed.utils.SeedUtils;
+
+@Controller
+public class WebUserCheckController {
+
+ @RequestMapping("/web/user/case/userCheck/setCheckCode/check.do")
+ public String setCheckCodeAndRedirect(ModelMap map, HttpServletRequest req, HttpServletResponse response, HttpSession session, @RequestParam Map paramMap){
+
+ String nextUrl = req.getParameter("nextUrl");
+ String commandCode = req.getParameter("commandCode");
+
+ String srvNo = "";
+ String hpSrvNo = "";
+ String agreeCheck = "";
+ String personalCheck = "";
+ String mediType = "";
+ String retUrl = "";//아이핀 인증후 리턴 페이지
+ String hpRetUrl = "";//모바일 인증후 리턴 페이지
+
+ String sServerName = req.getServerName();
+
+ if(commandCode.equals("medi")){//분쟁조정신청 본인인증
+
+ //개발서버
+// srvNo = "007001";// 아이핀 코드
+// hpSrvNo = "008001";//휴대폰 코드
+
+ //실서버
+ srvNo = "009001";// 아이핀 코드
+ hpSrvNo = "012001";//휴대폰 코드
+
+ agreeCheck = req.getParameter("agreeCheck");
+ personalCheck = req.getParameter("personalCheck");
+ mediType = req.getParameter("mediType");
+
+ //개발서버
+// retUrl = "23http://ServerName:8080/user/extra/case/siren/ipin_popup_seed/jsp/Page.do";
+// retUrl = retUrl.replaceAll("ServerName", sServerName);
+
+// hpRetUrl = "32http://ServerName:8080/user/extra/case/siren/hpParamPop/jsp/Page.do";
+// hpRetUrl = hpRetUrl.replaceAll("ServerName", sServerName);
+
+ //실서버
+ retUrl = "23http://fairnet.kofair.or.kr/web/user/extra/case/siren/ipin_popup_seed/jsp/Page.do";
+// retUrl = retUrl.replaceAll("ServerName", sServerName);
+
+ hpRetUrl = "32http://fairnet.kofair.or.kr/web/user/extra/case/siren/hpParamPop/jsp/Page.do";
+// hpRetUrl = hpRetUrl.replaceAll("ServerName", sServerName);
+
+ session.setAttribute("agreeCheck", agreeCheck);
+ session.setAttribute("personalCheck", personalCheck);
+ session.setAttribute("mediType", mediType);
+ //hpName존재하면 이미 본인인증을 거쳤기 때문에 다음으로 바로 넘어간다.
+ if(!SeedUtils.setReplaceNull(session.getAttribute("hpName")).equals("")){
+// nextUrl = "/user/mediation/case/05/154/mediationStep04Ftc.do";
+ nextUrl = "/web/user/mediation/case/05/154/mediationStep04.do";
+ }
+ }else if(commandCode.equals("my")){//마이페이지 본인인증
+ //개발서버
+// srvNo = "007002";
+// hpSrvNo = "008002";
+
+ //실서버
+ srvNo = "009002";
+ hpSrvNo = "012002";
+
+ //개발서버
+// retUrl = "23http://ServerName:8080/user/extra/case/siren/myPage_ipin_popup_seed/jsp/Page.do";
+// retUrl = retUrl.replaceAll("ServerName", sServerName);
+
+// hpRetUrl = "32http://ServerName:8080/user/extra/case/siren/myPage_hpParamPop/jsp/Page.do";
+// hpRetUrl = hpRetUrl.replaceAll("ServerName", sServerName);
+
+ //실서버
+ retUrl = "23http://fairnet.kofair.or.kr/web/user/extra/case/siren/myPage_ipin_popup_seed/jsp/Page.do";
+// retUrl = retUrl.replaceAll("ServerName", sServerName);
+
+ hpRetUrl = "32http://fairnet.kofair.or.kr/web/user/extra/case/siren/myPage_hpParamPop/jsp/Page.do";
+// hpRetUrl = hpRetUrl.replaceAll("ServerName", sServerName);
+
+ }else if(commandCode.equals("online")){//온라인 분쟁조정 상담 본인인증
+ //개발서버
+ srvNo = "007003";
+ hpSrvNo = "008003";
+
+ //실서버
+// srvNo = "009003";
+// hpSrvNo = "012003";
+
+ personalCheck = req.getParameter("personalCheck");
+ session.setAttribute("personalCheck", personalCheck);
+
+ //개발서버
+// retUrl = "23http://ServerName:8080/user/extra/case/siren/onlineCounsel_ipin_popup_seed/jsp/Page.do";
+// retUrl = retUrl.replaceAll("ServerName", sServerName);
+
+// hpRetUrl = "32http://ServerName:8080/user/extra/case/siren/onlineCounsel_hpParamPop/jsp/Page.do";
+// hpRetUrl = hpRetUrl.replaceAll("ServerName", sServerName);
+
+ //실서버
+ retUrl = "23http://fairnet.kofair.or.kr/web/user/extra/case/siren/onlineCounsel_ipin_popup_seed/jsp/Page.do";
+
+ hpRetUrl = "32http://fairnet.kofair.or.kr/web/user/extra/case/siren/onlineCounsel_hpParamPop/jsp/Page.do";
+
+ //hpName존재하면 이미 본인인증을 거쳤기 때문에 다음으로 바로 넘어간다.
+ if(!SeedUtils.setReplaceNull(session.getAttribute("hpName")).equals("")){
+ nextUrl = "/web/user/onlineCounsel/case/01/158/write.do";
+ }
+ }else if(commandCode.equals("law")){
+ //개발서버
+// srvNo = "007004";
+// hpSrvNo = "008005";
+
+ //실서버
+ srvNo = "009004";
+ hpSrvNo = "012004";
+
+ personalCheck = req.getParameter("personalCheck");
+ session.setAttribute("personalCheck", personalCheck);
+
+ //개발서버
+// retUrl = "23http://ServerName:8080/user/extra/case/siren/lawCounsel_ipin_popup_seed/jsp/Page.do";
+// retUrl = retUrl.replaceAll("ServerName", sServerName);
+
+// hpRetUrl = "32http://ServerName:8080/user/extra/case/siren/lawCounsel_hpParamPop/jsp/Page.do";
+// hpRetUrl = hpRetUrl.replaceAll("ServerName", sServerName);
+
+
+ //실서버
+ retUrl = "23http://fairnet.kofair.or.kr/web/user/extra/case/siren/lawCounsel_ipin_popup_seed/jsp/Page.do";
+
+ hpRetUrl = "32http://fairnet.kofair.or.kr/web/user/extra/case/siren/lawCounsel_hpParamPop/jsp/Page.do";
+
+ //hpName존재하면 이미 본인인증을 거쳤기 때문에 다음으로 바로 넘어간다.
+ if(!SeedUtils.setReplaceNull(session.getAttribute("hpName")).equals("")){
+ nextUrl = "/web/user/lawCounsel/case/02/159/lawWrite.do";
+ }
+ }else if(commandCode.equals("medi_check")){
+ //개발서버
+// srvNo = "007005";
+// hpSrvNo = "008006";
+
+ //실서버
+ srvNo = "009005";
+ hpSrvNo = "012005";
+
+ String caseNo = req.getParameter("caseNo");
+ String checkPass = req.getParameter("checkPass");
+
+ session.setAttribute("caseNo", caseNo);
+ session.setAttribute("checkPass", checkPass);
+
+ //개발서버
+// retUrl = "23http://ServerName:8080/user/extra/case/siren/checkMedi_ipin_popup_seed/jsp/Page.do";
+// retUrl = retUrl.replaceAll("ServerName", sServerName);
+
+// hpRetUrl = "32http://ServerName:8080/user/extra/case/siren/checkMedi_hpParamPop/jsp/Page.do";
+// hpRetUrl = hpRetUrl.replaceAll("ServerName", sServerName);
+
+
+ //실서버
+ retUrl = "23http://fairnet.kofair.or.kr/web/user/extra/case/siren/checkMedi_ipin_popup_seed/jsp/Page.do";
+
+ hpRetUrl = "32http://fairnet.kofair.or.kr/web/user/extra/case/siren/checkMedi_hpParamPop/jsp/Page.do";
+
+ //hpName존재하면 이미 본인인증을 거쳤기 때문에 다음으로 바로 넘어간다.
+ /* if(!SeedUtils.setReplaceNull(session.getAttribute("hpName")).equals("")){
+ nextUrl = "/user/mediation/case/03/155/checkMediationStep03.do";
+ }*/
+ }
+
+ //나중에 메인 페이지 나오면 튕겨내기
+ if(nextUrl == null || agreeCheck == null){
+ map.put("siteIdx", "case");
+ map.put("url", "/case/index.do");
+ map.put("message", "잘못된 접근 입니다.");
+ map.put("opener", "");
+ map.put("append", "");
+ map.put("self", "");
+
+ return "/_common/jsp/umessage";
+ }
+
+
+ /**
+ * 아이핀 인증 시작 */
+
+ //String sServerName = req.getServerName();
+
+ //회원사 ID : KFA001
+ String id = "KFA001";
+ //회원가입화면용 결과 수신 URL : 23http:/211.43.219.170/hp/meb/pinSignupView.do
+ //String retUrl = "23http://ServerName/user/extra/case/siren/ipin_popup_seed/jsp/Page.do";
+ //retUrl = retUrl.replaceAll("ServerName", sServerName);
+ //분쟁조정신청 서비스 번호 : 006001
+ // String srvNo = "006001";
+ //요청번호(유닉크한 랜덤값) : 40 byte까지
+ String reqNum = "kofair" + EgovStringUtil.getTimeStamp() + EgovNumberUtil.getRandomNum(1000, 9999);
+
+ session.setAttribute("id", id);
+ session.setAttribute("retUrl", retUrl);
+ session.setAttribute("srvNo", srvNo);
+ session.setAttribute("reqNum", reqNum);
+ //복호화용 임시필드
+
+ String exVar = "0000000000000000";
+
+ /**
+ *
+ * reqNum 값은 최종 결과값 복호화를 위한 SecuKey로 활용 되므로 중요합니다.
+ * reqNum 은 아이핀 서비스 요청시 항상 새로운 값으로 중복 되지 않게 생성 해야 합니다.
+ * 쿠키 또는 Session및 기타 방법을 사용해서 reqNum 값을
+ * ipin_result_seed.jsp에서 가져 올 수 있도록 해야 함.
+ * 샘플을 위해서 쿠키를 사용한 것이므로 참고 하시길 바랍니다.
+ *
+ */
+ /* Cookie c = new Cookie("reqNum", reqNum);
+ //c.setMaxAge(1800); // <== 필요시 설정(초단위로 설정됩니다)
+ response.addCookie(c);*/
+
+ session.setAttribute("reqNumKey", reqNum);
+
+ // 암호화 모듈 선언
+ SciSecuManager seed = new SciSecuManager();
+ // 1차 암호화
+ String encStr = "";
+ String reqInfo = reqNum + "/" + id + "/" + srvNo + "/" + exVar;
+ encStr = seed.getEncPublic(reqInfo);
+ // 위변조 검증 값 등록
+ SciHmac hmac = new SciHmac();
+ String hmacMsg = SciHmac.HMacEncriptPublic(encStr);
+ // 2차 암호화
+ reqInfo = seed.getEncPublic(encStr + "/" + hmacMsg + "/" + "00000000");
+ session.setAttribute("reqInfo", reqInfo);
+
+ /**
+ * 아이핀 인증 끝 */
+
+
+ /**
+ * 핸드폰 인증 시작 */
+
+ //날짜 생성
+ Calendar today = Calendar.getInstance();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+ String day = sdf.format(today.getTime());
+
+ java.util.Random ran = new Random();
+ //랜덤 문자 길이
+ int numLength = 6;
+ String randomStr = "";
+
+ for (int i = 0; i < numLength; i++) {
+ //0 ~ 9 랜덤 숫자 생성
+ randomStr += ran.nextInt(10);
+ }
+
+ //reqNum은 최대 40byte 까지 사용 가능
+
+ String hpId = "SKFA001"; // 본인실명확인 회원사 아이디
+ //String hpSrvNo = "005001"; // 본인실명확인 서비스번호
+ String hpReqNum = day + randomStr; // 본인실명확인 요청번호
+ String hpExVar = "0000000000000000"; // 복호화용 임시필드
+ String hpCertDate = day; // 본인실명확인 요청시간
+ String hpCertGb = "H"; // 본인실명확인 본인확인 인증수단
+ String hpAddVar = ""; // 본인실명확인 추가 파라메터
+
+ //String hpRetUrl = "32http://ServerName/kmcis/kmcisIdSearch.jsp"; // 본인인증서비스 결과수신 POPUP URL
+ //String hpRetUrl = "32http://ServerName/user/extra/case/siren/hpParamPop/jsp/Page.do";
+
+ //hpRetUrl = "32http://kofair2.global-it.co.kr/kmcis/kmcisIdSearch.jsp";
+ //hpRetUrl = hpRetUrl.replaceAll("ServerName", sServerName); //오픈할 때 주석으로 교체해줘야함
+
+
+ /**
+ *
+ * reqNum 값은 최종 결과값 복호화를 위한 SecuKey로 활용 되므로 중요합니다.
+ * reqNum 은 본인 확인 요청시 항상 새로운 값으로 중복 되지 않게 생성 해야 합니다.
+ * 쿠키 또는 Session및 기타 방법을 사용해서 reqNum 값을
+ * pcc_V3_result_seed.jsp에서 가져 올 수 있도록 해야 함.
+ * 샘플을 위해서 쿠키를 사용한 것이므로 참고 하시길 바랍니다.
+ *
+ */
+ /*Cookie hpC = new Cookie("hpReqNum", hpReqNum);
+ //c.setMaxAge(1800); // <== 필요시 설정(초단위로 설정됩니다)
+ response.addCookie(hpC);*/
+
+ session.setAttribute("hpReqNumKey", hpReqNum);
+
+ //01. 암호화 모듈 선언
+ com.sci.v2.pcc.secu.SciSecuManager hpSeed = new com.sci.v2.pcc.secu.SciSecuManager();
+
+ //02. 1차 암호화
+ String hpEncStr = "";
+ String hpReqInfo = hpId+"^"+hpSrvNo+"^"+hpReqNum+"^"+hpCertDate+"^"+hpCertGb+"^"+hpAddVar+"^"+hpExVar; // 데이터 암호화
+ hpEncStr = hpSeed.getEncPublic(hpReqInfo);
+
+ //03. 위변조 검증 값 생성
+ com.sci.v2.pcc.secu.hmac.SciHmac hpHmac = new com.sci.v2.pcc.secu.hmac.SciHmac();
+ String hpHmacMsg = hpHmac.HMacEncriptPublic(hpEncStr);
+
+ //03. 2차 암호화
+ hpReqInfo = hpSeed.getEncPublic(hpEncStr + "^" + hpHmacMsg + "^" + "0000000000000000"); //2차암호화
+
+ session.setAttribute("hpRetUrl", hpRetUrl);
+ session.setAttribute("hpReqInfo", hpReqInfo);
+
+ /**
+ * 핸드폰 인증 끝 */
+
+
+ return "redirect:" + nextUrl;
+ }
+
+
+}
diff --git a/src/main/java/seed/com/user/counsel/WebCounselController.java b/src/main/java/seed/com/user/counsel/WebCounselController.java
index 9dca281c..45e8f881 100644
--- a/src/main/java/seed/com/user/counsel/WebCounselController.java
+++ b/src/main/java/seed/com/user/counsel/WebCounselController.java
@@ -502,6 +502,172 @@ public class WebCounselController {
return new ModelAndView("/_extra/web/user/onlineCounsel/lawCounselStep02");
}
+ // /user/lawCounsel/case/02/159/step03.do
+ @RequestMapping("/web/user/lawCounsel/{siteIdx}/02/{siteMenuIdx}/step03.do")
+ public ModelAndView lawCounselStep03(ModelMap map, HttpSession session, @RequestParam Map paramMap,
+ @PathVariable(value="siteIdx") String siteIdx,
+ @PathVariable(value="siteMenuIdx") Integer siteMenuIdx){
+
+ /*
+ String tempSrvNo = SeedUtils.setReplaceNull(session.getAttribute("srvNo"));
+ String tempPersonalCheck = SeedUtils.setReplaceNull(session.getAttribute("personalCheck"));
+ if(tempSrvNo.equals("") || tempPersonalCheck.equals("")){
+ map.put("siteIdx", "case");
+ map.put("url", "/case/index.do");
+ map.put("message", "user.message.medi.alert");
+ map.put("opener", "");
+ map.put("append", "");
+ map.put("self", "");
+
+ return new ModelAndView("/_common/jsp/umessage");
+ }
+ */
+
+ setSessionMessageRemove(session);
+
+ /*----권한체크----*/
+ Integer memberIdx = Integer.valueOf(SeedUtils.setReplaceNull(session.getAttribute("memberIdx"),"0"));
+ String memberGrant = (memberIdx == 0) ? "N" : SeedUtils.setReplaceNull(managerMemberService.getMemberMapForm(memberIdx, new String[] {"memberGrant"}).get("_memberGrant"), "N");
+ boolean memberAuthM = managerSiteManagerService.getSiteManagerListCnt(siteIdx, memberIdx);
+ boolean memberAuth = managerSiteMenuManagerService.getSiteMenuManagerListCnt(siteMenuIdx, memberIdx); memberAuthM = true; memberAuth = true;
+
+ //메뉴 권한설정
+ /*
+ if(!memberGrant.equals("S") && !memberAuthM && !memberAuth &&
+ !managerSiteMenuAuthService.getSiteMenuAuthChk(siteMenuIdx, memberIdx)){
+
+ map.put("message", "common.message.no.grant");
+
+ if(memberIdx.equals(0)){
+ map.put("url", "/"+siteIdx+"/index.do");
+ }else{
+ map.put("self", "history");
+ }
+
+ return new ModelAndView("/_common/jsp/umessage");
+ }
+ */
+
+ boolean b_ret = true;
+ b_ret = FairnetUtils.hasUserAuth(memberIdx, memberGrant, memberAuth, session, map);
+
+ if (!b_ret) {
+ return new ModelAndView("/_common/jsp/message");
+ }
+
+ Map tSiteMenuDB = managerSiteMenuService.getSiteMenuMapForm(siteMenuIdx,
+ new String[] {"siteMenuName", "siteMenuParentTitle", "siteMenuStatus", "siteMenuType", "siteMenuLinkUrl", "siteMenuCharge", "siteMenuCharge", "siteMenuSNS",
+ "siteMenuTitle", "siteMenuRegDate", "siteMenuModDate", "siteMenuNameType", "siteMenuIdxs", "siteMenuDepth", "siteMenuSatisfaction", "siteMenuIdx1",
+ "tSite.siteActiveMenuWidth", "tSite.siteService", "tSite.siteServiceSdate", "tSite.siteServiceSdate"});
+
+ if(!memberGrant.equals("S") && !memberAuthM && !memberAuth){
+ if(!SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuStatus")).equals("U")){
+ map.put("message", "common.message.no.siteMenu");
+ map.put("self", "history");
+ return new ModelAndView("/_common/jsp/umessage");
+ }
+ }
+
+ if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteService")).equals("Y")){
+
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+
+ try{
+
+ Date getDate = new Date();
+
+ Date sDate = formatter.parse(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteServiceSdate")));
+ Date eDate = formatter.parse(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteServiceEdate")));
+
+ if((sDate.compareTo(formatter.parse(formatter.format(getDate))) > 0 && eDate.compareTo(formatter.parse(formatter.format(getDate))) > 0) ||
+ (sDate.compareTo(formatter.parse(formatter.format(getDate))) < 0 && eDate.compareTo(formatter.parse(formatter.format(getDate))) < 0)){
+ return new ModelAndView("redirect:/user/common/service/"+siteIdx+".do");
+ }
+
+ }catch(ParseException e){
+ log.error("CHECK ERROR:",e);
+ }
+ }
+
+ if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuType")).equals("F") ||
+ SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuType")).equals("L")){
+ return new ModelAndView("redirect:"+SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuLinkUrl")));
+ }
+
+ String siteMenuManager = "N";
+ StringBuffer siteMenuManagerIdx = new StringBuffer();
+ String siteMenuCharge = SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuCharge"), "N");
+
+ List> siteMenuManagerList =
+ managerSiteMenuManagerService.getSiteMenuManagerMapList(siteMenuIdx, new String[] {"siteMenuManagerStatus", "tMember.memberIdx"});
+
+ for(int i=0; i tSiteMenuManagerDB = siteMenuManagerList.get(i);
+
+ if(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_siteMenuManagerStatus")).equals("U")){
+
+ if(!memberIdx.equals(0) &&
+ memberIdx.equals(Integer.parseInt(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_memberIdx"), "0"))) &&
+ siteMenuManager.equals("N")){
+ siteMenuManager = "Y";
+ }
+ siteMenuManagerIdx.append(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_memberIdx")).toString());
+ siteMenuManagerIdx.append(",");
+ }
+ }
+
+ if(memberGrant.equals("S") || memberAuthM){
+ siteMenuManager = "Y";
+ }
+
+ //편집 권한
+ map.put("siteMenuManager", siteMenuManager);
+ //담당자 보기 설정
+ map.put("siteMenuCharge", siteMenuCharge);
+ //담당자 이름
+ map.put("siteMenuManagerIdx", siteMenuManagerIdx.toString());
+ //만족도 설정
+ map.put("siteMenuSatisfaction", SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuSatisfaction"), "N"));
+
+ map.put("siteMenuSubTitle", managerSiteMenuService.getSiteMenuSubTitleForm(siteIdx, SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuIdx1"))));
+
+ String siteMenuTitle = managerSiteMenuService.getSiteMenuParentName(siteIdx, SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuIdxs")), "edit").replaceAll("》", "|") +
+ " | " + SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuName"));
+
+ map.put("siteMenuTitle", siteMenuTitle);
+
+ //부모메뉴 타이틀 설정한 경우 해당 글의 부모 타이틀을 가져옴
+ if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuParentTitle") ,"N").equals("Y")){
+ String[] siteMenuTitles = siteMenuTitle.split("\\|");
+ tSiteMenuDB.put("_siteMenuName", siteMenuTitles[Integer.parseInt(tSiteMenuDB.get("_siteMenuDepth").toString())-1]);
+ }
+
+ map.put("tSiteMenuDB", tSiteMenuDB);
+
+ map.put("memberAuthM", memberAuthM);
+ map.put("seedMenuAuth", managerGroupService.getGroupList(siteIdx, memberIdx, memberMerge, memberMergeSiteIdx));
+ /*----권한체크 종료----*/
+
+ map.put("id", session.getAttribute("id"));
+ map.put("retUrl", session.getAttribute("retUrl"));
+ map.put("srvNo", session.getAttribute("srvNo"));
+ map.put("reqNum", session.getAttribute("reqNum"));
+ map.put("reqInfo", session.getAttribute("reqInfo"));
+ map.put("hpRetUrl", session.getAttribute("hpRetUrl"));
+ map.put("hpReqInfo", session.getAttribute("hpReqInfo"));
+
+ session.removeAttribute("id");
+ session.removeAttribute("retUrl");
+ session.removeAttribute("srvNo");
+ session.removeAttribute("reqNum");
+ session.removeAttribute("reqInfo");
+ session.removeAttribute("hpRetUrl");
+ session.removeAttribute("hpReqInfo");
+
+ return new ModelAndView("/_extra/web/user/onlineCounsel/lawCounselStep03");
+ }
+
// /user/lawCounsel/case/02/159/lawWrite.do
@RequestMapping(value="/web/user/lawCounsel/{siteIdx}/02/{siteMenuIdx}/lawWrite.do", method=RequestMethod.GET)
public ModelAndView weblawCounselWrite(ModelMap map, HttpSession session, @RequestParam Map paramMap,
@@ -817,7 +983,11 @@ public class WebCounselController {
service.lawCounselInsert(paramMap);
paramMap.put("dataIdx", paramMap.get("seq"));
- fileService.fileInsert(paramMap, request, session);
+ try {
+ fileService.fileInsert(paramMap, request, session);
+ }catch(Exception ex) {
+ ex.printStackTrace();
+ }
map.put("siteIdx", "case");
map.put("url", "/web/user/mypage/case/03/242/myLawCounsel.do");
@@ -826,8 +996,13 @@ public class WebCounselController {
map.put("append", "");
map.put("self", "");
- return new ModelAndView("/_common/jsp/umessage");
+ //return new ModelAndView("/_common/jsp/umessage");
+
+ return new ModelAndView("redirect:/web/user/lawCounsel/"+siteIdx+"/02/"+siteMenuIdx+"/step03.do");
+
}
+
+
}
diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/lawCounselStep02.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/lawCounselStep02.jsp
index 7f62ec53..16a4663d 100644
--- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/lawCounselStep02.jsp
+++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/lawCounselStep02.jsp
@@ -21,13 +21,32 @@
$( document ).ready(function(){
});
+ function checkFunc(){
+ var checkAll = $("input:checkbox[name=all_agree]")
+
+ var checkList = $("input:checkbox[name=infoAgree]")
+ for(var i = 0; i < checkList.length; i++){
+ $(checkList[i]).prop("checked",checkAll.is(":checked"))
+ }
+ }
+
function moveFunc(type){
if(type == "step01"){
$("#moveFrm").attr("action", "/web/user/lawCounsel/case/02/159/step01.do");
$("#moveFrm").submit();
}else if(type == "step02Write"){
- $("#moveFrm").attr("action", "/web/user/lawCounsel/case/02/159/lawWrite.do");
- $("#moveFrm").submit();
+
+ var checkList = $("input:checkbox[name=infoAgree]")
+ for(var i = 0; i < checkList.length; i++){
+ if($(checkList[i]).is(":checked") == false){
+ alert("개인정보 수집에 동의 해 주세요.");
+ return false;
+ }
+ }
+ $("#personalCheck").val("Y");
+
+ //$("#moveFrm").attr("action", "/web/user/lawCounsel/case/02/159/lawWrite.do");
+ $("#frm").submit();
}else if(type == "list"){
$("#examNo").remove();
$("#fileFuncType").remove();
@@ -68,6 +87,12 @@
무료법률 상담
개인정보 수집·이용·제공 동의서 (필수)
@@ -138,15 +165,17 @@
위 사항에 동의하십니까?
- 모든 이용약관 동의
+ 모든 이용약관 동의
@@ -157,6 +186,7 @@
취소
다음단계
+
diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/lawCounselStep03.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/lawCounselStep03.jsp
new file mode 100644
index 00000000..8ab88cb8
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/lawCounselStep03.jsp
@@ -0,0 +1,81 @@
+<%
+ response.setHeader("Pragma", "no-cache" );
+ response.setDateHeader("Expires", 0);
+ response.setHeader("Pragma", "no-store");
+ response.setHeader("Cache-Control", "no-cache" );
+%>
+<%@ page language='java' contentType='text/html; charset=UTF-8'%>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
+<%@ taglib uri='http://www.springframework.org/tags/form' prefix='form'%>
+
+
+
+
+
+
+
+
+ 분쟁조정 상담
+ 상담신청
+ 무료법률 상담
+
+
+
+
무료법률 상담
+
+
+
+
+ STEP 01 개인정보수집
+
+
+
+ STEP 02 정보입력
+
+
+
+ STEP 03 신청완료
+
+
+
+
+
+
+
무료법률 상담 신청이 완료되었습니다.
+
마이페이지로 이동하시면 신청한 내용을 확인할 수 있습니다.
+
+ 마이페이지
+ 메인으로
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/lawWrite.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/lawWrite.jsp
index 9c6f50bd..08d47266 100644
--- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/lawWrite.jsp
+++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/lawWrite.jsp
@@ -19,15 +19,113 @@