tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tolag3'

Browse Source
This commit is contained in:
leejunho 2024-12-11 14:38:11 +09:00
parent bca435a379
commit 7590a101bc
7 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcc/let/main/web/EgovMainController.java
View File

@ -157,7 +157,7 @@ public class EgovMainController {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@RequestMapping(value = "/cmm/main/mainPage.do") @RequestMapping(value = "/cmm/main/mainPage.do")
public String selectGetMgtMainPage(HttpServletRequest request, ModelMap model, HttpSession session) throws Exception{ public String selectGetMgtMainPage(HttpServletRequest request, ModelMap model, HttpSession session) throws Exception{
LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); // LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();

6
src/main/java/seed/com/user/counsel/WebCounselController.java
View File

@ -238,6 +238,12 @@ public class WebCounselController {
setSessionMessageRemove(session); setSessionMessageRemove(session);
// CI 체크
if(!FairnetUtils.ciCheck(map, session)) {
return new ModelAndView("/_common/jsp/umessage");
}
/*----권한체크----*/ /*----권한체크----*/
Integer memberIdx = Integer.valueOf(SeedUtils.setReplaceNull(session.getAttribute("memberIdx"),"0")); 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"); String memberGrant = (memberIdx == 0) ? "N" : SeedUtils.setReplaceNull(managerMemberService.getMemberMapForm(memberIdx, new String[] {"memberGrant"}).get("_memberGrant"), "N");

56
src/main/java/seed/com/user/mediation/WebMediationController.java
View File

@ -132,7 +132,7 @@ public class WebMediationController {
, HttpServletRequest req){ , HttpServletRequest req){
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
return new ModelAndView("/_common/jsp/umessage"); return new ModelAndView("/_common/jsp/umessage");
} }
@ -306,7 +306,7 @@ public class WebMediationController {
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
return new ModelAndView("/_common/jsp/umessage"); return new ModelAndView("/_common/jsp/umessage");
} }
// String tempHpDi = SeedUtils.setReplaceNull(session.getAttribute("hpDi")); // String tempHpDi = SeedUtils.setReplaceNull(session.getAttribute("hpDi"));
@ -480,7 +480,7 @@ public class WebMediationController {
, HttpServletRequest req){ , HttpServletRequest req){
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
return new ModelAndView("/_common/jsp/umessage"); return new ModelAndView("/_common/jsp/umessage");
} }
@ -677,7 +677,7 @@ public class WebMediationController {
, HttpServletRequest req){ , HttpServletRequest req){
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
return new ModelAndView("/_common/jsp/umessage"); return new ModelAndView("/_common/jsp/umessage");
} }
@ -871,7 +871,7 @@ public class WebMediationController {
, HttpServletRequest req){ , HttpServletRequest req){
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
return new ModelAndView("/_common/jsp/umessage"); return new ModelAndView("/_common/jsp/umessage");
} }
@ -1161,7 +1161,7 @@ public class WebMediationController {
// req.getSession().setAttribute("hpName", dataObject.get("hpName")); // req.getSession().setAttribute("hpName", dataObject.get("hpName"));
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
return new ModelAndView("/_common/jsp/umessage"); return new ModelAndView("/_common/jsp/umessage");
} }
@ -1290,7 +1290,7 @@ public class WebMediationController {
){ ){
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
return new ModelAndView("/_common/jsp/umessage"); return new ModelAndView("/_common/jsp/umessage");
} }
@ -1441,7 +1441,7 @@ public class WebMediationController {
){ ){
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
return new ModelAndView("/_common/jsp/umessage"); return new ModelAndView("/_common/jsp/umessage");
} }
@ -2002,7 +2002,7 @@ public class WebMediationController {
@PathVariable(value="siteMenuIdx") Integer siteMenuIdx){ @PathVariable(value="siteMenuIdx") Integer siteMenuIdx){
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
paramMap.put("sts", "fail"); paramMap.put("sts", "fail");
return new ResponseEntity<>(paramMap, HttpStatus.OK); return new ResponseEntity<>(paramMap, HttpStatus.OK);
} }
@ -2341,7 +2341,7 @@ public class WebMediationController {
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
paramMap.put("sts", "fail"); paramMap.put("sts", "fail");
return new ResponseEntity<>(paramMap, HttpStatus.OK); return new ResponseEntity<>(paramMap, HttpStatus.OK);
} }
@ -2775,7 +2775,7 @@ public class WebMediationController {
@PathVariable(value="siteMenuIdx") Integer siteMenuIdx){ @PathVariable(value="siteMenuIdx") Integer siteMenuIdx){
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
paramMap.put("sts", "fail"); paramMap.put("sts", "fail");
return new ResponseEntity<>(paramMap, HttpStatus.OK); return new ResponseEntity<>(paramMap, HttpStatus.OK);
} }
@ -2996,7 +2996,7 @@ public class WebMediationController {
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
paramMap.put("sts", "fail"); paramMap.put("sts", "fail");
return new ResponseEntity<>(paramMap, HttpStatus.OK); return new ResponseEntity<>(paramMap, HttpStatus.OK);
} }
@ -3189,7 +3189,7 @@ public class WebMediationController {
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
paramMap.put("sts", "fail"); paramMap.put("sts", "fail");
return new ResponseEntity<>(paramMap, HttpStatus.OK); return new ResponseEntity<>(paramMap, HttpStatus.OK);
} }
@ -3375,7 +3375,7 @@ public class WebMediationController {
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
paramMap.put("sts", "fail"); paramMap.put("sts", "fail");
return new ResponseEntity<>(paramMap, HttpStatus.OK); return new ResponseEntity<>(paramMap, HttpStatus.OK);
} }
@ -3598,7 +3598,7 @@ public class WebMediationController {
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
paramMap.put("sts", "fail"); paramMap.put("sts", "fail");
return new ResponseEntity<>(paramMap, HttpStatus.OK); return new ResponseEntity<>(paramMap, HttpStatus.OK);
} }
@ -3890,7 +3890,7 @@ public class WebMediationController {
// CI 체크 // CI 체크
if(!ciCheck(map, session)) { if(!FairnetUtils.ciCheck(map, session)) {
paramMap.put("sts", "fail"); paramMap.put("sts", "fail");
return new ResponseEntity<>(paramMap, HttpStatus.OK); return new ResponseEntity<>(paramMap, HttpStatus.OK);
} }
@ -4318,6 +4318,11 @@ public class WebMediationController {
} }
} }
// CI 체크
if(!FairnetUtils.ciCheck(map, session)) {
return new ModelAndView("/_common/jsp/umessage");
}
try { try {
//접수번호 구하기(rceptNo) //접수번호 구하기(rceptNo)
Map<String,Object> masterInfo = service.masterList(paramMap); Map<String,Object> masterInfo = service.masterList(paramMap);
@ -4346,11 +4351,6 @@ public class WebMediationController {
return new ModelAndView("/_common/jsp/umessage"); return new ModelAndView("/_common/jsp/umessage");
} }
// CI 체크
if(!ciCheck(map, session)) {
return new ModelAndView("/_common/jsp/umessage");
}
session.setAttribute("caseNo", SeedUtils.setReplaceNull(paramMap.get("caseNo"))); session.setAttribute("caseNo", SeedUtils.setReplaceNull(paramMap.get("caseNo")));
return new ModelAndView("redirect:/web/user/mediation/case/03/155/checkMediationStep03.do"); return new ModelAndView("redirect:/web/user/mediation/case/03/155/checkMediationStep03.do");
} }
@ -4729,21 +4729,7 @@ public class WebMediationController {
mav.setViewName("_extra/web/user/mediation/caseViewer"); mav.setViewName("_extra/web/user/mediation/caseViewer");
return mav; return mav;
} }
private Boolean ciCheck(ModelMap map, HttpSession session) {
String certNm = SeedUtils.setReplaceNull(session.getAttribute("certNm"));
String certHpNo = SeedUtils.setReplaceNull(session.getAttribute("certHpNo"));
if("".equals(certNm) || "".equals(certHpNo)){
map.put("siteIdx", "case");
map.put("url", "/web/user/mypage/case/01/168/myCheck.do");
map.put("message", "user.message.medi.ci.alert");
map.put("opener", "");
map.put("append", "");
map.put("self", "");
return false;
}
return true;
}
@RequestMapping(value = "/web/user/mediation/case/pdf/pdfDownload.do") @RequestMapping(value = "/web/user/mediation/case/pdf/pdfDownload.do")
public void downloadPdf( public void downloadPdf(

9
src/main/java/seed/com/user/mypage/WebMyPageController.java
View File

@ -295,6 +295,11 @@ private Logger log = Logger.getLogger(this.getClass());
} }
*/ */
// CI 체크
if(!FairnetUtils.ciCheck(map, session)) {
return new ModelAndView("/_common/jsp/umessage");
}
System.out.println("1"); System.out.println("1");
boolean b_ret_u = true; boolean b_ret_u = true;
@ -696,6 +701,10 @@ private Logger log = Logger.getLogger(this.getClass());
return new ModelAndView("/_common/jsp/umessage"); return new ModelAndView("/_common/jsp/umessage");
} }
*/ */
// CI 체크
if(!FairnetUtils.ciCheck(map, session)) {
return new ModelAndView("/_common/jsp/umessage");
}
boolean b_ret_u = true; boolean b_ret_u = true;
map = FairnetUtils.myCheck(map, session); map = FairnetUtils.myCheck(map, session);

