tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/kcc_adr_advc_git

Browse Source
This commit is contained in:
myname 2022-12-22 17:15:32 +09:00
commit 00517a30d1
7 changed files with 204 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
src/main/java/kcc/com/cmm/web/DataTransferController.java Normal file
View File

@ -0,0 +1,180 @@
package kcc.com.cmm.web;
import java.time.LocalDateTime;
import javax.annotation.Resource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
import kcc.com.cmm.LoginVO;
import kcc.com.cmm.service.AdrInnorixFileVO;
import kcc.com.cmm.service.InnorixFileService;
import kcc.com.utl.fcc.service.EgovStringUtil;
import kcc.kccadr.accdnt.ans.service.AnsVO;
import kcc.kccadr.cmm.RestResponse;
/**
*
* @author : 이호영
* @fileName : InnorixFileController.java
* @date : 2022.11.01
* @description : innorix 대용량 파일 업로드 솔루션
* ===========================================================
* DATE AUTHOR NOTE
* ----------------------------------------------------------- *
* 2022.11.01 이호영 최초 생성
*
*
*
*/
@Controller
public class DataTransferController {
private static final Logger logger = LoggerFactory.getLogger(DataTransferController.class);
// ADR_ID
@Resource(name="adrGnrService")
private EgovIdGnrService adrIdgenService;
// ADR_ASS_PST_SEQ
@Resource(name="adrAssMgrPstGnrService")
private EgovIdGnrService adrAssMgrPstGnrService;
// AHS_ID
@Resource(name="adrHstrySeqGnrService")
private EgovIdGnrService adrHstrySeqGnrService;
// FILE_ID
@Resource(name="egovFileIdGnrService")
private EgovIdGnrService egovFileIdGnrService;
//PTC_ID
@Resource(name="egovPrtclManageGnrService")
private EgovIdGnrService egovPrtclManageGnrService;
//RLD_ID
@Resource(name="egovRldMgrManageGnrService")
private EgovIdGnrService egovRldMgrManageGnrService;
//RPPL_ID
@Resource(name="rpplGnrService")
private EgovIdGnrService rpplGnrService;
//USRCNFRM_ID
@Resource(name="egovUsrCnfrmIdGnrService")
private EgovIdGnrService egovUsrCnfrmIdGnrService;
@RequestMapping(value = {"/common/transfer/updateIdsData.do"}, method = RequestMethod.GET)
public ResponseEntity<RestResponse> updateIdsData(@RequestParam String idsTableName, @RequestParam int updateCnt) throws Exception {
String resultMsg = String.format("ids 데이터를 성공적으로 업데이트 했습니다. "
+ "table_name = %s "
+ "update count = %s"
, idsTableName, updateCnt);
try {
if("ADR_ASS_PST_SEQ".equals(idsTableName))
{
for(int i=0; i<updateCnt; i++)
{
String nextId =adrAssMgrPstGnrService.getNextStringId();
System.out.println("nextId :: "+ nextId);
}
}
if("ADR_ID".equals(idsTableName))
{
for(int i=0; i<updateCnt; i++)
{
String nextId =adrIdgenService.getNextStringId();
System.out.println("nextId :: "+ nextId);
}
}
if("AHS_ID".equals(idsTableName))
{
for(int i=0; i<updateCnt; i++)
{
String nextId =adrHstrySeqGnrService.getNextStringId();
System.out.println("nextId :: "+ nextId);
}
}
if("FILE_ID".equals(idsTableName))
{
for(int i=0; i<updateCnt; i++)
{
String nextId =egovFileIdGnrService.getNextStringId();
System.out.println("nextId :: "+ nextId);
}
}
if("PTC_ID".equals(idsTableName))
{
for(int i=0; i<updateCnt; i++)
{
String nextId =egovPrtclManageGnrService.getNextStringId();
System.out.println("nextId :: "+ nextId);
}
}
if("RLD_ID".equals(idsTableName))
{
for(int i=0; i<updateCnt; i++)
{
String nextId =egovRldMgrManageGnrService.getNextStringId();
System.out.println("nextId :: "+ nextId);
}
}
if("RPPL_ID".equals(idsTableName))
{
for(int i=0; i<updateCnt; i++)
{
String nextId =rpplGnrService.getNextStringId();
System.out.println("nextId :: "+ nextId);
}
}
if("USRCNFRM_ID".equals(idsTableName))
{
for(int i=0; i<updateCnt; i++)
{
String nextId =egovUsrCnfrmIdGnrService.getNextStringId();
System.out.println("nextId :: "+ nextId);
}
}
} catch (Exception e) {
e.printStackTrace();
resultMsg = String.format("ids 데이터를 업데이트에 실패하였습니다. \\n"
+ "table_name = %s"
+ "update count = %s", idsTableName, updateCnt);
return ResponseEntity.ok(new RestResponse(HttpStatus.OK, resultMsg, LocalDateTime.now()));
}
// String.format("%s_", str);
return ResponseEntity.ok(new RestResponse(HttpStatus.OK, resultMsg, LocalDateTime.now()));
}
}

