diff --git a/src/main/java/kcc/com/cmm/web/EgovComUtlController.java b/src/main/java/kcc/com/cmm/web/EgovComUtlController.java index 4af3a99f..9e36879d 100644 --- a/src/main/java/kcc/com/cmm/web/EgovComUtlController.java +++ b/src/main/java/kcc/com/cmm/web/EgovComUtlController.java @@ -113,22 +113,13 @@ public class EgovComUtlController { //linkPage = linkPage+"?baseMenuNo=" + baseMenuNo ; redirectAttributes.addFlashAttribute("baseMenuNo", baseMenuNo); //파라미터숨기기 req.setAttribute("baseMenuNo", baseMenuNo); - session.setAttribute("baseMenuNo", (String)req.getAttribute("baseMenuNo")); + if(req.getAttribute("baseMenuNo") != null) { + session.setAttribute("baseMenuNo", (String)req.getAttribute("baseMenuNo")); + } RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker(link); return redirectUrlMaker.getRedirectUrl(); } - /** - * 공동인증서(구 공인인증서) 페이지 - */ - @RequestMapping("/ML4WebPage.do") - public String ML4WebPage() throws Exception { - - return "/web/kccadr/kccadrCom/ML4WebPage"; - - } - - } \ No newline at end of file diff --git a/src/main/java/kcc/com/snd/service/SendService.java b/src/main/java/kcc/com/snd/service/SendService.java index a698ba30..56e628d5 100644 --- a/src/main/java/kcc/com/snd/service/SendService.java +++ b/src/main/java/kcc/com/snd/service/SendService.java @@ -1,7 +1,10 @@ package kcc.com.snd.service; +import java.util.List; import java.util.Map; +import egovframework.rte.psl.dataaccess.util.EgovMap; + public interface SendService { /** @@ -18,9 +21,9 @@ public interface SendService { * @신청인_접수확인_1 : * TEMPLATE_APP_JUBSU * @chihwan : 없음 - * @신청인_담당자배정_1 : + * @신청인_담당자배정_2 : * TEMPLATE_APP_BAEJUNG - * @chihwan : "caseNo", "team", "examiner", "tel", "email" + * @chihwan : "respondent", "caseNo", "team", "examiner", "tel", "email" * @양당사자_분쟁조정협의회 안건상정 : * TEMPLATE_BOTH_SANGJUNG * @chihwan : "caseNo", "cfrnc", "tel", "email" @@ -38,4 +41,12 @@ public interface SendService { void sendAt(String to, String templateCode, Map chihwan) throws Exception; void sendSms(String to, String subject, String smsContent) throws Exception; + + SendSmsVO selectSendSet() throws Exception; + + void updateSendSet(SendSmsVO sendSmsVO) throws Exception; + + EgovMap selectTEMPLATE_APP_BAEJUNG(EgovMap egovMap) throws Exception; + + List selectTEMPLATE_BOTH_CHULSUK(EgovMap egovMap) throws Exception; } \ No newline at end of file diff --git a/src/main/java/kcc/com/snd/service/SendSmsVO.java b/src/main/java/kcc/com/snd/service/SendSmsVO.java index 51f52358..9319cbb4 100644 --- a/src/main/java/kcc/com/snd/service/SendSmsVO.java +++ b/src/main/java/kcc/com/snd/service/SendSmsVO.java @@ -13,29 +13,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -/** -* @packageName : kcc.com.snd.service -* @templatecode -* @신청인_접수확인_1 : -* TEMPLATE_APP_JUBSU -* @chihwan : 없음 -* @신청인_담당자배정_1 : -* TEMPLATE_APP_BAEJUNG -* @chihwan : "caseNo", "team", "examiner", "tel", "email" -* @양당사자_분쟁조정협의회 안건상정 : -* TEMPLATE_BOTH_SANGJUNG -* @chihwan : "caseNo", "cfrnc", "tel", "email" -* @양당사자_출석요구 n차 : -* TEMPLATE_BOTH_CHULSUK -* @chihwan : "caseNo", "nCha" -* @양당사자_통지 : -* TEMPLATE_BOTH_TONGJI -* @chihwan : "caseNo", "cfrnc" -* @신청인_보완요구 n차 : -* TEMPLATE_APP_BOWAN -* @chihwan : "caseNo", "nCha" -* -*/ @Getter @Setter public class SendSmsVO extends SendAtVO implements Serializable { @@ -45,4 +22,8 @@ public class SendSmsVO extends SendAtVO implements Serializable { private String subject; private String smsContent; + private String atYn; + private String smsYn; + private String emailYn; + } \ No newline at end of file diff --git a/src/main/java/kcc/com/snd/service/impl/SendDAO.java b/src/main/java/kcc/com/snd/service/impl/SendDAO.java index 290fb22d..02c7b10b 100644 --- a/src/main/java/kcc/com/snd/service/impl/SendDAO.java +++ b/src/main/java/kcc/com/snd/service/impl/SendDAO.java @@ -1,9 +1,13 @@ package kcc.com.snd.service.impl; +import java.util.List; + import org.springframework.stereotype.Repository; +import egovframework.rte.psl.dataaccess.util.EgovMap; import kcc.com.cmm.service.impl.EgovComAbstractDAO; import kcc.com.snd.service.SendAtVO; +import kcc.com.snd.service.SendSmsVO; @Repository("sendDAO") public class SendDAO extends EgovComAbstractDAO { @@ -15,4 +19,20 @@ public class SendDAO extends EgovComAbstractDAO { public void updateToken(SendAtVO SendAtVO) throws Exception{ update("sendDAO.updateToken", SendAtVO); } + + public SendSmsVO selectSendSet() throws Exception{ + return (SendSmsVO) select("sendDAO.selectSendSet"); + } + + public void updateSendSet(SendSmsVO sendSmsVO) throws Exception{ + update("sendDAO.updateSendSet", sendSmsVO); + } + + public EgovMap selectTEMPLATE_APP_BAEJUNG(EgovMap egovMap) { + return (EgovMap) select("sendDAO.selectTEMPLATE_APP_BAEJUNG", egovMap); + } + + public List selectTEMPLATE_BOTH_CHULSUK(EgovMap egovMap) { + return (List) list("sendDAO.selectTEMPLATE_BOTH_CHULSUK", egovMap); + } } diff --git a/src/main/java/kcc/com/snd/service/impl/SendServiceImpl.java b/src/main/java/kcc/com/snd/service/impl/SendServiceImpl.java index 46118fc1..544f34fc 100644 --- a/src/main/java/kcc/com/snd/service/impl/SendServiceImpl.java +++ b/src/main/java/kcc/com/snd/service/impl/SendServiceImpl.java @@ -2,6 +2,7 @@ package kcc.com.snd.service.impl; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; import java.util.Map; import javax.annotation.Resource; @@ -10,6 +11,7 @@ import org.apache.commons.beanutils.BeanUtils; import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; +import egovframework.rte.psl.dataaccess.util.EgovMap; import kcc.com.snd.service.SendAtVO; import kcc.com.snd.service.SendAtVO.Content; import kcc.com.snd.service.SendAtVO.Content.At; @@ -63,7 +65,6 @@ public class SendServiceImpl extends EgovAbstractServiceImpl implements SendServ FairnetUtils.sendAt(vo); - System.out.println("test"); } @Override @@ -98,6 +99,25 @@ public class SendServiceImpl extends EgovAbstractServiceImpl implements SendServ System.out.println("test"); } + @Override + public SendSmsVO selectSendSet() throws Exception{ + return sendDAO.selectSendSet(); + } + + @Override + public void updateSendSet(SendSmsVO sendSmsVO) throws Exception{ + sendDAO.updateSendSet(sendSmsVO); + } + + @Override + public EgovMap selectTEMPLATE_APP_BAEJUNG(EgovMap egovMap) throws Exception{ + return sendDAO.selectTEMPLATE_APP_BAEJUNG(egovMap); + } + + @Override + public List selectTEMPLATE_BOTH_CHULSUK(EgovMap egovMap) throws Exception{ + return sendDAO.selectTEMPLATE_BOTH_CHULSUK(egovMap); + } /** * @methodName : timeDiffBefore diff --git a/src/main/java/kcc/xxx/web/XxxController.java b/src/main/java/kcc/xxx/web/XxxController.java index 2a2ffe06..2b8f4ae1 100644 --- a/src/main/java/kcc/xxx/web/XxxController.java +++ b/src/main/java/kcc/xxx/web/XxxController.java @@ -2,6 +2,7 @@ package kcc.xxx.web; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import javax.annotation.Resource; @@ -11,6 +12,7 @@ import org.json.JSONArray; import org.json.simple.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; @@ -19,12 +21,16 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import egovframework.rte.psl.dataaccess.util.EgovMap; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.CmmUtil; import kcc.com.snd.service.SendService; +import kcc.com.snd.service.SendSmsVO; import kcc.utill.OzUtill; import kcc.xxx.service.XxxService; import kcc.xxx.service.XxxVO; +import seed.com.gtm.service.BaseService; +import seed.com.user.mypage.MyPageService; import seed.map.T_MEMBER; import seed.utils.FairnetUtils; @@ -39,17 +45,49 @@ public class XxxController { @Resource(name = "SendService") private SendService sendService; + @Autowired + private MyPageService service2; + + @Autowired + private BaseService bservice; + @Resource private OzUtill ozUtill; @RequestMapping("/xxx/xxxTest.do") public String xxxTest() throws Exception { - T_MEMBER tMember = new T_MEMBER(); + EgovMap params = new EgovMap(); - tMember.setMemberId("seed"); + params.put("caseNo", "하도2021-0423"); - T_MEMBER tMemberDB = xxxService.getMemberForm(tMember.getMemberId()); + try { + SendSmsVO sendSmsVO = sendService.selectSendSet(); +// if("Y".equals(sendSmsVO.getAtYn())) { + + //치환 + EgovMap resultMap = sendService.selectTEMPLATE_APP_BAEJUNG(params); + params.put("rceptNo", resultMap.get("rceptNo").toString()); + + //신청인 + List > list = service2.selectApplcnt(params); + list.stream().forEach(t -> { + try { + Map chihwan = new HashMap(); + chihwan.put("caseNo", resultMap.get("caseNo") == null ? "" : resultMap.get("caseNo").toString()); + chihwan.put("cfrnc", resultMap.get("conferenceNames") == null ? "" : resultMap.get("conferenceNames").toString()); + chihwan.put("tel", resultMap.get("memberTel") == null ? "" : resultMap.get("memberTel").toString()); + chihwan.put("email", resultMap.get("memberEmail") == null ? "" : resultMap.get("memberEmail").toString()); + + System.out.println(t.get("TEL").toString().replaceAll("-", "")); +// sendService.sendAt(t.get("TEL").toString().replaceAll("-", ""),"TEMPLATE_BOTH_SANGJUNG", chihwan); + } catch (Exception e) { + } + }); +// } + } catch (Exception e) { + System.out.println("알림 발송 실패"); + } return null; } @@ -248,6 +286,7 @@ public class XxxController { //양당사자_분쟁조정협의회 안건상정 { Map chihwan = new HashMap(); + chihwan.put("respondent", "피신청인상호, 피신청인상호2"); chihwan.put("caseNo", "사건번호"); chihwan.put("cfrnc", "협의회명"); chihwan.put("tel", "조사관유선전화"); diff --git a/src/main/java/seed/com/gtm/base/BaseController.java b/src/main/java/seed/com/gtm/base/BaseController.java index 392999e8..dc16af16 100644 --- a/src/main/java/seed/com/gtm/base/BaseController.java +++ b/src/main/java/seed/com/gtm/base/BaseController.java @@ -723,4 +723,5 @@ public class BaseController { return "/_common/jsp/message"; } + } \ No newline at end of file diff --git a/src/main/java/seed/com/gtm/base/GwBaseController.java b/src/main/java/seed/com/gtm/base/GwBaseController.java index 5064ca0c..f8ba9d78 100644 --- a/src/main/java/seed/com/gtm/base/GwBaseController.java +++ b/src/main/java/seed/com/gtm/base/GwBaseController.java @@ -4,6 +4,7 @@ import java.net.URLDecoder; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Enumeration; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -23,11 +24,14 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import egovframework.rte.psl.dataaccess.util.EgovMap; +import kcc.com.snd.service.SendService; +import kcc.com.snd.service.SendSmsVO; import seed.com.gtm.join.MemberJoinService; import seed.com.gtm.service.BaseService; import seed.com.gtm.util.Criteria; import seed.com.gtm.util.JSONView; import seed.com.gtm.util.JSPUtil; +import seed.com.user.mypage.MyPageService; import seed.utils.ApplicationProperty; import seed.utils.GwApi; import seed.utils.SeedUtils; @@ -54,6 +58,12 @@ public class GwBaseController { @Autowired private BaseService bservice; + @Autowired + private SendService sendService; + + @Autowired + private MyPageService service2; + ///gtm/case/nanum/ajax/SanctnhistoryIns.do @RequestMapping(value = "/gtm/newcase/{pageName}/{pageAction}.do") public ModelAndView getManagerNewPage(HttpServletRequest request, @@ -5698,6 +5708,36 @@ v_ret = this.receiverHeader(); bservice.update(params); /*[조정원]사건착수보고서 그룹웨어 결재 완료시*/ + try { + SendSmsVO sendSmsVO = sendService.selectSendSet(); + if("Y".equals(sendSmsVO.getAtYn())) { + + //치환 + EgovMap resultMap = sendService.selectTEMPLATE_APP_BAEJUNG(params); + params.put("rceptNo", resultMap.get("rceptNo").toString()); + + //신청인 + List > list = service2.selectApplcnt(params); + list.stream().forEach(t -> { + try { + Map chihwan = new HashMap(); + chihwan.put("respondent",resultMap.get("respondentCompany") == null ? "" : resultMap.get("respondentCompany").toString()); + chihwan.put("caseNo", resultMap.get("caseNo") == null ? "" : resultMap.get("caseNo").toString()); + chihwan.put("team", resultMap.get("memberDept") == null ? "" : resultMap.get("memberDept").toString()); + chihwan.put("examiner", resultMap.get("memberName") == null ? "" : resultMap.get("memberName").toString()); + chihwan.put("tel", resultMap.get("memberTel") == null ? "" : resultMap.get("memberTel").toString()); + chihwan.put("email", resultMap.get("memberEmail") == null ? "" : resultMap.get("memberEmail").toString()); + + sendService.sendAt(t.get("TEL").toString().replaceAll("-", ""),"TEMPLATE_APP_BAEJUNG", chihwan); + } catch (Exception e) { + } + }); + } + } catch (Exception e) { + System.out.println("알림 발송 실패"); + } + + }else if("5211000000".equals(emap.get("codeNo")) || "5212000000".equals(emap.get("codeNo")) || "5311000000".equals(emap.get("codeNo")) || "5312000000".equals(emap.get("codeNo")) || "5411000000".equals(emap.get("codeNo")) || "5412000000".equals(emap.get("codeNo")) || @@ -5731,6 +5771,34 @@ v_ret = this.receiverHeader(); *5?11000000 = 종료보고서 *5?12000000 = 조사보고서 */ + + try { + SendSmsVO sendSmsVO = sendService.selectSendSet(); + if("Y".equals(sendSmsVO.getAtYn())) { + + //치환 + EgovMap resultMap = sendService.selectTEMPLATE_APP_BAEJUNG(params); + params.put("rceptNo", resultMap.get("rceptNo").toString()); + + //신청인 +// List > list = service2.selectApplcnt(params); + List list = sendService.selectTEMPLATE_BOTH_CHULSUK(params); + list.stream().forEach(t -> { + try { + Map chihwan = new HashMap(); + chihwan.put("caseNo", resultMap.get("caseNo") == null ? "" : resultMap.get("caseNo").toString()); + chihwan.put("cfrnc", resultMap.get("conferenceNames") == null ? "" : resultMap.get("conferenceNames").toString()); + chihwan.put("tel", resultMap.get("memberTel") == null ? "" : resultMap.get("memberTel").toString()); + chihwan.put("email", resultMap.get("memberEmail") == null ? "" : resultMap.get("memberEmail").toString()); + + sendService.sendAt(t.get("tel").toString().replaceAll("-", ""),"TEMPLATE_BOTH_SANGJUNG", chihwan); + } catch (Exception e) { + } + }); + } + } catch (Exception e) { + System.out.println("알림 발송 실패"); + } } if(emap2.get("mediationEndDt") == null || SeedUtils.setReplaceNull(emap2.get("mediationEndDt")).equals("")){ @@ -5812,6 +5880,32 @@ v_ret = this.receiverHeader(); bservice.update(params); /*[조정원]당사자 통지문서 결재 완료시*/ + try { + SendSmsVO sendSmsVO = sendService.selectSendSet(); + if("Y".equals(sendSmsVO.getAtYn())) { + + //치환 + EgovMap resultMap = sendService.selectTEMPLATE_APP_BAEJUNG(params); + params.put("rceptNo", resultMap.get("rceptNo").toString()); + + //신청인 +// List > list = service2.selectApplcnt(params); + List list = sendService.selectTEMPLATE_BOTH_CHULSUK(params); + list.stream().forEach(t -> { + try { + Map chihwan = new HashMap(); + chihwan.put("caseNo", resultMap.get("caseNo") == null ? "" : resultMap.get("caseNo").toString()); + chihwan.put("cfrnc", resultMap.get("conferenceNames") == null ? "" : resultMap.get("conferenceNames").toString()); + + sendService.sendAt(t.get("tel").toString().replaceAll("-", ""),"TEMPLATE_BOTH_TONGJI", chihwan); + } catch (Exception e) { + } + }); + } + } catch (Exception e) { + System.out.println("알림 발송 실패"); + } + }else if("5204000000".equals(emap.get("codeNo")) || "5304000000".equals(emap.get("codeNo")) || "5404000000".equals(emap.get("codeNo")) || "5504000000".equals(emap.get("codeNo")) || "5604000000".equals(emap.get("codeNo")) || "5209000000".equals(emap.get("codeNo")) @@ -5835,6 +5929,43 @@ v_ret = this.receiverHeader(); * 기존에는 대상을 5명까지만 등록하였지만, 999명으로 바뀌면서 * 6번 대상부터는 모두 1번 대상과 동일한 codeNo 사용. * */ + + try { + SendSmsVO sendSmsVO = sendService.selectSendSet(); + if("Y".equals(sendSmsVO.getAtYn())) { + + //치환 + EgovMap resultMap = sendService.selectTEMPLATE_APP_BAEJUNG(params); + params.put("rceptNo", resultMap.get("rceptNo").toString()); + + //신청인 + List > list = service2.selectApplcnt(params); + if(list != null) { + Map chihwan = new HashMap(); + + chihwan.put("caseNo", emap.get("caseNo").toString()); + String ncha = "1"; + + //보완요구 1차 + if("5404000000".equals(emap.get("codeNo"))) { + ncha = "1"; + } + //보완요구 2차 + else if("5409000000".equals(emap.get("codeNo"))) { + ncha = "2"; + } + //보완요구 3차 + else if("5434000000".equals(emap.get("codeNo"))) { + ncha = "3"; + } + + chihwan.put("nCha", ncha); + sendService.sendAt(list.get(0).get("TEL").toString().replaceAll("-", ""),"TEMPLATE_APP_BOWAN", chihwan); + } + } + } catch (Exception e) { + System.out.println("알림 발송 실패"); + } }else if("5205000000".equals(emap.get("codeNo")) || "5305000000".equals(emap.get("codeNo")) || "5405000000".equals(emap.get("codeNo")) || "5505000000".equals(emap.get("codeNo")) || "5605000000".equals(emap.get("codeNo")) || "5210000000".equals(emap.get("codeNo")) @@ -5866,6 +5997,39 @@ v_ret = this.receiverHeader(); bservice.insert(params); /*[조정원]출석요구공문 그룹웨어 결재 완료시 * 타겟 컬럼은 있지만 미사용*/ + try { + SendSmsVO sendSmsVO = sendService.selectSendSet(); + if("Y".equals(sendSmsVO.getAtYn())) { + + //치환 + Map chihwan = new HashMap(); + + chihwan.put("caseNo", emap.get("caseNo").toString()); + String ncha = "1"; + + //출석요구 1차 + if("5407000000".equals(emap.get("codeNo"))) { + ncha = "1"; + } + //출석요구 2차 + else if("5408000000".equals(emap.get("codeNo"))) { + ncha = "2"; + } + chihwan.put("nCha", ncha); + + List list = sendService.selectTEMPLATE_BOTH_CHULSUK(params); + if(list != null) { + for(EgovMap map : list) { + if(map.get("tel") != null && "".equals(map.get("tel"))) { + sendService.sendAt(map.get("tel").toString().replaceAll("-", ""),"TEMPLATE_BOTH_CHULSUK", chihwan); + } + } + + } + } + } catch (Exception e) { + System.out.println("알림 발송 실패"); + } } //}else if("returned".equals(params.get("status"))){ //deleted 로 변경 }else if("deleted".equals(params.get("status"))){ diff --git a/src/main/java/seed/com/user/mediation/WebMediationController.java b/src/main/java/seed/com/user/mediation/WebMediationController.java index 4e3d0171..f025d97c 100644 --- a/src/main/java/seed/com/user/mediation/WebMediationController.java +++ b/src/main/java/seed/com/user/mediation/WebMediationController.java @@ -4,7 +4,6 @@ import java.io.BufferedInputStream; import java.io.FileInputStream; import java.io.IOException; import java.io.OutputStream; -import java.lang.reflect.Field; import java.text.ParseException; import java.util.ArrayList; import java.util.Date; @@ -30,6 +29,8 @@ import org.springframework.web.servlet.ModelAndView; import com.ibm.icu.text.SimpleDateFormat; import egovframework.rte.psl.dataaccess.util.EgovMap; +import kcc.com.snd.service.SendService; +import kcc.com.snd.service.SendSmsVO; import kcc.let.uat.uia.service.CertService; import kcc.let.uat.uia.service.CertVO; import seed.com.gtm.seedfile.SeedFileService; @@ -90,6 +91,9 @@ public class WebMediationController { @Autowired private CertService certService; + @Autowired + private SendService sendService; + @Value("#{config['member.merge']}") private String memberMerge; @@ -4024,6 +4028,23 @@ public class WebMediationController { this.service.deptConfirmUpdate(paramMap); /*[민원인]온라인 분쟁조정시스템 조정신청 완료시*/ + + try { + SendSmsVO sendSmsVO = sendService.selectSendSet(); + if("Y".equals(sendSmsVO.getAtYn())) { + + List > list = service2.selectApplcnt(paramMap); + list.stream().forEach(t -> { + try { + sendService.sendAt(t.get("TEL").toString().replaceAll("-", ""), "TEMPLATE_APP_JUBSU", null); + } catch (Exception e) { + } + }); + + } + } catch (Exception e) { + System.out.println("알림 발송 실패"); + } } // 사건현황, 협의회별 상세 현황 INSERT diff --git a/src/main/java/seed/manager/site/web/ManagerSiteController.java b/src/main/java/seed/manager/site/web/ManagerSiteController.java index 5c7425d3..e67043d1 100644 --- a/src/main/java/seed/manager/site/web/ManagerSiteController.java +++ b/src/main/java/seed/manager/site/web/ManagerSiteController.java @@ -11,6 +11,7 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.nio.charset.Charset; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -18,6 +19,7 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -25,6 +27,10 @@ import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.util.FileCopyUtils; import org.springframework.validation.BindingResult; @@ -36,6 +42,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; +import kcc.com.snd.service.SendService; +import kcc.com.snd.service.SendSmsVO; import seed.common.service.CommonMenuAuthService; import seed.common.service.CommonSatisfactionService; import seed.manager.bbs.service.ManagerBbsDataService; @@ -120,6 +128,9 @@ public class ManagerSiteController { @Autowired private ManagerSurveyManagerService managerSurveyManagerService; + @Resource(name = "SendService") + private SendService sendService; + @Value("#{config['root.path']}") private String rootPath; @@ -169,7 +180,7 @@ public class ManagerSiteController { @RequestMapping(value = "/gtm/siteEdit/{siteIdx}.do", method=RequestMethod.GET) public ModelAndView getSiteEdit(HttpServletResponse httpServletResponse, HttpSession session, Map map, - @PathVariable(value="siteIdx") String siteIdx){ + @PathVariable(value="siteIdx") String siteIdx) throws Exception{ getSeedLicense(httpServletResponse); @@ -197,6 +208,8 @@ public class ManagerSiteController { map.put("memberAuth", memberAuth); + map.put("sendSet", sendService.selectSendSet()); + return new ModelAndView("/manager/site/siteEdit"); } @@ -1423,6 +1436,17 @@ public class ManagerSiteController { return new ModelAndView("/_common/jsp/message"); } + @RequestMapping(value = "/gtm/siteEdit/caseAjax.do") + public ResponseEntity caseAjax(HttpServletRequest request, SendSmsVO sendSmsVO) throws Exception { + + sendService.updateSendSet(sendSmsVO); + + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(new MediaType("text", "plain", Charset.forName("UTF-8"))); + + return new ResponseEntity<>("변경 완료되었습니다.", headers, HttpStatus.OK); + } + private String getBrowser(HttpServletRequest request){ String header = request.getHeader("User-Agent").toLowerCase(); diff --git a/src/main/java/seed/utils/FairnetUtils.java b/src/main/java/seed/utils/FairnetUtils.java index 23f9568b..796a0ac1 100644 --- a/src/main/java/seed/utils/FairnetUtils.java +++ b/src/main/java/seed/utils/FairnetUtils.java @@ -492,7 +492,7 @@ public class FairnetUtils { try { /** SSL 인증서 무시 : 비즈뿌리오 API 운영을 접속하는 경우 해당 코드 필요 없음 **/ - if(ppurioGlobalSet.getHost().contains("https://api.bizppurio.com")) { + if(!ppurioGlobalSet.getHost().contains("https://api.bizppurio.com")) { TrustManager[] trustAllCerts = new TrustManager[] {new X509TrustManager() { public X509Certificate[] getAcceptedIssuers() { return null; } public void checkClientTrusted(X509Certificate[] chain, String authType) { } @@ -598,12 +598,13 @@ public class FairnetUtils { + "귀사(하)의 조정신청이 접수 완료되었습니다.\r\n" + "향후 담당부서 및 담당자가 배정될 예정입니다."; break; - case "TEMPLATE_APP_BAEJUNG": // 신청인_담당자배정_1 - at.setTemplatecode("bizp_2024112810423516931294012"); + case "TEMPLATE_APP_BAEJUNG": // 신청인_담당자배정_2 +// at.setTemplatecode("bizp_2024112810423516931294012"); + at.setTemplatecode("bizp_2024121915475924487679960"); content = "[한국공정거래조정원]\r\n" - + "귀사(하)가 (피신청인 상호명)을(를) 상대로 신청한 사건의 사건번호는 #{caseNo}, 담당자는 #{team}팀 #{examiner} 조사관(유선전화:#{tel}, 메일주소 #{email})입니다.\r\n" + + "귀사(하)가 #{respondent}을(를) 상대로 신청한 사건의 사건번호는 #{caseNo}, 담당자는 #{team}팀 #{examiner} 조사관(유선전화:#{tel}, 메일주소 #{email})입니다.\r\n" + "향후 담당 조사관이 공문 등을 통해 연락드릴 예정입니다."; - requiredPlaceholders.put(at.getTemplatecode(), new String[]{"caseNo", "team", "examiner", "tel", "email"}); + requiredPlaceholders.put(at.getTemplatecode(), new String[]{"respondent","caseNo", "team", "examiner", "tel", "email"}); break; case "TEMPLATE_BOTH_SANGJUNG": // 양당사자_분쟁조정협의회 안건상정 at.setTemplatecode("bizp_2024112810492919814837182"); diff --git a/src/main/resources/egovframework/sqlmap/com/cmm/snd/Send_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/com/cmm/snd/Send_SQL_Oracle.xml index 665f295c..355e27cf 100644 --- a/src/main/resources/egovframework/sqlmap/com/cmm/snd/Send_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/com/cmm/snd/Send_SQL_Oracle.xml @@ -5,6 +5,7 @@ + + SELECT + A.AT_YN AS atYn, + A.SMS_YN AS smsYn, + A.EMAIL_YN AS emailYn + FROM + UNP_SEND_SET A + + + + UPDATE UNP_SEND_SET + SET + AT_YN = #atYn#, + SMS_YN = #smsYn#, + EMAIL_YN = #emailYn# + + + + + + + diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index f04fda13..00d7d3b7 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -7,11 +7,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/manager/site/siteEdit.jsp b/src/main/webapp/WEB-INF/jsp/manager/site/siteEdit.jsp index e5e222a2..94b0939a 100644 --- a/src/main/webapp/WEB-INF/jsp/manager/site/siteEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/manager/site/siteEdit.jsp @@ -1,4 +1,4 @@ -<%@ page contentType="text/html;charset=utf-8" %> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://www.springframework.org/tags" prefix="s"%> <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> @@ -8,21 +8,27 @@ - - @@ -39,47 +45,41 @@ -
-
-
-

알림톡 발송 설정

-
- - - - +
+
+
+
+

알림톡 발송 설정

+
+ checked> + + checked> + +
+
+
+

문자 발송 설정

+
+ checked> + + checked> + +
+
+
+

이메일 발송 설정

+
+ checked> + + checked> + +
-
-

문자 발송 설정

-
- - - - -
-
-
-

이메일 발송 설정

-
- - - - -
-
-
-
+ + -
- - - - -
-