16
src/main/java/seed/utils/FairnetUtils.java
View File

@ -747,4 +747,20 @@ public class FairnetUtils {
return null; return null;
// return status; // return status;
} }
public static Boolean ciCheck(ModelMap map, HttpSession session) {
String certNm = SeedUtils.setReplaceNull(session.getAttribute("certNm"));
String certHpNo = SeedUtils.setReplaceNull(session.getAttribute("certHpNo"));
if("".equals(certNm) || "".equals(certHpNo)){
map.put("siteIdx", "case");
map.put("url", "/web/user/mypage/case/01/168/myCheck.do");
map.put("message", "user.message.medi.ci.alert");
map.put("opener", "");
map.put("append", "");
map.put("self", "");
return false;
}
return true;
}
} }

3
src/main/resources/egovframework/sqlmap/let/sec/rgm/EgovAuthorGroup_SQL_Oracle.xml
View File

@ -142,6 +142,9 @@
DUAL DUAL
) S ) S
ON (D.SCRTY_DTRMN_TRGET_ID = S.SCRTY_DTRMN_TRGET_ID) ON (D.SCRTY_DTRMN_TRGET_ID = S.SCRTY_DTRMN_TRGET_ID)
WHEN MATCHED THEN
UPDATE SET D.MBER_TY_CODE = S.MBER_TY_CODE,
D.AUTHOR_CODE = S.AUTHOR_CODE
WHEN NOT MATCHED THEN WHEN NOT MATCHED THEN
INSERT (SCRTY_DTRMN_TRGET_ID, MBER_TY_CODE, AUTHOR_CODE) INSERT (SCRTY_DTRMN_TRGET_ID, MBER_TY_CODE, AUTHOR_CODE)
VALUES (S.SCRTY_DTRMN_TRGET_ID, S.MBER_TY_CODE, S.AUTHOR_CODE) VALUES (S.SCRTY_DTRMN_TRGET_ID, S.MBER_TY_CODE, S.AUTHOR_CODE)

2
src/main/webapp/WEB-INF/jsp/_common/jsp/umessage.jsp
View File

@ -54,7 +54,7 @@
<p class="gMarket_bold" id="message"></p> <p class="gMarket_bold" id="message"></p>
<div class="btn_wrap center"> <div class="btn_wrap center">
<button type="button" class="btn btn_text btn_45 darkblue_fill">확인</button> <button type="button" class="btn btn_text btn_45 darkblue_fill" onclick="location.href='${url}'">확인</button>
</div> </div>
</div> </div>
</div> </div>