6
src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java
View File

@ -75,6 +75,9 @@ public class AdjstPayMentController {
@Value("#{globalSettings['Globals.pay.siteDomain']}")
private String global_siteDomain;
@Value("#{globalSettings['Globals.prod.islocal']}")
private String prodIsLocal;
@Resource(name="PayService")
private PayService payService;
@ -240,6 +243,9 @@ public class AdjstPayMentController {
model.addAttribute("list", adjstPayMentVOList);
model.addAttribute("ssoLoginVO", ssoLoginVO);
model.addAttribute("IsLocal", prodIsLocal);
return "/web/kccadr/accdnt/apm/adjstPayMentDetail";
}

2
src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java
View File

@ -673,6 +673,8 @@ public class AdjstReqStatusController {
model.addAttribute("merchantData", merchantData);
// ======================결제 끝===================
model.addAttribute("IsLocal", prodIsLocal);
return "/web/kccadr/accdnt/ars/tab/docIssReqList";
}

6
src/main/java/kcc/kccadr/kccadrCom/web/PayUtill.java
View File

@ -166,12 +166,6 @@ public class PayUtill {
return resultMap;
}
public void paySetting(HttpServletRequest request, ModelMap model) throws Exception {
}
// ----------------map to VO 세팅------------------

8
src/main/java/kcc/kccadr/message/SchedulerUtil.java
View File

@ -67,8 +67,6 @@ public class SchedulerUtil {
// @SchedulerLock(name = "kakaoAtSendPrcs", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN)
public void kakaoAtSendPrcs() throws Exception {
System.out.println("===========at scheduler run============");
log.error("===========at scheduler run============");
String hostAddr = null;
@ -93,11 +91,10 @@ public class SchedulerUtil {
try {
System.out.println("server ip ============" + hostAddr);
log.error("server ip ============" + hostAddr);
// if(hostAddr.equals(myLocalIp) || hostAddr.equals(devOutIp) || hostAddr.equals(devInIp) || hostAddr.equals(dmzIp1) || hostAddr.equals(dmzIp2) || hostAddr.equals(containerIp) ) {
if(hostAddr.equals(containerIp) ) {
// if(hostAddr.equals(containerIp) ) {
if(hostAddr.equals(dmzIp1) || hostAddr.equals(containerIp) ) {
//접속 서버 별 분기처리 필요
List<KakaoAtSendVO> list = kakaoAtSendService.selectKakaoAtList();
@ -124,7 +121,6 @@ public class SchedulerUtil {
}
System.out.println("===========at scheduler finish============");
log.error("===========at scheduler finish============");
}
@Bean

10
src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/apm/adjstPayMentDetail.jsp
View File

@ -13,9 +13,13 @@
<!-- inipay 결제 js -->
<!--테스트 JS-->
<script language="javascript" type="text/javascript" src="https://stgstdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script>
<!--운영 JS>
<script language="javascript" type="text/javascript" src="https://stdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script> -->
<c:if test="${IsLocal eq 'local'}">
<script language="javascript" type="text/javascript" src="https://stgstdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script>
</c:if>
<!--운영 JS> -->
<c:if test="${IsLocal eq 'real'}">
<script language="javascript" type="text/javascript" src="https://stdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script>
</c:if>
<script type="text/javaScript" language="javascript">
/* function print(){

10
src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp
View File

@ -30,9 +30,13 @@
<script src="/kccadrPb/usr/datepicker/ko_KR.js"></script>
<!-- inipay 결제 js -->
<!--테스트 JS-->
<script language="javascript" type="text/javascript" src="https://stgstdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script>
<!--운영 JS>
<script language="javascript" type="text/javascript" src="https://stdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script> -->
<c:if test="${IsLocal eq 'local'}">
<script language="javascript" type="text/javascript" src="https://stgstdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script>
</c:if>
<!--운영 JS> -->
<c:if test="${IsLocal eq 'real'}">
<script language="javascript" type="text/javascript" src="https://stdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script>
</c:if>
<script type="text/javascript">
function paybtn(pk, recordReadingFlag) {