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

Merge branch 'hylee'

Browse Source
This commit is contained in:
hylee 2022-11-30 17:14:22 +09:00
commit 4ed848c5d1
7 changed files with 82 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java
View File

@ -854,6 +854,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
@Override
public void updateAdjReqMgrEtc(AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws FdlException {
//
String prmtrAdrSn = adjReqMgrOffLineVO.getAdrSn();
AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO();
@ -878,12 +880,41 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
adjReqMgrPastDAO.updateBasicInfo(adjReqMgrPastVO);
// 조정부 수정
adjReqMgrPastDAO.updateMemDeptNm(adjReqMgrPastVO);
if(StringUtils.isNotEmpty(adjReqMgrPastVO.getMemPstSeq()))
{
adjReqMgrPastDAO.updateMemDeptNm(adjReqMgrPastVO);
}else {
AdrMemDeptMgrPstVO adrMemDeptMgrPstVO = new AdrMemDeptMgrPstVO();
adrMemDeptMgrPstVO.setMemPstSeq(adrMemDeptMgrPstGnrService.getNextStringId());
adrMemDeptMgrPstVO.setMemDeptNm(adjReqMgrPastVO.getMemDeptNm());
adrMemDeptMgrPstVO.setFrstRegisterId(adjReqMgrPastVO.getFrstRegisterId());
adrMemDeptMgrPstVO.setLastUpdusrId(adjReqMgrPastVO.getLastUpdusrId());
adjReqMgrPastDAO.insertMemDeptMgrPst(adrMemDeptMgrPstVO);
adjReqMgrPastVO.setMemPstSeq(adrMemDeptMgrPstVO.getMemPstSeq());
}
// 조사관 수정
adjReqMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjReqMgrPastVO.getAssPstUsrNm()));
adjReqMgrPastDAO.updateAssPstUsrNm(adjReqMgrPastVO);
if(StringUtils.isNotEmpty(adjReqMgrPastVO.getAssPstSeq())) {
adjReqMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjReqMgrPastVO.getAssPstUsrNm()));
adjReqMgrPastDAO.updateAssPstUsrNm(adjReqMgrPastVO);
}else {
AdjAssMgrPastVO adjAssMgrPastVO = new AdjAssMgrPastVO();
adjAssMgrPastVO.setAdrSeq(adjReqMgrPastVO.getAdrSeq());
adjAssMgrPastVO.setAdrSn(0);
adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId());
adjAssMgrPastVO.setAssPstUsrTy("50");
adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjReqMgrPastVO.getAssPstUsrNm()));
adjAssMgrPastVO.setFrstRegisterId(adjReqMgrPastVO.getFrstRegisterId());
adjAssMgrPastVO.setLastUpdusrId(adjReqMgrPastVO.getLastUpdusrId());
adjReqMgrPastDAO.insertAdjAssMgrPst(adjAssMgrPastVO);
adjReqMgrPastVO.setAssPstSeq(adjAssMgrPastVO.getAssPstSeq());
}
if(StringUtil.isNotEmpty(adjReqMgrPastVO.getAdrHstrySeq()))
{
@ -916,10 +947,12 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
{
if(prtclRowList.size() > 0)
adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(0));
int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn());
int adrSn = Integer.parseInt(prmtrAdrSn);
int cnt = 1;
logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn);
while(cnt <= adrSn)
{
logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn);
adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService
adjReqMgrPastVO.setAdrSn(Integer.toString(cnt));
adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO);
@ -928,6 +961,24 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
adjReqMgrPastDAO.updateAdrSn(adjReqMgrPastVO);
}
else
{
if(prtclRowList.size() < 1)
{
int adrSn = Integer.parseInt(prmtrAdrSn);
int cnt = 1;
logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn);
while(cnt <= adrSn)
{
logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn);
adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService
adjReqMgrPastVO.setAdrSn(Integer.toString(cnt));
adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO);
cnt++;
}
adjReqMgrPastDAO.updateAdrSn(adjReqMgrPastVO);
}
}
}

8
src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java
View File

