From e56c7574c9cf242c293de0947281ea4189892fb5 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 29 Nov 2022 15:49:13 +0900 Subject: [PATCH] =?UTF-8?q?2022-11-29=2015:48=20=EC=8B=A0=EC=B2=AD?= =?UTF-8?q?=EC=A0=91=EC=88=98=20=EB=8B=A8=EA=B3=84=20=EB=82=B4=EC=9A=A9=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/utl/fcc/service/EgovStringUtil.java | 26 +++++++++++++++++ .../ai/web/AdjstIncidentController.java | 29 ++++++++++++++++--- .../ai/web/AdjstIncidentPdfController.java | 9 ++++++ .../ars/web/AdjstReqStatusController.java | 24 +++++++++++++++ .../adjPgrMgr/apm/web/ApmController.java | 16 ++++++++++ .../adjclsmgr/web/AdjClsMgrController.java | 10 +++++++ .../adjreqmgr/web/AdjReqMgrController.java | 23 +++++++-------- .../web/AdjstExpDetailController.java | 9 ++++++ .../kccadrCom/web/KccadrCommonController.java | 9 ++++++ .../let/utl/fcc/service/EgovStringUtil.java | 24 +++++++++++++++ .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 19 ++++++++---- 11 files changed, 176 insertions(+), 22 deletions(-) diff --git a/src/main/java/kcc/com/utl/fcc/service/EgovStringUtil.java b/src/main/java/kcc/com/utl/fcc/service/EgovStringUtil.java index 9d674b2a..b68e7f11 100644 --- a/src/main/java/kcc/com/utl/fcc/service/EgovStringUtil.java +++ b/src/main/java/kcc/com/utl/fcc/service/EgovStringUtil.java @@ -39,6 +39,8 @@ import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.util.Locale; +import kcc.let.utl.fcc.service.EgovCryptoUtil; + public class EgovStringUtil { /** * 빈 문자열 "". @@ -901,4 +903,28 @@ public class EgovStringUtil { return ""; } } + + + /** + * 외n명이 포함된 암호화 단어를 복호화 한다. + * @param p_checkWord + * @param p_egovCryptoUtil + * @return + */ + public static String checkNPerson( + String p_checkWord + , EgovCryptoUtil p_egovCryptoUtil + ) { + if(p_checkWord.contains("외")) { + String s_tmp1 = ""; + String s_tmp2 = ""; + + s_tmp1 = p_checkWord.substring(p_checkWord.length()-3); + s_tmp2 = p_checkWord.substring(0, p_checkWord.length()-3); + + return p_egovCryptoUtil.decrypt(s_tmp2) + " " + s_tmp1; + }else { + return p_egovCryptoUtil.decrypt(p_checkWord); + } + } } diff --git a/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentController.java b/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentController.java index 19cbcad4..c135792a 100644 --- a/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentController.java +++ b/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentController.java @@ -37,7 +37,6 @@ import kcc.kccadr.adjPgrMgr.apm.service.ApmVO; import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; import kcc.kccadr.adjreqmgr.service.AdjReqMgrService; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; -import kcc.kccadr.adjst.service.AdjstReqVO; import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.let.utl.fcc.service.EgovCryptoUtil; @@ -450,14 +449,36 @@ public class AdjstIncidentController { model.setDepuTyNm(egovCryptoUtil.decrypt(model.getDepuTyNm())); // model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm())); + + System.out.println("model.getResPonDentNm()"); + System.out.println(model.getResPonDentNm()); + //피신청인 명수 표시 '외 N명' 처리_이준호_220801 if (!StringUtil.isEmpty(model.getResPonDentNm())) { - String tmpStr = ""; + //String tmpStr = ""; + + model.setResPonDentNm( + EgovStringUtil.checkNPerson( + model.getResPonDentNm() + , egovCryptoUtil + ) + ); + + /* if(model.getResPonDentNm().contains("외")) { - tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); + String s_tmp1 = ""; + String s_tmp2 = ""; + + s_tmp1 = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); + s_tmp2 = model.getResPonDentNm().substring(0, model.getResPonDentNm().length()-3); + model.setResPonDentNm(egovCryptoUtil.decrypt(s_tmp2) + " " + s_tmp1); + }else { + model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm())); } - model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + */ + + //model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); } model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); diff --git a/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentPdfController.java b/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentPdfController.java index c5b491bf..f7ec3ca7 100644 --- a/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentPdfController.java +++ b/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentPdfController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.StringUtil; +import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.kccadr.accdnt.ai.service.AdjstIncidentService; import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; @@ -147,11 +148,19 @@ public class AdjstIncidentPdfController { // model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm())); //피신청인 명수 표시 '외 N명' 처리_이준호_220801 if (!StringUtil.isEmpty(model.getResPonDentNm())) { + model.setResPonDentNm( + EgovStringUtil.checkNPerson( + model.getResPonDentNm() + , egovCryptoUtil + ) + ); + /* String tmpStr = ""; if(model.getResPonDentNm().contains("외")) { tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); } model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + */ } model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); diff --git a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java index e3ae00da..6f75b1b7 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -454,11 +454,19 @@ public class AdjstReqStatusController { // model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm())); //피신청인 명수 표시 '외 N명' 처리_이준호_220801 if (!StringUtil.isEmpty(model.getResPonDentNm())) { + model.setResPonDentNm( + EgovStringUtil.checkNPerson( + model.getResPonDentNm() + , egovCryptoUtil + ) + ); + /* String tmpStr = ""; if(model.getResPonDentNm().contains("외")) { tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); } model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + */ } model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); @@ -870,11 +878,19 @@ public class AdjstReqStatusController { // model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm())); //피신청인 명수 표시 '외 N명' 처리_이준호_220801 if (!StringUtil.isEmpty(model.getResPonDentNm())) { + model.setResPonDentNm( + EgovStringUtil.checkNPerson( + model.getResPonDentNm() + , egovCryptoUtil + ) + ); + /* String tmpStr = ""; if(model.getResPonDentNm().contains("외")) { tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); } model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + */ } model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); model.setAdrAdmNm(egovCryptoUtil.decrypt(model.getAdrAdmNm())); @@ -918,11 +934,19 @@ public class AdjstReqStatusController { //피신청인 명수 표시 '외 N명' 처리_이준호_220801 if (!StringUtil.isEmpty(model.getResPonDentNm())) { + model.setResPonDentNm( + EgovStringUtil.checkNPerson( + model.getResPonDentNm() + , egovCryptoUtil + ) + ); + /* String tmpStr = ""; if(model.getResPonDentNm().contains("외")) { tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); } model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + */ } model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index 20c2bb0a..7e94001a 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -2615,11 +2615,19 @@ public class ApmController { //피신청인 명수 표시 '외 N명' 처리_이준호_220801 if (!StringUtil.isEmpty(model.getResPonDentNm())) { + model.setResPonDentNm( + EgovStringUtil.checkNPerson( + model.getResPonDentNm() + , egovCryptoUtil + ) + ); + /* String tmpStr = ""; if(model.getResPonDentNm().contains("외")) { tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); } model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + */ } model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); @@ -2818,11 +2826,19 @@ public class ApmController { // model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm())); if (!StringUtil.isEmpty(model.getResPonDentNm())) { + model.setResPonDentNm( + EgovStringUtil.checkNPerson( + model.getResPonDentNm() + , egovCryptoUtil + ) + ); + /* String tmpStr = ""; if(model.getResPonDentNm().contains("외")) { tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); } model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + */ } model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); diff --git a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java index 72a6aec4..27b8d770 100644 --- a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java +++ b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java @@ -348,11 +348,21 @@ public class AdjClsMgrController { //피신청인 명수 표시 '외 N명' 처리_이준호_220801 if (!StringUtil.isEmpty(model.getResPonDentNm())) { + /* + model.setResPonDentNm( + EgovStringUtil.checkNPerson( + model.getResPonDentNm() + , egovCryptoUtil + ) + ); + */ + String tmpStr = ""; if(model.getResPonDentNm().contains("외")) { tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); } model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + } model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); diff --git a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java index 8791b150..62f3ed95 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java @@ -320,29 +320,26 @@ public class AdjReqMgrController { // model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm())); if (!StringUtil.isEmpty(model.getResPonDentNm())) { + + model.setResPonDentNm( + EgovStringUtil.checkNPerson( + model.getResPonDentNm() + , egovCryptoUtil + ) + ); + /* String tmpStr = ""; - - /* - * 2022.11.14. - * 기존 유지보수 코드 update - * */ String tmpResPonDentNm = model.getResPonDentNm(); if(model.getResPonDentNm().contains("외")) { tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); - /* - * 2022.11.14. - * 기존 유지보수 코드 update - * */ + tmpResPonDentNm = model.getResPonDentNm().substring(0, model.getResPonDentNm().length()-3); } - /* - * 2022.11.14. - * 기존 유지보수 코드 update - * */ model.setResPonDentNm(egovCryptoUtil.decrypt(tmpResPonDentNm) + " " + tmpStr); // model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + */ } model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java index 43b35a2c..0fa9da7d 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.util.StringUtil; +import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.accdnt.acd.service.AdjstChangeDateVO; import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; @@ -285,11 +286,19 @@ public class AdjstExpDetailController { // model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm())); //피신청인 명수 표시 '외 N명' 처리_이준호_220801 if (!StringUtil.isEmpty(model.getResPonDentNm())) { + model.setResPonDentNm( + EgovStringUtil.checkNPerson( + model.getResPonDentNm() + , egovCryptoUtil + ) + ); + /* String tmpStr = ""; if(model.getResPonDentNm().contains("외")) { tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); } model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + */ } model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); diff --git a/src/main/java/kcc/kccadr/kccadrCom/web/KccadrCommonController.java b/src/main/java/kcc/kccadr/kccadrCom/web/KccadrCommonController.java index 2f2b96a2..9b742887 100644 --- a/src/main/java/kcc/kccadr/kccadrCom/web/KccadrCommonController.java +++ b/src/main/java/kcc/kccadr/kccadrCom/web/KccadrCommonController.java @@ -22,6 +22,7 @@ import org.w3c.dom.NodeList; import egovframework.rte.psl.dataaccess.util.EgovMap; import kcc.com.cmm.util.StringUtil; +import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.accdnt.acd.service.AdjstChangeDateService; import kcc.kccadr.accdnt.acd.service.AdjstChangeDateVO; import kcc.kccadr.kccadrCom.service.KccadrCommonSearchVO; @@ -122,11 +123,19 @@ public class KccadrCommonController { //피신청인 명수 표시 '외 N명' 처리_이준호_220801 if (!StringUtil.isEmpty(model.getResPonDentNm())) { + model.setResPonDentNm( + EgovStringUtil.checkNPerson( + model.getResPonDentNm() + , egovCryptoUtil + ) + ); + /* String tmpStr = ""; if(model.getResPonDentNm().contains("외")) { tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); } model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + */ } model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); diff --git a/src/main/java/kcc/let/utl/fcc/service/EgovStringUtil.java b/src/main/java/kcc/let/utl/fcc/service/EgovStringUtil.java index 7ac2d6d5..e6a80a2d 100644 --- a/src/main/java/kcc/let/utl/fcc/service/EgovStringUtil.java +++ b/src/main/java/kcc/let/utl/fcc/service/EgovStringUtil.java @@ -896,4 +896,28 @@ public class EgovStringUtil { return date.substring(0,4).concat("-").concat(date.substring(4,6)).concat("-").concat(date.substring(6,8)); else return ""; } + + + /** + * 외n명이 포함된 암호화 단어를 복호화 한다. + * @param p_checkWord + * @param p_egovCryptoUtil + * @return + */ + public static String checkNPerson( + String p_checkWord + , EgovCryptoUtil p_egovCryptoUtil + ) { + if(p_checkWord.contains("외")) { + String s_tmp1 = ""; + String s_tmp2 = ""; + + s_tmp1 = p_checkWord.substring(p_checkWord.length()-3); + s_tmp2 = p_checkWord.substring(0, p_checkWord.length()-3); + + return p_egovCryptoUtil.decrypt(s_tmp2) + " " + s_tmp1; + }else { + return p_egovCryptoUtil.decrypt(p_checkWord); + } + } } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index c7e0efe2..92709581 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -2086,9 +2086,18 @@ $(document).ready(function(){ -

신청인 이름

+

신청인

- + + + + + + + + + + @@ -2137,7 +2146,7 @@ $(document).ready(function(){ -

대리인정보

+

신청인 대리인정보

@@ -2212,7 +2221,7 @@ $(document).ready(function(){
-

첨부파일

+

대리신청서

 @@ -2241,7 +2250,7 @@ $(document).ready(function(){
-

피신청인 이름

+

피신청인