diff --git a/pom.xml b/pom.xml index d10c2d93..80c08f67 100644 --- a/pom.xml +++ b/pom.xml @@ -587,33 +587,6 @@ - - - src/main/resources - - egovframework/sqlmap/config/altibase/*.xml - egovframework/sqlmap/config/cubrid/*.xml - egovframework/sqlmap/config/maria/*.xml - egovframework/sqlmap/config/mysql/*.xml - egovframework/sqlmap/config/oracle/*.xml - egovframework/sqlmap/config/tibero/*.xml - egovframework/sqlmap/config/postgresql/*.xml - egovframework/sqlmap/let/**/*.xml - - - - src/main/resources/egovframework/sqlmap/config/${db.type} - - *.xml - - - - src/main/resources/egovframework/sqlmap/let - - **/*SQL_${db.type}.xml - - - install ${basedir}/target ipedu diff --git a/src/main/java/egovframework/migration/service/KcdfNewDAO.java b/src/main/java/egovframework/migration/service/KcdfNewDAO.java deleted file mode 100644 index ce6a9cc9..00000000 --- a/src/main/java/egovframework/migration/service/KcdfNewDAO.java +++ /dev/null @@ -1,31 +0,0 @@ -package egovframework.migration.service; - -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Repository; - -import com.ibatis.sqlmap.client.SqlMapClient; - -import egovframework.rte.psl.dataaccess.EgovAbstractDAO; - -@Repository("KcdfNewDAO") -public class KcdfNewDAO extends EgovAbstractDAO { - @Override - @Resource(name ="kcdfSqlMapClient") - public void setSuperSqlMapClient(SqlMapClient sqlMapClient) { - super.setSuperSqlMapClient(sqlMapClient); - } - - public int selectKcdfBasicCount() { - return (int)select("KcdfNewDAO.selectKcdfBasicCount"); - } - - @SuppressWarnings("unchecked") - public List selectKcdfBbsList(KcdfNewBbsVO tempKcdfNewBbsVO) throws Exception{ - return (List)list("KcdfNewDAO.selectKcdfBbsList", tempKcdfNewBbsVO); - } -} - - diff --git a/src/main/java/egovframework/migration/service/MariaMigrationService.java b/src/main/java/egovframework/migration/service/MariaMigrationService.java deleted file mode 100644 index 7627b7f8..00000000 --- a/src/main/java/egovframework/migration/service/MariaMigrationService.java +++ /dev/null @@ -1,126 +0,0 @@ -package egovframework.migration.service; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -@Service("MariaMigrationService") -public class MariaMigrationService { - - @Resource(name = "KcdfNewDAO") - private KcdfNewDAO kcdfNewDAO; - - @Resource(name = "NcmsDAO") - private NcmsDAO ncmsDAO; - - - public int selectOracleBasicCount() { - // TODO Auto-generated method stub - return 0; - } - - public int selectMariaBasicCount() { - // TODO Auto-generated method stub - return 0; - } - - public int selectOraclePublishCount() { - // TODO Auto-generated method stub - return 0; - } - - public int selectMariaPublishCount() { - // TODO Auto-generated method stub - return 0; - } - - public int selectOracleFileCount() { - // TODO Auto-generated method stub - return 0; - } - - public int selectMariaFileCount() { - // TODO Auto-generated method stub - return 0; - } - - public int selectOracleResrvationCount() { - // TODO Auto-generated method stub - return 0; - } - - public int selectMariaResrvationCount() { - // TODO Auto-generated method stub - return 0; - } - - public void selectOracleBasicList() { - // TODO Auto-generated method stub - - } - - public void selectOraclePublishList() { - // TODO Auto-generated method stub - - } - - public void selectOracleFileList() { - // TODO Auto-generated method stub - - } - - public void selectOracleResrvationList() { - // TODO Auto-generated method stub - - } - - public int selectKcdfBasicCount() { - return kcdfNewDAO.selectKcdfBasicCount(); - } - - public void kcdfMigration() { - try { - - int selectKcdfBasicCount = kcdfNewDAO.selectKcdfBasicCount(); - List list = new ArrayList(); - KcdfNewBbsVO tempKcdfNewBbsVO = new KcdfNewBbsVO(); //limit 를 위해 사용 - int enterval = 100; - int i = 0; - if(selectKcdfBasicCount > enterval){ - for(i=0; i< selectKcdfBasicCount; i++){ //enterval 개씩 끊어서 insert - if (i % enterval == 0 ){ //0 - tempKcdfNewBbsVO.setRecordCountPerPage(enterval); - tempKcdfNewBbsVO.setFirstIndex(i); - list = kcdfNewDAO.selectKcdfBbsList(tempKcdfNewBbsVO); - for(int j=0; j< list.size(); j++){ - ncmsDAO.insertNcmsBbsInfo(list.get(j)); - } - } - } - - /*if(selectKcdfBasicCount != tempKcdfNewBbsVO.getFirstIndex()) { // enterval 개씩 끊어서 insert 후 남은 데이터 insert - tempKcdfNewBbsVO.setFirstIndex(selectKcdfBasicCount); - tempKcdfNewBbsVO.setRecordCountPerPage(enterval); - list = kcdfNewDAO.selectKcdfBbsList(tempKcdfNewBbsVO); - for(i=0; i< list.size(); i++){ - kcdfNewDAO.insertNcmsBbsInfo(list.get(i)); - } - }*/ - }else{ //enterval 개 미만 - tempKcdfNewBbsVO.setFirstIndex(0); - tempKcdfNewBbsVO.setRecordCountPerPage(enterval); - list = kcdfNewDAO.selectKcdfBbsList(tempKcdfNewBbsVO); - for(i=0; i< selectKcdfBasicCount; i++){ - ncmsDAO.insertNcmsBbsInfo(list.get(i)); - } - } - } catch (Exception e) { - System.err.println("migration Exception Error"); - } - } - - -} diff --git a/src/main/java/egovframework/migration/web/MariaMigrationController.java b/src/main/java/egovframework/migration/web/MariaMigrationController.java deleted file mode 100644 index 77ac2b7a..00000000 --- a/src/main/java/egovframework/migration/web/MariaMigrationController.java +++ /dev/null @@ -1,81 +0,0 @@ -package egovframework.migration.web; - -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.ModelAndView; - -import egovframework.migration.service.MariaMigrationService; - -@Controller -public class MariaMigrationController { - - @Resource(name = "MariaMigrationService") - private MariaMigrationService mariaMigrationService; - - @RequestMapping(value="/maria/migration.do") - public String mariaTestPage(ModelMap model) throws Exception{ - - int selectKcdfBasicCount = mariaMigrationService.selectKcdfBasicCount(); - - mariaMigrationService.kcdfMigration(); - - /*List list = orcalTestDAO.selectOracleBasicList();*/ - mariaMigrationService.selectOracleBasicList(); - - - - - int selectMariaBasicCount = mariaMigrationService.selectMariaBasicCount(); - - int selectOraclePublishCount = mariaMigrationService.selectOraclePublishCount(); - int selectMariaPublishCount = mariaMigrationService.selectMariaPublishCount(); - - int selectOracleFileCount = mariaMigrationService.selectOracleFileCount(); - int selectMariaFileCount = mariaMigrationService.selectMariaFileCount(); - - int selectOracleResrvationCount = mariaMigrationService.selectOracleResrvationCount(); - int selectMariaResrvationCount = mariaMigrationService.selectMariaResrvationCount(); - - /*model.addAttribute("selectOracleBasicCount", selectOracleBasicCount ); - model.addAttribute("selectMariaBasicCount", selectMariaBasicCount ); - - model.addAttribute("selectOraclePublishCount", selectOraclePublishCount ); - model.addAttribute("selectMariaPublishCount", selectMariaPublishCount ); - - model.addAttribute("selectOracleFileCount", selectOracleFileCount ); - model.addAttribute("selectMariaFileCount", selectMariaFileCount ); - - model.addAttribute("selectOracleResrvationCount", selectOracleResrvationCount ); - model.addAttribute("selectMariaResrvationCount", selectMariaResrvationCount );*/ - return "test/oracle/TestOracle"; - } - - @RequestMapping(value="/maria/dataBaseAjax.do") - public ModelAndView mariaDataBaseAjax(@RequestParam Map commandMap){ - ModelAndView modelAndView = new ModelAndView(); - modelAndView.setViewName("jsonView"); - - - String type = (String) commandMap.get("type"); - - System.out.println("type : " + type); - if(type =="basic" || type.equals("basic")){ - mariaMigrationService.selectOracleBasicList(); - }else if(type =="Publish" || type.equals("Publish")){ - mariaMigrationService.selectOraclePublishList(); - }else if(type =="file" || type.equals("file")){ - mariaMigrationService.selectOracleFileList(); - }else if(type =="Resrvation" || type.equals("Resrvation")){ - mariaMigrationService.selectOracleResrvationList(); - } - - modelAndView.addObject("result", "TEST"); - return modelAndView; - } -} diff --git a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java index a9b36198..d2b89a75 100644 --- a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java +++ b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java @@ -37,7 +37,6 @@ import kcc.kccadr.adjclsmgr.service.AdjClsMgrService; import kcc.kccadr.adjclsmgr.service.AdjClsMgrVO; import kcc.kccadr.cmm.CmmUtil; import kcc.kccadr.cmm.KccadrConstants; -import kcc.kccadr.cmm.service.SMSOracleService; import kcc.let.utl.fcc.service.EgovCryptoUtil; /** @@ -79,11 +78,6 @@ public class AdjClsMgrController { @Resource(name = "internalApprovManageService") private InternalApprovManageService internalApprovManageService; - // SMS, Email 전송 - @Resource(name = "SMSOracleService") - private SMSOracleService sMSOracleService; - - @RequestMapping(value = "/kccadr/adjclsmgr/adjCloseMangeList.do") public String adjCloseMangeList(@ModelAttribute("adjClsMgrVO") AdjClsMgrVO adjClsMgrVO, ModelMap model) throws Exception { @@ -341,7 +335,6 @@ public class AdjClsMgrController { @RequestMapping(value = "/web/adjclsmgr/sendTestEmail2Ajax.do") public void sendTestEmail2Ajax(HttpServletRequest request) throws Exception { - //sMSOracleService.insertEmailSend(null); } @RequestMapping(value = "/web/adjclsmgr/sendTestEmailAjax.do") diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index a50f9da6..ba5c45c0 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -42,7 +42,6 @@ import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.kccadr.adjst.service.AdjstReqService; import kcc.kccadr.adjst.service.AdjstReqVO; import kcc.kccadr.cmm.KccadrConstants; -import kcc.kccadr.cmm.service.SMSOracleService; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; @@ -68,10 +67,6 @@ public class AdjstReqWebController { private static final Logger LOGGER = LoggerFactory.getLogger(AdjstReqWebController.class); - // 오라클 연동 테스트 - @Resource(name = "SMSOracleService") - private SMSOracleService sMSOracleService; - // 교육신청 서비스단 @Resource(name = "AdjstReqService") private AdjstReqService adjstReqService; @@ -204,13 +199,6 @@ public class AdjstReqWebController { @RequestMapping("/web/kccadr/adjst/adjstReqRegistInformation.do") public String adjstReqRegistInformation(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { adjstReqVO.setStep(KccadrConstants.STEP0); - - // 오라클 연동 테스트 > 여현준 -// sMSOracleService.selectOracleTest(); -// AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO(); -// adjReqMgrVO.setAdrSeq("ADR_0000000000000381"); -// adjReqMgrVO.setStatCd("104010"); -// sMSOracleService.insertSmsSend(adjReqMgrVO); return "/web/kccadr/adjst/adjstReqRegistInformation"; } diff --git a/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java b/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java deleted file mode 100644 index c92115d1..00000000 --- a/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java +++ /dev/null @@ -1,29 +0,0 @@ -package kcc.kccadr.cmm.service; - -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; - -/** - * 저작위 SMS서버를 사용하기 위한 서비스 - * @author 여현준 - * @since 2021.10.25 - * @version 1.0 - * @see - * - * 
- * << 개정이력(Modification Information) >>
- *
- *   수정일      수정자           수정내용
- *  -------    --------    ---------------------------
- *   2021.10.25  여현준          최초 생성
- *
- *
- */ -public interface SMSOracleService { - - // 오라클 연동 테스트 - public void selectOracleTest() throws Exception; - - // SMS 전송(저작위 SMS서버 DB등록) - public String insertSmsSend(VEEduAplctVO vEEduAplctVO) throws Exception; - -} diff --git a/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleDAO.java b/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleDAO.java deleted file mode 100644 index f95370cc..00000000 --- a/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleDAO.java +++ /dev/null @@ -1,57 +0,0 @@ -package kcc.kccadr.cmm.service.impl; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Repository; - -import com.ibatis.sqlmap.client.SqlMapClient; - -import egovframework.rte.psl.dataaccess.EgovAbstractDAO; -import egovframework.rte.psl.dataaccess.util.EgovMap; - -/** - * 저작위 SMS서버를 사용하기 위한 데이터 접근 클래스 - * @author 여현준 - * @since 2021.10.25 - * @version 1.0 - * @see - * - * 
- * << 개정이력(Modification Information) >>
- *
- *   수정일      수정자           수정내용
- *  -------    --------    ---------------------------
- *   2021.10.25  여현준          최초 생성
- *
- *
- */ -@Repository("SMSOracleDAO") -public class SMSOracleDAO extends EgovAbstractDAO { - @Override - @Resource(name ="oracleSqlMapClient") - public void setSuperSqlMapClient(SqlMapClient sqlMapClient) { - super.setSuperSqlMapClient(sqlMapClient); - } - - // SMS 전송 등록 - public void insertSmsSend(EgovMap egovMap) throws Exception{ - insert("SMSOracleDAO.insertSmsSend", egovMap); - } - - // MMS 전송 등록 - public void insertMmsSend(EgovMap egovMap) throws Exception{ - insert("SMSOracleDAO.insertMmsSend", egovMap); - } - - // 연동 테스트 - public int selectOracleTest() throws Exception{ - return (int) select("SMSOracleDAO.selectOracleTest"); - } - - //test - public void insertSmsSendTest() throws Exception{ - - insert("SMSOracleDAO.insertSmsSendTest"); - } - -} diff --git a/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java b/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java deleted file mode 100644 index e364ffb4..00000000 --- a/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java +++ /dev/null @@ -1,115 +0,0 @@ -package kcc.kccadr.cmm.service.impl; - -import javax.annotation.Resource; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; -import egovframework.rte.psl.dataaccess.util.EgovMap; -import kcc.kccadr.cmm.service.SMSOracleService; -import kcc.let.utl.fcc.service.EgovCryptoUtil; -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.impl.VEEduAplctSndHstryDAO; - -/** - * 저작위 SMS서버를 사용하기 위한 서비스 구현 클래스 - * @author 여현준 - * @since 2021.10.25 - * @version 1.0 - * @see - * - * 
- * << 개정이력(Modification Information) >>
- *
- *   수정일      수정자           수정내용
- *  -------    --------    ---------------------------
- *   2021.10.25  여현준          최초 생성
- *
- *
- */ -@Service("SMSOracleService") -public class SMSOracleServiceImpl extends EgovAbstractServiceImpl implements SMSOracleService { - private static final Logger LOGGER = LoggerFactory.getLogger(SMSOracleServiceImpl.class); - - @Value("#{globalSettings['Globals.SMSDB.SendTelNo']}") - private String sendTelNo; // 송신 전화번호 - - @Value("#{globalSettings['Globals.SMSDB.TrId']}") - private String trId; // 시스템 구분자 - - // SMS전송(SMS전송서버-오라클DB) - @Resource(name = "SMSOracleDAO") - private SMSOracleDAO smsOracleDAO; - - //과정 - @Resource(name="vEEduAplctSndHstryDAO") - private VEEduAplctSndHstryDAO vEEduAplctSndHstryDAO; - - @Resource(name = "egovCryptoUtil") - EgovCryptoUtil egovCryptoUtil; - - - // 오라클 연동 테스트 - public void selectOracleTest() throws Exception { - int test = 0; - - try { - test = smsOracleDAO.selectOracleTest(); - } catch (Exception e) { - System.out.println("Exception Occured!!!"); - } - - LOGGER.debug("테스트결과:" + test); - } - - // SMS 전송(저작위 SMS서버 DB등록) - @Override - public String insertSmsSend(VEEduAplctVO vEEduAplctVO) throws Exception { - String result = "fail"; - - -// LOGGER.debug("SMS 전송DB 등록"); - try { - EgovMap map = new EgovMap(); - // test 수신자 번호 - //map.put("rpplPhone", "010-7544-2416"); - map.put("rpplPhone", vEEduAplctVO.getClphone()); - // test - - map.put("sendTelNo", sendTelNo); // 송신자 번호 - map.put("trId", trId); // 시스템 구분자 - - String sndCn = vEEduAplctVO.getSndCn(); - //String sndCd = (String) map.get("sndCd"); - - int bytes = sndCn.getBytes("euc-kr").length; - - if (bytes > 90) { - - } else { - map.put("sendMsg", vEEduAplctVO.getSndCn()); - //찾교는 단문만 지원 - smsOracleDAO.insertSmsSend(map); // SMS 등록 단문 > SMS DB(오라클) - vEEduAplctSndHstryDAO.insert(vEEduAplctVO);; // SMS 이력 등록 단문 - } - - result = "succ"; - } catch (Exception e) { - System.out.println("Exception Occured!!!"); - } - - LOGGER.debug("SMS 전송DB 등록 결과:[" + result +"]"); - return result; - } - - //test - public void insertSmsSendTest() throws Exception{ - - smsOracleDAO.insertSmsSendTest(); - - } - -} diff --git a/src/main/java/kcc/kccadr/kccadrCom/service/impl/KccadrMgrUdtServiceImpl.java b/src/main/java/kcc/kccadr/kccadrCom/service/impl/KccadrMgrUdtServiceImpl.java index 41da57ad..a2b20d2e 100644 --- a/src/main/java/kcc/kccadr/kccadrCom/service/impl/KccadrMgrUdtServiceImpl.java +++ b/src/main/java/kcc/kccadr/kccadrCom/service/impl/KccadrMgrUdtServiceImpl.java @@ -13,7 +13,6 @@ import kcc.com.cmm.util.StringUtil2; import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; import kcc.kccadr.adjreqmgr.service.impl.AdjReqMgrDAO; -import kcc.kccadr.cmm.service.SMSOracleService; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.let.sym.ccm.cde.service.CmmnDetailCodeVO; import kcc.let.sym.ccm.cde.service.EgovCcmCmmnDetailCodeManageService; @@ -33,10 +32,6 @@ public class KccadrMgrUdtServiceImpl implements KccadrMgrUdtService{ @Resource(name = "checkAdrProcessUtil") private CheckAdrProcessUtil checkAdrProcessUtil; - // SMS전송 - @Resource(name = "SMSOracleService") - private SMSOracleService sMSOracleService; - //상세 코드 정보 @Resource(name = "CmmnDetailCodeManageService") private EgovCcmCmmnDetailCodeManageService cmmnDetailCodeManageService; @@ -98,8 +93,6 @@ public class KccadrMgrUdtServiceImpl implements KccadrMgrUdtService{ // 알림(SMS) 전송 if ("real".equals(prodIsLocal)) { LOGGER.debug("@@@ updateAdrMgrUdt 알림SMS 전송 yu3145 start"); - //sMSOracleService.selectOracleTest(); // 연동 테스트. 콘솔 로그 확인 - //sMSOracleService.insertSmsSend(adjReqMgrVO); LOGGER.debug("@@@ updateAdrMgrUdt 알림SMS 전송 yu3145 end"); } 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 13121f72..5d53b38f 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -63,7 +63,6 @@ import kcc.com.cmm.captcha.CaptchaUtil; import kcc.com.cmm.spring.data.util.ProfileUtil; import kcc.com.cmm.util.WebUtil; import kcc.com.utl.user.service.CheckLoginUtil; -import kcc.kccadr.cmm.service.SMSOracleService; import kcc.let.sym.log.clg.service.EgovLoginLogService; import kcc.let.sym.log.clg.service.LoginLog; import kcc.let.sym.mnu.mpm.service.MenuManageJTreeVO; @@ -177,9 +176,6 @@ public class EgovLoginController { @Resource(name = "mberManageService") private EgovMberManageService mberManageService; - @Resource(name = "SMSOracleService") - private SMSOracleService sMSOracleService; - //강사 정보 @Resource(name="vEInstrService") private VEInstrService vEInstrService; @@ -446,16 +442,11 @@ public class EgovLoginController { //if (ProfileUtil.isProd()) { LOGGER.debug("@ prod @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@Start"); - //sMSOracleService.selectOracleTest(); // 연동 테스트. 콘솔 로그 확인 - //AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO(); - //sMSOracleService.insertSmsSend(adjReqMgrVO); - //sMSOracleService.insertSmsSendTest(); LOGGER.debug("@ prod @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@End"); //} // // // LOGGER.debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); -// sMSOracleService.selectOracleTest(); // 연동 테스트. 콘솔 로그 확인 // LOGGER.debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); return "redirect:/web/main/mainPage.do"; diff --git a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java index bebb92b9..4722d4ce 100644 --- a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java +++ b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java @@ -25,7 +25,6 @@ import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.com.utl.user.service.CheckFileUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.kccadr.adjreqmgr.service.AdjReqMgrService; -import kcc.kccadr.cmm.service.SMSOracleService; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.let.sym.ccm.cde.service.EgovCcmCmmnDetailCodeManageService; import kcc.let.uss.ion.cnt.service.CntManageVO; @@ -181,10 +180,6 @@ public class SndMngController { @Resource(name = "sndGnrService") private EgovIdGnrService sndGnrService; - //snd_hstry id gen - @Resource(name = "SMSOracleService") - private SMSOracleService smsOracleService; - @Resource(name = "egovCntManageService") private EgovCntManageService egovCntManageService; @@ -295,7 +290,6 @@ public class SndMngController { System.out.println(vEEduAplctVO.getSndFlag()); -// returnMsg = smsOracleService.insertSmsSend(vEEduAplctVO); //문자 발송 로그 /*String snd_sms_ord = sndGnrService.getNextStringId(); @@ -344,7 +338,7 @@ public class SndMngController { vEEduAplctVO.setSndId(loginVO.getUniqId()); //System.out.println("@@@@@@@ 오라클 시작 ----------------------------------"); - returnMsg = smsOracleService.insertSmsSend(vEEduAplctVO); +// returnMsg = smsOracleService.insertSmsSend(vEEduAplctVO); //System.out.println("@@@@@@@ 오라클 끝 ----------------------------------"); //System.out.println("@@@@@@@ 히스토리 시작 ----------------------------------"); diff --git a/src/main/resources/egovframework/spring/com/context-datasource.xml b/src/main/resources/egovframework/spring/com/context-datasource.xml index 9c982504..cd91b3cf 100644 --- a/src/main/resources/egovframework/spring/com/context-datasource.xml +++ b/src/main/resources/egovframework/spring/com/context-datasource.xml @@ -19,97 +19,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -143,12 +52,4 @@ - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/spring/com/context-sqlMap.xml b/src/main/resources/egovframework/spring/com/context-sqlMap.xml index 2b6de9d3..9ea0f8e3 100644 --- a/src/main/resources/egovframework/spring/com/context-sqlMap.xml +++ b/src/main/resources/egovframework/spring/com/context-sqlMap.xml @@ -26,49 +26,4 @@ - - - - - - - classpath:/egovframework/sqlmap/config/oracle/*.xml - - - - - - - - - - - classpath:/egovframework/sqlmap/config/maria/*.xml - - - - - - - - - - - - - - - diff --git a/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ccm.xml b/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ccm.xml index a595cbf2..58c91768 100644 --- a/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ccm.xml +++ b/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ccm.xml @@ -3,5 +3,5 @@ "http://www.ibatis.com/dtd/sql-map-config-2.dtd"> - + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-sym-log-lgm.xml b/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-sym-log-lgm.xml index 5a47ce93..77a276cd 100644 --- a/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-sym-log-lgm.xml +++ b/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-sym-log-lgm.xml @@ -4,5 +4,5 @@ - + diff --git a/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ve.xml b/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ve.xml index 290ea354..7e01f792 100644 --- a/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ve.xml +++ b/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ve.xml @@ -5,9 +5,9 @@ - + - + diff --git a/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_postgresql.xml b/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Postgresql.xml similarity index 100% rename from src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_postgresql.xml rename to src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Postgresql.xml diff --git a/src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_postgresql.xml b/src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Postgresql.xml similarity index 100% rename from src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_postgresql.xml rename to src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Postgresql.xml diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Postgresql2.xml similarity index 100% rename from src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Postgresql.xml rename to src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Postgresql2.xml diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_postgresql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_postgresql.xml new file mode 100644 index 00000000..379a798d --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_postgresql.xml @@ -0,0 +1,947 @@ + + + + + + + + + + + + + + + + + + + + + + /* userManageDAO.insertUser_S 운영자 */ + INSERT INTO LETTNEMPLYRINFO + ( + ESNTL_ID , + EMPLYR_ID , + USER_NM , + PASSWORD , + + PASSWORD_HINT , + PASSWORD_CNSR , + EMPL_NO , + IHIDNUM , + + SEXDSTN_CODE , + BRTHDY , + AREA_NO , + HOUSE_MIDDLE_TELNO , + + HOUSE_END_TELNO , + FXNUM , + HOUSE_ADRES , + DETAIL_ADRES , + + ZIP , + OFFM_TELNO , + MBTLNUM , + EMAIL_ADRES , + + OFCPS_NM , + GROUP_ID , + ORGNZT_ID , + PSTINST_CODE , + + EMPLYR_STTUS_CODE , + SBSCRB_DE , + + PART_IDX , + + + USER_WORK , + + + + + + + + + + CRTFC_DN_VALUE ) + VALUES ( + #uniqId# , + #emplyrId# , + #emplyrNm# , + #password# , + #passwordHint# , + #passwordCnsr# , + #emplNo# , + #ihidnum# , + #sexdstnCode# , + #brth# , + #areaNo# , + #homemiddleTelno# , + #homeendTelno# , + #fxnum# , + #homeadres# , + #detailAdres# , + #zip# , + #offmTelno# , + #moblphonNo# , + #emailAdres# , + #ofcpsNm# , + #groupId# , + #orgnztId# , + #insttCode# , + #emplyrSttusCode# , + SYSDATE , + + #partIdx# , + + + #userWork# , + + + #snsId# , + #snsEmail# , + + #subDn# ) + + + + + /* userManageDAO.insertUser_GNR 일반사용자 */ + INSERT + INTO lettngnrlmber + ( + mber_id, + password, + mber_nm, + mber_sttus, + mbtlnum, + group_id, + sbscrb_de, + esntl_id, + dept, + mber_seq, + frst_regist_pnttm, + last_updt_pnttm + ) + VALUES + ( + #uniqId# + , '1' + , #emplyrNm# + , #emplyrSttusCode# + , #moblphonNo# + , NULL + , SYSDATE + , #uniqId# + , NULL + , #mberSeq# + , SYSDATE + , SYSDATE + ) + + + + + + + + + + + UPDATE LETTNEMPLYRINFO + SET EMPLYR_ID = #emplyrId# , + + PASSWORD_HINT = #passwordHint# , + + + PASSWORD_CNSR = #passwordCnsr# , + + + EMPL_NO = #emplNo# , + + + IHIDNUM = #ihidnum# , + + + SEXDSTN_CODE = #sexdstnCode# , + + + BRTHDY = #brth# , + + + AREA_NO = #areaNo# , + + + HOUSE_MIDDLE_TELNO = #homemiddleTelno# , + + + HOUSE_END_TELNO = #homeendTelno# , + + + FXNUM = #fxnum# , + + + HOUSE_ADRES = #homeadres# , + + + DETAIL_ADRES = #detailAdres# , + + + ZIP = #zip# , + + + OFFM_TELNO = #offmTelno# , + + + MBTLNUM = #moblphonNo# , + + + EMAIL_ADRES = #emailAdres# , + + + OFCPS_NM = #ofcpsNm# , + + + GROUP_ID = #groupId# , + + + ORGNZT_ID = #orgnztId# , + + + PSTINST_CODE = #insttCode# , + + + EMPLYR_STTUS_CODE = #emplyrSttusCode# , + + + PART_IDX = #partIdx# , + + + CRTFC_DN_VALUE = #subDn# , + + + USER_WORK = #userWork# , + + USER_NM = #emplyrNm# + WHERE ESNTL_ID = #uniqId# + + + + + + + + + + + + + + + UPDATE + LETTNEMPLYRINFO + SET + PASSWORD = #password# + WHERE + EMPLYR_ID = #emplyrId# + AND + EMAIL_ADRES = #emailAdres# + + + + + + + + + + + + + + + INSERT + INTO LETTNGNRLMBER + ( + ESNTL_ID , + MBER_ID , + MBER_NM , + PASSWORD , + + PASSWORD_HINT , + PASSWORD_CNSR , + IHIDNUM , + ZIP , + + ADRES , + AREA_NO , + MBER_STTUS , + DETAIL_ADRES , + + END_TELNO , + MBTLNUM , + GROUP_ID , + MBER_FXNUM , + + MBER_EMAIL_ADRES , + MIDDLE_TELNO , + SEXDSTN_CODE, + BIRTH_DAY, + + EMAIL_YN, + SMS_YN , + PHOTOFILE_ID, + SBSCRB_DE + ) + VALUES + ( + #uniqId#, + #mberId#, + #mberNm#, + #password#, + + #passwordHint#, + #passwordCnsr#, + #ihidnum#, + #zip#, + + #adres#, + #areaNo#, + #mberSttus#, + #detailAdres#, + + #endTelno#, + #moblphonNo#, + #groupId#, + #mberFxnum# , + + #mberEmailAdres#, + #middleTelno#, + #sexdstnCode#, + #birth#, + + #emailYN#, + #smsYN#, + #photofileId#, + SYSDATE + ) + + + + INSERT + INTO LETTNGNRLMBER + ( + ESNTL_ID , + MBER_ID , + MBER_NM , + PASSWORD , + + PASSWORD_HINT , + PASSWORD_CNSR , + IHIDNUM , + ZIP , + + ADRES , + AREA_NO , + MBER_STTUS , + DETAIL_ADRES , + + END_TELNO , + MBTLNUM , + GROUP_ID , + MBER_FXNUM , + + MBER_EMAIL_ADRES , + MIDDLE_TELNO , + SEXDSTN_CODE, + BIRTH_DAY, + + EMAIL_YN, + SMS_YN , + PHOTOFILE_ID, + + + + + + + + + SBSCRB_DE + ) + VALUES + ( + #uniqId#, + #mberId#, + #mberNm#, + #password#, + + #passwordHint#, + #passwordCnsr#, + #ihidnum#, + #zip#, + + #adres#, + #areaNo#, + #mberSttus#, + #detailAdres#, + + #endTelno#, + #moblphonNo#, + #groupId#, + #mberFxnum# , + + #mberEmailAdres#, + #middleTelno#, + #sexdstnCode#, + #birth#, + + #emailYN#, + #smsYN#, + #photofileId#, + + #snsId# , + #snsEmail# , + + SYSDATE + ) + + + + + UPDATE + LETTNEMPLYRINFO + SET + EMPLYR_STTUS_CODE = #emplyrSttusCode# + WHERE + ESNTL_ID = #esntlId# + + + + DELETE FROM LETTNEMPLYRINFO + WHERE EMPLYR_STTUS_CODE = 'D' + + + + + + + DELETE FROM LETTNADMINLOG + WHERE 1=1 + + AND CREAT_DT + DATE_ADD(CURDATE(), INTERVAL -#adminlogKpCd# MONTH) + + + + + + + INSERT INTO TB_RECENT_SEARCH (EMPLYR_ID, SEARCH_WORD) VALUES (#emplyrId#, #searchWord#) + ON DUPLICATE KEY UPDATE EMPLYR_ID =#emplyrId#, SEARCH_WORD=#searchWord# + + + + + UPDATE LOC_INFO + SET USER_NM = #emplyrNm# , + + OFFM_TELNO = #offmTelno# , + + + OFCPS_NM = #ofcpsNm# , + + + + + USER_WORK = #userWork# , + + + SORT = #sort# , + + PART_IDX = #partIdx# + WHERE LOC_INFO_ID = #locInfoId# + + + + INSERT + INTO LOC_INFO + ( + LOC_INFO_ID, + USER_NM, + OFCPS_NM, + OFFM_TELNO, + PART_IDX, + USER_WORK + ) + VALUES + ( + #locInfoId#, + #userNm#, + #ofcpsNm#, + #offmTelno#, + #partIdx#, + #userWork# + ) + + + + + + UPDATE + LETTNGNRLMBER + SET + MBER_NM = #emplyrNm# + WHERE + MBER_SEQ = #mberSeq# + + + + + + /* 임시.*NOT_SQL_LOG.* userManageDAO.insertOffeduUser */ + INSERT + INTO lettngnrlmber + ( + mber_id, + password, + mber_sttus, + sbscrb_de, + esntl_id, + frst_regist_pnttm, + last_updt_pnttm + ) + VALUES + ( + #mberId#, + #password#, + #emplyrSttusCode#, + SYSDATE, + #uniqId#, + SYSDATE, + SYSDATE + ) + + + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Postgresql.xml similarity index 100% rename from src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_postgresql.xml rename to src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Postgresql.xml diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml similarity index 100% rename from src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_postgresql.xml rename to src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml