diff --git a/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java b/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java index 12beb784..1e864f8e 100644 --- a/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java +++ b/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java @@ -1,5 +1,7 @@ package kcc.kccadr.cmm.service; +import java.util.Map; + import egovframework.rte.psl.dataaccess.util.EgovMap; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; @@ -43,4 +45,8 @@ public interface SMSOracleService { public String insertSmsOtpCertNumSend(AdjReqMgrVO adjReqMgrVO) throws Exception; public String selectAdrOtpCertNumSmsLog(AdjReqMgrVO adjReqMgrVO) throws Exception; + + public EgovMap selectAdrSendType() throws Exception; + + public void updateAdrSendType(Map map) throws Exception; } diff --git a/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java b/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java index f913fe86..a0148f75 100644 --- a/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java +++ b/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java @@ -173,7 +173,7 @@ public class SMSOracleServiceImpl extends EgovAbstractServiceImpl implements SM apiVO.setMessage(sendMsg); if("Y".equals(alrimtalkYn)) { -// kakaoAtSendDAO.insertKakaoAtSendBatch(apiVO); + kakaoAtSendDAO.insertKakaoAtSendBatch(apiVO); } result = "succ"; @@ -778,5 +778,16 @@ public class SMSOracleServiceImpl extends EgovAbstractServiceImpl implements SM return msgMgrDAO.selectAdrOtpCertNumSmsLog(adjReqMgrVO); } - + + @Override + public EgovMap selectAdrSendType() throws Exception { + //전송 수단별 발송여부 + EgovMap sendTypeMap = msgMgrDAO.selectAdrSendType(); + return sendTypeMap; + } + + @Override + public void updateAdrSendType(Map map) throws Exception { + msgMgrDAO.updateAdrSendType(map); + } } diff --git a/src/main/java/kcc/kccadr/message/SchedulerUtil.java b/src/main/java/kcc/kccadr/message/SchedulerUtil.java index ff358624..4a377cd7 100644 --- a/src/main/java/kcc/kccadr/message/SchedulerUtil.java +++ b/src/main/java/kcc/kccadr/message/SchedulerUtil.java @@ -58,6 +58,8 @@ public class SchedulerUtil { try { ip = InetAddress.getLocalHost().getHostAddress(); + System.out.println("===========at scheduler run============"); + System.out.println("server ip ============" + ip); if(ip.equals(myLocalIp) || ip.equals(devIp) || ip.equals(dmzIp1) || ip.equals(dmzIp2) ) { //접속 서버 별 분기처리 필요 @@ -77,6 +79,7 @@ public class SchedulerUtil { } } + System.out.println("===========at scheduler finish============"); } catch (Exception e) { diff --git a/src/main/java/kcc/kccadr/msg/service/impl/MsgMgrDAO.java b/src/main/java/kcc/kccadr/msg/service/impl/MsgMgrDAO.java index b54288a6..90d04768 100644 --- a/src/main/java/kcc/kccadr/msg/service/impl/MsgMgrDAO.java +++ b/src/main/java/kcc/kccadr/msg/service/impl/MsgMgrDAO.java @@ -1,6 +1,7 @@ package kcc.kccadr.msg.service.impl; import java.util.List; +import java.util.Map; import org.springframework.stereotype.Repository; @@ -96,4 +97,8 @@ public class MsgMgrDAO extends EgovAbstractDAO { return (EgovMap) select("MsgMgrDAO.selectAdrSendType"); } + public void updateAdrSendType(Map map) throws Exception { + update("msgMgrDAO.updateAdrSendType", map); + } + } diff --git a/src/main/java/kcc/kccadr/msg/web/MsgMgrController.java b/src/main/java/kcc/kccadr/msg/web/MsgMgrController.java index 20786cf4..f778e3d1 100644 --- a/src/main/java/kcc/kccadr/msg/web/MsgMgrController.java +++ b/src/main/java/kcc/kccadr/msg/web/MsgMgrController.java @@ -1,6 +1,7 @@ package kcc.kccadr.msg.web; import java.util.List; +import java.util.Map; import javax.annotation.Resource; @@ -10,15 +11,20 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import egovframework.rte.psl.dataaccess.util.EgovMap; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovCmmUseService; import kcc.com.utl.fcc.service.EgovStringUtil; +import kcc.kccadr.cmm.service.SMSOracleService; import kcc.kccadr.msg.service.MsgMgrService; import kcc.kccadr.msg.service.MsgMgrVO; import kcc.kccadr.msg.service.SmsMgrVO; @@ -39,6 +45,9 @@ public class MsgMgrController { @Resource(name = "egovCryptoUtil") EgovCryptoUtil egovCryptoUtil; + @Resource(name = "SMSOracleService") + private SMSOracleService sMSOracleService; + /** * auth : 우영두 * 전자조정 발송문구 목록 화면 @@ -281,6 +290,46 @@ public class MsgMgrController { return "kccadr/msg/sendMsgMgrList"; } + /** + * auth : 이준호 + * 전자조정 발송수단별 사용여부 + * date : 2022.12.07 + */ + @RequestMapping("/kccadr/msg/sendTypeSelectList.do") + public String sendTypeSelectList(ModelMap model) throws Exception { + + EgovMap sendTypeSelect = sMSOracleService.selectAdrSendType(); + + model.addAttribute("sendTypeSelect", sendTypeSelect); + + return "kccadr/msg/sendTypeSelectList"; + } + + /** + * auth : 이준호 + * 전자조정 발송수단별 사용여부 + * date : 2022.12.07 + */ + @ResponseBody + @RequestMapping(value = "/kccadr/msg/sendTypeSelectUpdateAjax.do", method = { RequestMethod.POST }) + public ModelAndView sendTypeSelectUpdateAjax( + @RequestParam Map map, + ModelMap model ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + try { + sMSOracleService.updateAdrSendType(map); + + modelAndView.addObject("result", "SUCCESS"); + modelAndView.addObject("message", "변경되었습니다."); + } catch (Exception e) { + modelAndView.addObject("result", "FAIL"); + } + + return modelAndView; + } + public void decryptInfomation(List list, SmsMgrVO info){ if(CollectionUtils.isNotEmpty(list)){ diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index 4bfdc79f..776e71ca 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -397,8 +397,8 @@ public class EgovLoginController { //if (ProfileUtil.isProd()) { LOGGER.debug("@ prod @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@Start"); //sMSOracleService.selectOracleTest(); // 연동 테스트. 콘솔 로그 확인 - //AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO(); - //sMSOracleService.insertSmsSend(adjReqMgrVO); + AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO(); + sMSOracleService.insertSmsSend(adjReqMgrVO); // sMSOracleService.insertSmsSendTest(); LOGGER.debug("@ prod @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@End"); //} diff --git a/src/main/resources/egovframework/sqlmap/kccadr/msg/Msg_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/msg/Msg_SQL_Mysql.xml index c905ff1c..5e26275f 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/msg/Msg_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/msg/Msg_SQL_Mysql.xml @@ -284,4 +284,19 @@ + + + UPDATE adr_slct_send_type + SET + + email_yn = #value# + + + sms_yn = #value# + + + alrimtalk_yn = #value# + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/msg/sendTypeSelectList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/msg/sendTypeSelectList.jsp new file mode 100644 index 00000000..7c1f0b64 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/msg/sendTypeSelectList.jsp @@ -0,0 +1,147 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : sendMsgMgrList.jsp + * @Description : 발송문자 리스트 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2022.12.7 이준호 최초 생성 + * @author 이준호 + * @since 2022.12.7 + * @version 1.0 + * @see + * + */ +%> + + + + + + + 발송수단별 사용여부 + + +
+
+
+ +
+

발송문자 목록

+
    +
  • + + + +
    • +
  • +

    발송 관리

    +
    • +
  • +

    발송문자 관리

    +
    • +
  • 발송문자 목록
    • +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
구분이메일발송문자발송알림톡발송
+ 사용여부 + +
+ + + + +
+ 		+
+ + + + +
+ 		+
+ + + + +
+
+
+
+
+
+
+ + diff --git a/src/main/webapp/kccadrPb/adm/css/content.css b/src/main/webapp/kccadrPb/adm/css/content.css index fe8b45b7..7f26c00f 100644 --- a/src/main/webapp/kccadrPb/adm/css/content.css +++ b/src/main/webapp/kccadrPb/adm/css/content.css @@ -276,6 +276,12 @@ table select+button{vertical-align: middle;} .dir_input{width: 200px; margin-left: 5px;} +.tbType01 .check_wrap,.tbType01 .radio_wrap{display: inline-flex; max-width: calc(100% - 120px); vertical-align: middle; text-align: left; align-items: center; flex-wrap: wrap;} +.tbType01 .check_wrap:only-child,.tbType01 .radio_wrap:only-child{max-width: 100%;} +.tbType01 .check_wrap span,.tbType01 .radio_wrap span{margin-right: 30px; display: inline-block;} +.tbType01 .check_wrap input,.tbType01 .radio_wrap input{margin: 0; vertical-align: middle; margin-top: 1.5px;} +.tbType01 .check_wrap label,.tbType01 .radio_wrap label{width: auto; height: auto; clip: unset; font-size: 18px; position:static; font-weight: 300; color: #666; vertical-align: middle; margin: 0; margin-left: 5px; margin-right:10px; line-height: 2;} + .tbType02{border-top: 1px solid #000; border-bottom: 1px solid #cccccc;} .tbType02 table{width: 100%; table-layout: fixed} .tbType02 tr{border-bottom: 0.01em solid #e5e5e5;}