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-24 10:35:35 +09:00
commit 079f679e13
17 changed files with 804 additions and 401 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/kcc/com/cmm/web/EgovComUtlController.java
View File

@ -113,22 +113,13 @@ public class EgovComUtlController {
//linkPage = linkPage+"?baseMenuNo=" + baseMenuNo ;
redirectAttributes.addFlashAttribute("baseMenuNo", baseMenuNo); //파라미터숨기기
req.setAttribute("baseMenuNo", 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";
}
}

15
src/main/java/kcc/com/snd/service/SendService.java
View File

@ -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<String, String> 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<EgovMap> selectTEMPLATE_BOTH_CHULSUK(EgovMap egovMap) throws Exception;
}

27
src/main/java/kcc/com/snd/service/SendSmsVO.java
View File

@ -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;
}

20
src/main/java/kcc/com/snd/service/impl/SendDAO.java
View File

@ -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<EgovMap> selectTEMPLATE_BOTH_CHULSUK(EgovMap egovMap) {
return (List<EgovMap>) list("sendDAO.selectTEMPLATE_BOTH_CHULSUK", egovMap);
}
}

22
src/main/java/kcc/com/snd/service/impl/SendServiceImpl.java
View File

@ -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<EgovMap> selectTEMPLATE_BOTH_CHULSUK(EgovMap egovMap) throws Exception{
return sendDAO.selectTEMPLATE_BOTH_CHULSUK(egovMap);
}
/**
* @methodName : timeDiffBefore

45
src/main/java/kcc/xxx/web/XxxController.java
View File

@ -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 <Map <String, Object>> list = service2.selectApplcnt(params);
list.stream().forEach(t -> {
try {
Map<String, String> chihwan = new HashMap<String, String>();
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<String, String> chihwan = new HashMap<String, String>();
chihwan.put("respondent", "피신청인상호, 피신청인상호2");
chihwan.put("caseNo", "사건번호");
chihwan.put("cfrnc", "협의회명");
chihwan.put("tel", "조사관유선전화");

1
src/main/java/seed/com/gtm/base/BaseController.java
View File

@ -723,4 +723,5 @@ public class BaseController {
return "/_common/jsp/message";
}
}

164
src/main/java/seed/com/gtm/base/GwBaseController.java
View File

@ -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 <Map <String, Object>> list = service2.selectApplcnt(params);
list.stream().forEach(t -> {
try {
Map<String, String> chihwan = new HashMap<String, String>();
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 <Map <String, Object>> list = service2.selectApplcnt(params);
List <EgovMap> list = sendService.selectTEMPLATE_BOTH_CHULSUK(params);
list.stream().forEach(t -> {
try {
Map<String, String> chihwan = new HashMap<String, String>();
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 <Map <String, Object>> list = service2.selectApplcnt(params);
List <EgovMap> list = sendService.selectTEMPLATE_BOTH_CHULSUK(params);
list.stream().forEach(t -> {
try {
Map<String, String> chihwan = new HashMap<String, String>();
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 <Map <String, Object>> list = service2.selectApplcnt(params);
if(list != null) {
Map<String, String> chihwan = new HashMap<String, String>();
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<String, String> chihwan = new HashMap<String, String>();
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 <EgovMap> 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"))){

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

@ -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 <Map <String, Object>> 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

26
src/main/java/seed/manager/site/web/ManagerSiteController.java
View File

@ -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<String, Object> 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();

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

@ -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");

133
src/main/resources/egovframework/sqlmap/com/cmm/snd/Send_SQL_Oracle.xml
View File

@ -5,6 +5,7 @@
<typeAlias alias="egovMap" type="egovframework.rte.psl.dataaccess.util.EgovMap"/>
<typeAlias alias="sendAtVO" type="kcc.com.snd.service.SendAtVO"/>
<typeAlias alias="sendSmsVO" type="kcc.com.snd.service.SendSmsVO"/>
<select id="sendDAO.selectToken" resultClass="sendAtVO">
@ -26,4 +27,136 @@
EXPIRED = #expired#
</update>
<select id="sendDAO.selectSendSet" resultClass="sendSmsVO">
SELECT
A.AT_YN AS atYn,
A.SMS_YN AS smsYn,
A.EMAIL_YN AS emailYn
FROM
UNP_SEND_SET A
</select>
<update id="sendDAO.updateSendSet" parameterClass="sendSmsVO">
UPDATE UNP_SEND_SET
SET
AT_YN = #atYn#,
SMS_YN = #smsYn#,
EMAIL_YN = #emailYn#
</update>
<select id="sendDAO.selectTEMPLATE_APP_BAEJUNG" parameterClass="egovMap" resultClass="egovMap">
SELECT
LISTAGG(A.RESPONDENT_COMPANY, ',') WITHIN GROUP (ORDER BY A.RESPONDENT_COMPANY) AS RESPONDENT_COMPANY,
A.CASE_NO AS CASE_NO,
B.RCEPT_NO AS RCEPT_NO,
CASE TO_CHAR(C.MEMBER_DEPT)
WHEN '1001000000' THEN
'한국공정거래조정원'
WHEN '1002000000' THEN
'운영지원팀'
WHEN '1003000000' THEN
'분쟁조정실'
WHEN '1004000000' THEN
'공정거래팀'
WHEN '1005000000' THEN
'가맹거래팀'
WHEN '1006000000' THEN
'건설하도급팀'
WHEN '1007000000' THEN
'제조하도급팀'
WHEN '1008000000' THEN
'약관팀'
WHEN '1030000000' THEN
'유통팀'
WHEN '1009000000' THEN
'대리점팀'
WHEN '1010000000' THEN
'민원상담센터'
WHEN '1020000000' THEN
'관리팀'
ELSE
'기타'
END AS MEMBER_DEPT,
C.MEMBER_NAME AS MEMBER_NAME,
C.MEMBER_TEL AS MEMBER_TEL,
C.MEMBER_EMAIL1
|| '@'
|| C.MEMBER_EMAIL2 AS MEMBER_EMAIL,
D.CONFERENCE_NAMES
FROM
C_CASERESPONDENT A
LEFT OUTER JOIN C_MASTER B
ON A.CASE_NO = B.CASE_NO
LEFT OUTER JOIN T_MEMBER C
ON B.CASE_EXAMINER = C.MEMBER_ID
LEFT OUTER JOIN (
SELECT
A.CFRNC_NO,
A.CONFERENCE_NAMES, B.CASE_NO
FROM
C_CFRNCMANAGE A
INNER JOIN (
SELECT
AA.CFRNC_NO,
AA.CASE_NO
FROM
(
SELECT
A.CFRNC_NO,
A.CASE_NO
FROM
C_ENDMTR A
UNION
ALL
SELECT
B.CFRNC_NO,
B.CASE_NO
FROM
C_DLBRTMTR B
UNION
ALL
SELECT
C.CFRNC_NO,
C.CASE_NO
FROM
C_ENDJOSU C
) AA
) B
ON A.CFRNC_NO = B.CFRNC_NO
) D
ON D.CASE_NO = A.CASE_NO
WHERE
A.CASE_NO = #caseNo#
GROUP BY
A.CASE_NO,
B.RCEPT_NO,
C.MEMBER_DEPT,
C.MEMBER_NAME,
C.MEMBER_TEL,
C.MEMBER_EMAIL1,
C.MEMBER_EMAIL2,
D.CONFERENCE_NAMES
</select>
<select id="sendDAO.selectTEMPLATE_BOTH_CHULSUK" parameterClass="egovMap" resultClass="egovMap">
SELECT
A.SEQ_NO AS SEQ_NO,
A.TEL AS TEL
FROM
C_CASEAPPLCNT A
WHERE
A.CASE_NO = #caseNo#
UNION
ALL
SELECT
B.SEQ_NO AS SEQ_NO,
B.TEL AS TEL
FROM
C_CASERESPONDENT B
WHERE
B.CASE_NO = #caseNo#
</select>
</sqlMap>

6
src/main/resources/log4j2.xml
View File

@ -7,11 +7,7 @@
<!-- %n\t%m -->
<!-- %n\t==================================================================================================== -->
<!-- %n" /> -->
<PatternLayout disableAnsi="false" noConsoleNoAnsi="false" pattern="%highlight{[%d{HH:mm:ss}]}{style=blue} %highlight{%p{length=1} %c %M %L |}{style=red}
%n\t----------------------------------------------------------------------------------------------------
%n\t%m
%n\t----------------------------------------------------------------------------------------------------
%n" />
<PatternLayout disableAnsi="false" noConsoleNoAnsi="false" pattern="%highlight{[%d{HH:mm:ss}]}{style=blue} %highlight{%p{length=1} %c %M %L |}{style=red} %n\t----------------------------------------------------------------------------------------------------%n\t%m%n\t----------------------------------------------------------------------------------------------------%n" />
</Console>
</Appenders>
<Loggers>

56
src/main/webapp/WEB-INF/jsp/manager/site/siteEdit.jsp
View File

@ -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 @@
<head>
<script type="text/javascript">
$(document).ready(function(){
});
function sendYn(obj){
if(confirm("발송설정을 변경하시겠습니까?")){
$.ajax({
url: '/gtm/siteEdit/caseAjax.do',
type: 'POST',
processData: false,
contentType: false,
data: new FormData(document.sendForm),
success: function(response) {
alert(response);
},
error: function(error) {
alert("error");
}
});
}else{
return false;
}
}
</script>
</head>
<body>
@ -39,47 +45,41 @@
</div>
</div>
<form id="sendForm" name="sendForm" action="/gtm/siteEdit/caseAjax.do" method="post">
<fieldset>
<div class="bbs-view-layout">
<div class="bbs-view-item">
<p class="item-title">알림톡 발송 설정</p>
<div class="item-box">
<input type="radio" class="radio" id="atalk1" name="atalk" onclick="return sendYn(this);">
<label for="atalk1"">radio1</label>
<input type="radio" class="radio" id="atalk2" name="atalk" onclick="return sendYn(this);">
<label for="atalk2">radio1</label>
<input type="radio" id="at1" name="atYn" value="Y" onclick="return sendYn();" <c:if test="${sendSet.atYn eq 'Y'}">checked</c:if>>
<label for="at1"">켜기</label>
<input type="radio" id="at2" name="atYn" value="N" onclick="return sendYn();" <c:if test="${sendSet.atYn ne 'Y'}">checked</c:if>>
<label for="at2">끄기</label>
</div>
</div>
<div class="bbs-view-item">
<p class="item-title">문자 발송 설정</p>
<div class="item-box">
<input type="radio" class="radio" id="sms1" name="sms" onclick="return sendYn(this);">
<label for="sms1"">radio1</label>
<input type="radio" class="radio" id="sms2" name="sms" onclick="return sendYn(this);">
<label for="sms2">radio1</label>
<input type="radio" id="sms1" name="smsYn" value="Y" onclick="return sendYn();" <c:if test="${sendSet.smsYn eq 'Y'}">checked</c:if>>
<label for="sms1"">켜기</label>
<input type="radio" id="sms2" name="smsYn" value="N" onclick="return sendYn();" <c:if test="${sendSet.smsYn ne 'Y'}">checked</c:if>>
<label for="sms2">끄기</label>
</div>
</div>
<div class="bbs-view-item">
<p class="item-title">이메일 발송 설정</p>
<div class="item-box">
<input type="radio" class="radio" id="email1" name="test" onclick="return sendYn(this);">
<label for="email1">radio1</label>
<input type="radio" class="radio" id="email2" name="test" onclick="return sendYn(this);">
<label for="email2">radio1</label>
<input type="radio" id="email1" name="emailYn" value="Y" onclick="return sendYn();" <c:if test="${sendSet.emailYn eq 'Y'}">checked</c:if>>
<label for="email1">켜기</label>
<input type="radio" id="email2" name="emailYn" value="N" onclick="return sendYn();" <c:if test="${sendSet.emailYn ne 'Y'}">checked</c:if>>
<label for="email2">끄기</label>
</div>
</div>
</div>
</fieldset>
<div class="btn-area right">
<button type="submit" class="btn-normal btn blue_fill"><s:message code="common.button.mod"/></button>
<c:if test="${tSiteDB.siteStatus == 'D'}">
<a class="btn-normal red dataDel" href="/gtm/proc/siteDelProc/<c:out escapeXml='true' value='${tSiteDB.siteIdx}' />.do"><s:message code="common.button.del"/></a>
</c:if>
</div>
</form>
<form:form id="frm" name="frm" action="/gtm/proc/siteModProc.do" method="post" style="display:none;">
<%-- <form:form id="frm" name="frm" action="/gtm/proc/siteModProc.do" method="post"> --%>
<input type="hidden" name="siteIdx" id="siteIdx" value="<c:out escapeXml='true' value='${tSiteDB.siteIdx}' />" />
<fieldset>
<legend><s:message code="manager.site.siteEdit.table.caption"/></legend>

8
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/statsmng/statsList.jsp
View File

@ -91,15 +91,15 @@ function clipCall(){
}
$("#crfNm").val($("#searchType").val());
/* $("#CLIPDATA_SEARCHVAL").val($("#searchVal").val());
$("#CLIPDATA_SEARCHVAL").val($("#searchVal").val());
$("#CLIPDATA_SEARCHTYPE").val($("#searchType").val());
$("#CLIPDATA_DATEST").val($("#dateSt").val());
$("#CLIPDATA_DATEEND").val($("#dateEnd").val()); */
$("#CLIPDATA_DATEEND").val($("#dateEnd").val());
var f = document.frm;
f.target = "blank";
//f.action = "/clip/ClipReport4/ClipReportViewer/ClipReport4.do";
f.action = "/clip/ozReport/OzReport.do";
f.action = "/clip/ClipReport4/ClipReportViewer/ClipReport4.do";
// f.action = "/clip/ozReport/OzReport.do";
f.submit();
f.target = "_self";
}

5
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp
View File

@ -4656,8 +4656,9 @@ function docOpen(obj) {
</c:if>
</c:if>
<!-- <button type="button" class="btn-default btn btn_text blue_fill" onclick="clipCall('reqPrint', '', '');">신청서출력</button> -->
<button type="button" class="btn-default btn btn_text blue_fill" onclick="clipCallTmp('reqPrint', '', '');">신청서출력</button>
<button type="button" class="btn-default btn btn_text blue_fill" onclick="clipCall('reqPrint', '', '');">신청서출력</button>
<!-- <button type="button" class="btn-default btn btn_text blue_fill" onclick="clipCallTmp('reqPrint', '', '');">신청서출력</button> -->
<!-- <button type="button" class="btn-default btn btn_text blue_fill" onclick="sendPop('email');">이메일</button> -->
</div>
</div>

2
src/main/webapp/kofair_case_seed/usr/index.html
View File

@ -44,7 +44,7 @@
</div>
<div class="swiper-slide popup_wrap">
<div class="img_area">
<img src="/kofair_case_seed/usr/images/main/main_popup_img2.jpg" alt="">
tsetsetsetse
</div>
</div>
<div class="swiper-slide popup_wrap">