@ -735,6 +735,14 @@ public class AdjReqMgrPastController {
}
/**
* @methodName : selectAssMgrPstEncryption
* @author : 이호영
* @date : 2022.11.30
* @description : 과거사건 등록 암호화
* @return
* @throws Exception
*/
@RequestMapping(value = {"/kccadr/adjReqMgOff/selectAssMgrPstEncryption.do"}, method = RequestMethod.GET)
public ResponseEntity<RestResponse> selectAssMgrPstEncryption() throws Exception {

5
src/main/resources/egovframework/egovProps/globals_dev.properties
View File

@ -33,8 +33,9 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver
#\ud074\ub77c\uc6b0\ub4dc \uc11c\ubc84
#Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8
#\uac1c\ubc1c\uc11c\ubc84
#Globals.Url=jdbc:cubrid:119.193.215.98:30000:cubdb:::?charset=utf8
Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8
#Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8
#\uacfc\uac70\uc0ac\uac74\ub4f1\ub85d \ud504\ub85c\uc81d\ud2b8 DB
Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc_pst:::?charset=utf8
#\uc2e4\uc11c\ubc84
#Globals.Url=jdbc:cubrid:192.168.39.146:30000:kcc_adr_advc:::?charset=utf8

4
src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml
View File

@ -846,6 +846,8 @@
UPDATE ADR_MGR_DETAIL SET
PST_CN = #pstCn#
, ADR_ADM_ID = #assPstSeq#
, MEM_DEPT_SEQ = #memPstSeq#
WHERE
ADR_SEQ = #adrSeq#
</update>
@ -856,7 +858,7 @@
ADR_END_DE = NOW()
WHERE
ADR_SEQ = #adrSeq#
</update>
</update>
<update id="adjReqMgrPastDAO.updateAdrSn" parameterClass="AdjReqPastVO">

2
src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp
View File

@ -219,7 +219,7 @@ function onlyNumber(thisObj) {
<div class="id_box">
<p>ID</p>
<label for="id_text"></label>
<input type="text" id="id_text" maxlength="13" placeholder="아이디를 입력해주세요" class="id">
<input type="text" id="id_text" maxlength="15" placeholder="아이디를 입력해주세요" class="id">
</div>
<div class="pw_box">
<p>PASSWORD</p>

13
src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp
View File

@ -67,7 +67,7 @@ $(document).on("click", "#naverLogin", function(){
});
//카카오로그인
Kakao.init('5a964d4a736ef47416f326a646bcfc5e'); //발급받은 키 중 javascript키를 사용해준다.
Kakao.init('bf3de0d897afe0e4bef0775f7086f048'); //발급받은 키 중 javascript키를 사용해준다.
//console.log(Kakao.isInitialized()); // sdk초기화여부판단
function kakaoLogin() {
Kakao.Auth.login({
@ -94,13 +94,15 @@ $(document).on("click", "#naverLogin", function(){
},
})
}
//네이버로그인
//네이버로그인
window.name='opener';
var naverLogin = new naver.LoginWithNaverId(
{
clientId: "iMGwQvTUeD4tVwv41haJ",
callbackUrl: "http://127.0.0.1:8089/web/kccadr/certDoc/snsCallBack.do",
// clientId: "iMGwQvTUeD4tVwv41haJ",
// callbackUrl: "http://127.0.0.1:8089/web/kccadr/certDoc/snsCallBack.do",
callbackUrl: "http://127.0.0.1:8090/web/kccadr/certDoc/snsCallBack.do",
clientId: "UiWLhNqpDveCCjwepWtS",
loginButton: {color: "green", type: 4, height: 40},
isPopup: true /* 팝업을 통한 연동처리 여부 */
}
@ -118,7 +120,6 @@ $(document).on("click", "#naverLogin", function(){
snsLoginForm.method = "post";
snsLoginForm.action = "<c:url value='/web/kccadr/certDoc/certDocInfo.do'/>";
snsLoginForm.submit();
}
function kakaoLogout() {

6
src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp
View File

@ -9,8 +9,10 @@
//네이버로그인
var naverLogin = new naver.LoginWithNaverId(
{
clientId: "iMGwQvTUeD4tVwv41haJ",
callbackUrl: "http://127.0.0.1:8089//web/kccadr/certDoc/snsCallBack.do",
clientId: "UiWLhNqpDveCCjwepWtS",
callbackUrl: "http://127.0.0.1:8090/web/kccadr/certDoc/snsCallBack.do",
// clientId: "iMGwQvTUeD4tVwv41haJ",
// callbackUrl: "http://127.0.0.1:8089//web/kccadr/certDoc/snsCallBack.do",
isPopup: false,
callbackHandle: true
}