From 73ca5f10ed8209da1f79ee522f149db05ab0fbbb Mon Sep 17 00:00:00 2001 From: myname Date: Mon, 5 Feb 2024 11:07:34 +0900 Subject: [PATCH] =?UTF-8?q?2024-02-05=2011:07=20=EC=84=A4=EB=AC=B8=20?= =?UTF-8?q?=EA=B8=B0=EA=B0=84=20=EC=A7=80=EB=82=9C=20=EB=8B=B5=EB=B3=80=20?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=20=EC=B6=9C=EB=A0=A5=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utl/user/service/QustnrCommonUtil.java | 4 + .../kcc/let/utl/fcc/service/ITNotiUtil.java | 101 ++++++++++++++++++ .../eduEnd/web/EduEndAdultController.java | 2 + .../web/FndtnEnhanceTrnController.java | 2 + .../eduEnd/web/EduEndTngrController.java | 2 + .../web/EduRsltMngAdultController.java | 4 + .../comweb/CommonManageWebController.java | 22 +++- .../web/EduRsltMngTngrController.java | 4 + .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 10 ++ .../qustnr/VEALettnQestnrMIX_SQL_Tibero.xml | 57 +++++++++- 10 files changed, 206 insertions(+), 2 deletions(-) create mode 100644 src/main/java/kcc/let/utl/fcc/service/ITNotiUtil.java diff --git a/src/main/java/kcc/com/utl/user/service/QustnrCommonUtil.java b/src/main/java/kcc/com/utl/user/service/QustnrCommonUtil.java index a79337ec..d25e0441 100644 --- a/src/main/java/kcc/com/utl/user/service/QustnrCommonUtil.java +++ b/src/main/java/kcc/com/utl/user/service/QustnrCommonUtil.java @@ -42,6 +42,8 @@ public class QustnrCommonUtil { , String p_qestnrTmplatId , VEALettnQestnrMIXService p_vEALettnQestnrMIXService , EgovQustnrRespondInfoService p_egovQustnrRespondInfoService + , String p_eduAplctOrd + , String p_eduChasiOrd )throws Exception{ //설문 문항 정보 { @@ -50,6 +52,8 @@ public class QustnrCommonUtil { VEAQestnrVO vEAQestnrVO = new VEAQestnrVO(); vEAQestnrVO.setSiteId(p_siteId); //청소년 vEAQestnrVO.setSiteIdCd(p_siteIdCd); //10-기본설문, 20-신청자설문, 30-강사설문 + vEAQestnrVO.setEduAplctOrd(p_eduAplctOrd); + vEAQestnrVO.setEduChasiOrd(p_eduChasiOrd); vEAQestnrVO = p_vEALettnQestnrMIXService.selectDetail_MIX_LQI_02(vEAQestnrVO); //문항정보 diff --git a/src/main/java/kcc/let/utl/fcc/service/ITNotiUtil.java b/src/main/java/kcc/let/utl/fcc/service/ITNotiUtil.java new file mode 100644 index 00000000..3c60c6ac --- /dev/null +++ b/src/main/java/kcc/let/utl/fcc/service/ITNotiUtil.java @@ -0,0 +1,101 @@ +package kcc.let.utl.fcc.service; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Component; + +import kcc.let.uss.notify.service.NotifyManageService; +import kcc.let.uss.notify.service.NotifyManageVO; + +/** + * + * egov crypto 에 대한 Util 클래스 + * @author 사업기술본부 조용준(ITN) + * @since 2021.07.16 + * @version 1.0 + * @see + * + * 
+ * << 개정이력(Modification Information) >>
+ *
+ *   수정일      수정자           수정내용
+ *  -------    --------    ---------------------------
+ *   2021.07.16  조용준          최초 생성 *   
+ *
+ *
+ */ +@Component("iTNotiUtil") +public class ITNotiUtil { + //private static final Logger LOGGER = LoggerFactory.getLogger(ITNotiUtil.class); + + //알림 + @Resource(name = "NotifyManageService") + private NotifyManageService notifyManageService; + + + ////////////////////////////////////////////////// + // + // VO 별 암/복호화 + // + // 1.VEEduAplctVO + // + + //VEEduAplctVO - 암호화 + public void insertNotifyNew( + //NotifyManageService p_notifyManageService + String p_lctrDivCd //VE0008 10-청소년, 20-성인,30-체험,50-실무,60-기수 + , String p_RegisterId //등록자ID + + , String p_noti_status_cd + + , String p_eduAplctOrd + , String p_eduChasiOrd + + , String p_move_param_type //페이지 이동에 사용하는 파라미터 설정 타입 + // 0-no param(sms, email), + // 1-eduAplctOrd, + // 2-eduAplctOrd & eduChasiOrd + , String p_noti_param_type //알림 대상자 선별을 위한 파라미터 타입 + // 0-no param(sms, email), + // 1-eduAplctOrd, + // 2-eduAplctOrd & eduChasiOrd + + ){ + + try { + //new - 2024.02.02 + NotifyManageVO notifyManageVO = new NotifyManageVO(); + notifyManageVO.setLctrDivCd(p_lctrDivCd); //VE0008 10-청소년, 20-성인,30-체험,50-실무,60-기수 + notifyManageVO.setFrstRegisterId(p_RegisterId); //등록자 정보 + + //페이지 이동에 필요한 파라미터 설정 + if("1".equals(p_move_param_type)) { + notifyManageVO.setParams("eduAplctOrd:"+p_eduAplctOrd); //ex)edu_aplct_ord:edu_001,edu_chasi_ord:edu_cha_001 + + }else if("2".equals(p_move_param_type)) { + notifyManageVO.setParams("eduAplctOrd:"+p_eduAplctOrd+",eduChasiOrd:"+p_eduChasiOrd); + //ex)edu_aplct_ord:edu_001,edu_chasi_ord:edu_cha_001 + } + + + //알림 대상자 선정에 필요한 파라미터 설정 + if("1".equals(p_move_param_type)) { + notifyManageVO.setEduAplctOrd(p_eduAplctOrd); + + }else if("2".equals(p_move_param_type)) { + notifyManageVO.setEduAplctOrd(p_eduAplctOrd); + notifyManageVO.setEduChasiOrd(p_eduChasiOrd); + } + + + //new 알림-2024.02.02 + notifyManageService.insertNotifyNew(notifyManageVO, p_noti_status_cd); //교육신청 - 상태변경 + + }catch(Exception ex) { + ex.printStackTrace(); + } + + + } + +} \ No newline at end of file diff --git a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java index 1c27555b..47101683 100644 --- a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java +++ b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java @@ -446,6 +446,8 @@ public class EduEndAdultController { , "QTMPLA_0000000000001" , vEALettnQestnrMIXService , egovQustnrRespondInfoService + , vEEduAplctVO.getEduAplctOrd() + , vEEduAplctVO.getEduChasiOrd() ); }catch(Exception ex) { diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index 777ddf1a..9db6229d 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -776,6 +776,8 @@ public class FndtnEnhanceTrnController { , "QTMPLA_0000000000001" , vEALettnQestnrMIXService , egovQustnrRespondInfoService + , vEPrcsDetailVO.getEduAplctOrd() + , vEPrcsDetailVO.getEduChasiOrd() ); }catch(Exception ex) { diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java index 5542e443..16db3699 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java @@ -505,6 +505,8 @@ public class EduEndTngrController { , "QTMPLA_0000000000001" , vEALettnQestnrMIXService , egovQustnrRespondInfoService + , vEEduAplctVO.getEduAplctOrd() + , vEEduAplctVO.getEduChasiOrd() ); }catch(Exception ex) { diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java index 326bc025..f4a4baa2 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java @@ -281,6 +281,8 @@ public class EduRsltMngAdultController { , "QTMPLA_0000000000001" , vEALettnQestnrMIXService , egovQustnrRespondInfoService + , vEEduAplctVO.getEduAplctOrd() + , vEEduAplctVO.getEduChasiOrd() ); }catch(Exception ex) { @@ -372,6 +374,8 @@ public class EduRsltMngAdultController { , "QTMPLA_0000000000001" , vEALettnQestnrMIXService , egovQustnrRespondInfoService + , vEEduAplctVO.getEduAplctOrd() + , vEEduAplctVO.getEduChasiOrd() ); }catch(Exception ex) { diff --git a/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java b/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java index 074afb64..c57f9cb5 100644 --- a/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java +++ b/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java @@ -19,6 +19,7 @@ import kcc.let.uss.notify.service.NotifyManageService; import kcc.let.uss.notify.service.NotifyManageVO; import kcc.let.uss.umt.service.EgovUserManageService; import kcc.let.uss.umt.service.UserManageVO; +import kcc.let.utl.fcc.service.ITNotiUtil; import kcc.ve.adv.tngr.stngInfo.service.VEAStngService; import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO; import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ScholInfoMIXService; @@ -74,6 +75,11 @@ public class CommonManageWebController { //알림 @Resource(name = "NotifyManageService") private NotifyManageService notifyManageService; + + //알림 + @Resource(name = "iTNotiUtil") + private ITNotiUtil iTNotiUtil; + /** * 학교정보 검색 팝업 리스트 @@ -182,6 +188,19 @@ public class CommonManageWebController { //old //notifyManageService.insertNotifyAprvlCdForUser(loginVO, vEEduAplctVO.getEduAplctOrd(), vEEduAplctVO.getLctrDivCd(), vEEduAplctVO.getAprvlCd()); + iTNotiUtil.insertNotifyNew( + vEEduAplctVO.getLctrDivCd(), + loginVO.getUniqId(), + VeConstants.NOTI_STATUS_11, + vEEduAplctVO.getEduAplctOrd(), + vEEduAplctVO.getEduChasiOrd(), + "1", + "1" + ); + + /* + iTNotiUtil.insertNotifyNew(p_notifyManageService, p_lctrDivCd, p_RegisterId, p_noti_status_cd, p_eduAplctOrd, p_eduChasiOrd, p_move_param_type, p_noti_param_type); + try { //new - 2024.02.02 NotifyManageVO notifyManageVO = new NotifyManageVO(); @@ -201,13 +220,14 @@ public class CommonManageWebController { //알림 대상자 선정에 필요한 파라미터 설정 notifyManageVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); } - + a //new 알림-2024.02.02 notifyManageService.insertNotifyNew(notifyManageVO, VeConstants.NOTI_STATUS_11); //교육신청 - 상태변경 }catch(Exception ex) { ex.printStackTrace(); } + */ } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java index 316cde31..a3842102 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java @@ -480,6 +480,8 @@ public class EduRsltMngTngrController { , "QTMPLA_0000000000001" , vEALettnQestnrMIXService , egovQustnrRespondInfoService + , vEEduAplctVO.getEduAplctOrd() + , vEEduAplctVO.getEduChasiOrd() ); }catch(Exception ex) { @@ -708,6 +710,8 @@ public class EduRsltMngTngrController { , "QTMPLA_0000000000001" , vEALettnQestnrMIXService , egovQustnrRespondInfoService + , vEEduAplctVO.getEduAplctOrd() + , vEEduAplctVO.getEduChasiOrd() ); /* model = this._qustnrQesItm( diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index 3dc53322..012d9d4b 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -4530,9 +4530,15 @@ , A.rslt_atch_file_id AS rsltAtchFileId , I10.qustnr_tmplat_id AS qustnrTmplatId + /* , I10.qestnr_id_10 AS qestnrId10 , I20.qestnr_id_20 AS qestnrId20 , I30.qestnr_id_30 AS qestnrId30 + */ + + , NVL(F.QESTNR_ID_10, I10.qestnr_id_10) AS qestnrId10 + , NVL(F.QESTNR_ID_20, I20.qestnr_id_20) AS qestnrId20 + , NVL(F.QESTNR_ID_30, I30.qestnr_id_30) AS qestnrId30 FROM VE_EDU_APLCT A @@ -4577,6 +4583,10 @@ , max(decode(a.site_id_cd,'30',b.QUSTNR_RESPOND_ID)) AS QUSTNR_RESPOND_ID_30 , max(b.qestnr_participant_count) AS QESTNR_PARTICIPANT_COUNT + , max(decode(a.site_id_cd, '10', b.QESTNR_ID)) AS QESTNR_ID_10 + , max(decode(a.site_id_cd, '20', b.QESTNR_ID)) AS QESTNR_ID_20 + , max(decode(a.site_id_cd, '30', b.QESTNR_ID)) AS QESTNR_ID_30 + FROM ( SELECT a.EDU_APLCT_ORD diff --git a/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Tibero.xml index 0a80ab81..9ee2918e 100644 --- a/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Tibero.xml @@ -123,6 +123,61 @@ + + + - +