diff --git a/pom.xml b/pom.xml index 1534646d..c81ff168 100644 --- a/pom.xml +++ b/pom.xml @@ -613,7 +613,7 @@ install ${basedir}/target - kcc_adr_advc + ROOT diff --git a/src/main/java/kcc/com/cmm/service/AdrInnorixFileEnumVO.java b/src/main/java/kcc/com/cmm/service/AdrInnorixFileEnumVO.java index 371cf040..cd91c4e4 100644 --- a/src/main/java/kcc/com/cmm/service/AdrInnorixFileEnumVO.java +++ b/src/main/java/kcc/com/cmm/service/AdrInnorixFileEnumVO.java @@ -15,7 +15,7 @@ public enum AdrInnorixFileEnumVO { // history 값 private final String p_code_desc; - // history 값 + // history stat 값 private final String p_stat_cd; private final String p_adrHstryMgrSeq; private final String p_updateQuery; diff --git a/src/main/java/kcc/com/cmm/service/AdrInnorixFileVO.java b/src/main/java/kcc/com/cmm/service/AdrInnorixFileVO.java index e75b01e6..83354311 100644 --- a/src/main/java/kcc/com/cmm/service/AdrInnorixFileVO.java +++ b/src/main/java/kcc/com/cmm/service/AdrInnorixFileVO.java @@ -43,6 +43,7 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { public String openYn = ""; public String atchFileId = ""; public String mode = ""; + public String successMsg = ""; public boolean isAdrRpplDoc; /* @@ -225,6 +226,14 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { public void setAdrRpplDoc(boolean isAdrRpplDoc) { this.isAdrRpplDoc = isAdrRpplDoc; } + + public String getSuccessMsg() { + return successMsg; + } + + public void setSuccessMsg(String successMsg) { + this.successMsg = successMsg; + } diff --git a/src/main/java/kcc/com/cmm/service/InnorixFileService.java b/src/main/java/kcc/com/cmm/service/InnorixFileService.java index 1cdda6c8..ebd22d8d 100644 --- a/src/main/java/kcc/com/cmm/service/InnorixFileService.java +++ b/src/main/java/kcc/com/cmm/service/InnorixFileService.java @@ -23,5 +23,8 @@ import kcc.kccadr.cmm.RestResponse; */ public interface InnorixFileService { - RestResponse insertInnorixFileAjax(AdrInnorixFileVO adrInnorixFileVO) throws FdlException, Exception; + RestResponse insertInnorixFileAndRpplAjax(AdrInnorixFileVO adrInnorixFileVO) throws FdlException, Exception; + + RestResponse insertInnorixFile(AdrInnorixFileVO adrInnorixFileVO); + } diff --git a/src/main/java/kcc/com/cmm/service/impl/InnorixFileServiceImpl.java b/src/main/java/kcc/com/cmm/service/impl/InnorixFileServiceImpl.java index 2dc43ecf..23504428 100644 --- a/src/main/java/kcc/com/cmm/service/impl/InnorixFileServiceImpl.java +++ b/src/main/java/kcc/com/cmm/service/impl/InnorixFileServiceImpl.java @@ -1,297 +1,310 @@ -package kcc.com.cmm.service.impl; - -import java.io.File; -import java.io.IOException; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Service; - -import com.dreamsecurity.magicline.util.Log; - -import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; -import egovframework.rte.fdl.cmmn.exception.FdlException; -import egovframework.rte.fdl.idgnr.EgovIdGnrService; -import kcc.com.cmm.service.AdrInnorixFileEnumVO; -import kcc.com.cmm.service.AdrInnorixFileVO; -import kcc.com.cmm.service.EgovFileMngService; -import kcc.com.cmm.service.FileVO; -import kcc.com.cmm.service.InnorixFileService; -import kcc.com.cmm.service.InnorixFileVO; -import kcc.com.cmm.web.InnorixFileController; -import kcc.kccadr.accdnt.ans.service.AnsVO; -import kcc.kccadr.accdnt.ans.service.impl.AnsDAO; -import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; -import kcc.kccadr.cmm.RestResponse; -import kcc.let.utl.fcc.service.EgovStringUtil; - -/** - * @Class Name : EgovCmmUseServiceImpl.java - * @Description : 공통코드등 전체 업무에서 공용해서 사용해야 하는 서비스를 정의하기위한 서비스 구현 클래스 - * @Modification Information - * - * 수정일 수정자 수정내용 - * ------- ------- ------------------- - * 2009. 3. 11. 이삼섭 - * - * @author 공통 서비스 개발팀 이삼섭 - * @since 2009. 3. 11. - * @version - * @see - * - */ -@Service("InnorixFileService") -public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements InnorixFileService { - - private static final Logger log = LoggerFactory.getLogger(InnorixFileServiceImpl.class); - - @Resource(name = "InnorixFileDAO") - private InnorixFileDAO innorixDAO; - - @Resource(name = "FileManageDAO") - private FileManageDAO fileManageDAO; - - @Value("#{globalSettings['Globals.Innorix.FilePath']}") - private String INNO_FILE_PATH; - - @Resource(name = "ansDAO") - private AnsDAO ansDAO; - - // 조정사건이력관리 DAO - @Resource(name = "adrHstryMgrDAO") - private AdrHstryMgrDAO adrHstryMgrDAO; - - @Resource(name = "egovFileIdGnrService") - private EgovIdGnrService idgenService; - - //답변서 idgen 서비스 - @Resource(name = "egovRldMgrManageGnrService") - private EgovIdGnrService egovRldMgrManageGnrService; - - // 첨부파일 정보 - @Resource(name="EgovFileMngService") - private EgovFileMngService fileMngService; - - @Override - public RestResponse insertInnorixFileAjax(AdrInnorixFileVO adrInnorixFileListVO) throws FdlException, Exception { - - try { - AdrInnorixFileEnumVO innorixEnumVO = AdrInnorixFileEnumVO.valueOf(adrInnorixFileListVO.getJspFileName()); - adrInnorixFileListVO = innorixEnumVO.conversion(innorixEnumVO, adrInnorixFileListVO); - - // 파일 저장 후 atchFileId 받아옴 - if("INSERT".equals(adrInnorixFileListVO.getMode())) - adrInnorixFileListVO.setAtchFileId(this.insertFileData(adrInnorixFileListVO)); - if("UPDATE".equals(adrInnorixFileListVO.getMode())) - adrInnorixFileListVO.setAtchFileId(this.updateFileData(adrInnorixFileListVO)); - - log.info("adrInnorixFileListVO.isAdrRpplDoc() :: [{}]", adrInnorixFileListVO.isAdrRpplDoc()); - - if(adrInnorixFileListVO.isAdrRpplDoc()) - adrInnorixFileListVO.setRpplDocSeq(this.insertAdrRpplDoc(adrInnorixFileListVO)); - - // P_code_desc가 없으면 이력을 넣지 않음. - if(StringUtils.isNotEmpty(adrInnorixFileListVO.getP_code_desc())) - this.ansSubmitAjax(adrInnorixFileListVO); - - } catch (Exception e) { - e.printStackTrace(); - return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); - } - - return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now()); - } - - /** - * @methodName : fileDataUpload - * @author : 이호영 - * @date : 2022.11.04 - * @description : 파일정보 업로드 - * @param innorixVO - * @return - * @throws Exception - */ - public String insertFileData(AdrInnorixFileVO innorixVO) throws Exception { - - - String atchFileId = idgenService.getNextStringId(); - - List result = this.fileChange(innorixVO, atchFileId, 0); - - - log.info(" // file data 반복문 끝 "); - // 파일 업로드 - fileManageDAO.insertFileInfs(result); - - return atchFileId; - } - - public String updateFileData(AdrInnorixFileVO innorixVO) throws Exception { - - - String atchFileId = innorixVO.getAtchFileId(); - - - FileVO fvo = new FileVO(); - fvo.setAtchFileId(atchFileId); - int fileSn = fileMngService.getMaxFileSN(fvo); - - List result = this.fileChange(innorixVO, atchFileId, fileSn); - - - // 파일 업로드 - fileManageDAO.updateFileInfs(result); - - return atchFileId; - } - - - - private List fileChange(AdrInnorixFileVO innorixVO, String atchFileId, int fileSn) { - - List result = new ArrayList(); - log.info(" file data 반복문 시작 :: [{}]", innorixVO.getInnorixFileListVO().size()); - for(InnorixFileVO innorixFileVO : innorixVO.getInnorixFileListVO()) - { - FileVO fileVO = new FileVO(); - // new 파일명 - String newName = innorixVO.getP_file_nm_prefix() + EgovStringUtil.getTimeStamp(); - - log.info("[{}]번쨰 newName :: [{}]", fileSn, newName); - - String oriFullPath = INNO_FILE_PATH + innorixFileVO.getServerFileName(); - String newFullPath = INNO_FILE_PATH + newName; - - try { - File orifile = FileUtils.getFile(oriFullPath); - File newfile = FileUtils.getFile(newFullPath); - FileUtils.moveFile(orifile, newfile); - } catch (IOException e) { - log.info("파일명 수정 실패 :: [{}] ==> [{}]", oriFullPath, newFullPath ); - e.printStackTrace(); - } - - fileVO.setAtchFileId(atchFileId); - fileVO.setFileSn(Integer.toString(fileSn)); - fileVO.setFileStreCours(INNO_FILE_PATH); - fileVO.setStreFileNm(newName); - fileVO.setOrignlFileNm(innorixFileVO.getServerFileName()); - fileVO.setFileExtsn(FilenameUtils.getExtension(oriFullPath)); - fileVO.setFileMg(Integer.toString(innorixFileVO.getFileSize())); - - result.add(fileVO); - - fileSn++; - - } - log.info(" // file data 반복문 끝 "); - return result; - } - - /** - * @methodName : updateAdrRpplDoc - * @author : 이호영 - * @date : 2022.11.04 - * @description : ADR_RPPL_DOC 테이블에 데이터 업로드 - * @param adrInnorixFileListVO - * @param fileNextId - * @return - * @throws Exception - */ - private String insertAdrRpplDoc(AdrInnorixFileVO adrInnorixFileListVO) throws Exception { - // RpplDoc Insert - log.info("RpplDoc Insert "); - AnsVO ansVO = new AnsVO(); - ansVO.setAdrSeq(adrInnorixFileListVO.getAdrSeq()); - // adrSn이 비여있으면 과거사건등록문서라 "1"이 고정으로 들어감 - ansVO.setAdrSn(StringUtils.isEmpty(adrInnorixFileListVO.getAdrSn()) ? "1" : adrInnorixFileListVO.getAdrSn()); - ansVO.setRpplDocSeq(egovRldMgrManageGnrService.getNextStringId()); - ansVO.setAdrDocTy(adrInnorixFileListVO.getAdrDocTy()); - ansVO.setAtchFileId(adrInnorixFileListVO.atchFileId); - ansVO.setRpplSeq(adrInnorixFileListVO.getRpplSeq()); - ansVO.setFrstRegistPnttm(adrInnorixFileListVO.getFrstRegistPnttm()); - ansVO.setFrstRegisterId(adrInnorixFileListVO.getFrstRegisterId()); - ansVO.setLastUpdtPnttm(adrInnorixFileListVO.getFrstRegistPnttm()); - ansVO.setLastUpdusrId(adrInnorixFileListVO.getLastUpdusrId()); - ansDAO.ansSubmitAjax_setp1(ansVO); - - log.info(" + ansVO.getRpplDocSeq() :: [{}]", ansVO.getRpplDocSeq()); - return ansVO.getRpplDocSeq(); - - } - - - private void ansSubmitAjax(AdrInnorixFileVO adrInnorixFileListVO) throws Exception { - - AnsVO ansVO = new AnsVO(); - - // ansDAO.ansSubmitAjax_setp2()를 위한 VO 생성 - // 기존 메소드를 타기위해 생성 - ansVO.setAdrSeq(adrInnorixFileListVO.getAdrSeq()); - ansVO.setAdrSn(adrInnorixFileListVO.getAdrSn()); - ansVO.setAdrDocTy(adrInnorixFileListVO.getAdrDocTy()); - ansVO.setRpplSeq(adrInnorixFileListVO.getRpplSeq()); - ansVO.setAdrDocCn1(adrInnorixFileListVO.getAdrDocCn1()); - ansVO.setOpenYn(adrInnorixFileListVO.getOpenYn()); - ansVO.setAtchFileId(adrInnorixFileListVO.getAtchFileId()); - ansVO.setFrstRegisterId(adrInnorixFileListVO.getFrstRegisterId()); - ansVO.setLastUpdusrId(adrInnorixFileListVO.getLastUpdusrId()); - // ansDAO.ansSubmitAjax_setp2()를 위한 VO 생성 - - ansVO.setRpplDocSeq(adrInnorixFileListVO.getRpplDocSeq()); - - adrHstryMgrDAO.insert4Func(adrInnorixFileListVO.getAdrSeq() - //, "상태코드수정" - , adrInnorixFileListVO.getP_code_desc() //, "조정진행관리>>조정진행목록>조정진행상세>사건문서>P>문서등록" //String p_code_desc - CC199 - //, adjReqMgrVO.getStatCd() - , adrInnorixFileListVO.getP_stat_cd() // , "A160" //String p_stat_cd - - , adrInnorixFileListVO.getFrstRegisterId() - , adrInnorixFileListVO.getLastUpdusrId() - , adrInnorixFileListVO.getP_adrHstryMgrSeq() //, String p_adrHstryMgrSeq , "" - , "I" //, String p_useCd I/U/UI/II/RE - , "ADR_RPPL_DOC" //, String p_tableName - , " WHERE 1=1 AND adr_seq='"+adrInnorixFileListVO.getAdrSeq() - +"' AND adr_sn='"+adrInnorixFileListVO.getAdrSn() - +"' AND rppl_doc_seq='"+adrInnorixFileListVO.getRpplDocSeq() - +"' " //, String p_updateQuery - - ); - - ansDAO.ansSubmitAjax_setp2(ansVO); //ADR_RPPL_DOC_OPEN // 공계여부 - - - - //adr_hstry_mgr에 값 넣기 - 시작 - adrHstryMgrDAO.insert4Func(adrInnorixFileListVO.getAdrSeq() - //, "상태코드수정" - , adrInnorixFileListVO.getP_code_desc() - //, adjReqMgrVO.getStatCd() - , adrInnorixFileListVO.getP_stat_cd() - - , adrInnorixFileListVO.getFrstRegisterId() - , adrInnorixFileListVO.getLastUpdusrId() - - , adrInnorixFileListVO.getP_adrHstryMgrSeq() //, String p_adrHstryMgrSeq - , "I" //, String p_useCd I/U/UI/II/RE - , "ADR_RPPL_DOC_OPEN" //, String p_tableName - , " WHERE 1=1 AND adr_seq='"+adrInnorixFileListVO.getAdrSeq() - +"' AND adr_sn='"+adrInnorixFileListVO.getAdrSn() - +"' AND rppl_doc_seq='"+adrInnorixFileListVO.getRpplDocSeq() - +"' AND rppl_seq='"+adrInnorixFileListVO.getRpplSeq() - +"' " //, String p_updateQuery - - ); - - } -} +package kcc.com.cmm.service.impl; + +import java.io.File; +import java.io.IOException; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Resource; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; + +import com.dreamsecurity.magicline.util.Log; + +import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; +import egovframework.rte.fdl.cmmn.exception.FdlException; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.com.cmm.service.AdrInnorixFileEnumVO; +import kcc.com.cmm.service.AdrInnorixFileVO; +import kcc.com.cmm.service.EgovFileMngService; +import kcc.com.cmm.service.FileVO; +import kcc.com.cmm.service.InnorixFileService; +import kcc.com.cmm.service.InnorixFileVO; +import kcc.com.cmm.web.InnorixFileController; +import kcc.kccadr.accdnt.ans.service.AnsVO; +import kcc.kccadr.accdnt.ans.service.impl.AnsDAO; +import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; +import kcc.kccadr.cmm.RestResponse; +import kcc.let.utl.fcc.service.EgovStringUtil; + +/** + * @Class Name : EgovCmmUseServiceImpl.java + * @Description : 공통코드등 전체 업무에서 공용해서 사용해야 하는 서비스를 정의하기위한 서비스 구현 클래스 + * @Modification Information + * + * 수정일 수정자 수정내용 + * ------- ------- ------------------- + * 2009. 3. 11. 이삼섭 + * + * @author 공통 서비스 개발팀 이삼섭 + * @since 2009. 3. 11. + * @version + * @see + * + */ +@Service("InnorixFileService") +public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements InnorixFileService { + + private static final Logger log = LoggerFactory.getLogger(InnorixFileServiceImpl.class); + + @Resource(name = "InnorixFileDAO") + private InnorixFileDAO innorixDAO; + + @Resource(name = "FileManageDAO") + private FileManageDAO fileManageDAO; + + @Value("#{globalSettings['Globals.Innorix.FilePath']}") + private String INNO_FILE_PATH; + + @Resource(name = "ansDAO") + private AnsDAO ansDAO; + + // 조정사건이력관리 DAO + @Resource(name = "adrHstryMgrDAO") + private AdrHstryMgrDAO adrHstryMgrDAO; + + @Resource(name = "egovFileIdGnrService") + private EgovIdGnrService idgenService; + + //답변서 idgen 서비스 + @Resource(name = "egovRldMgrManageGnrService") + private EgovIdGnrService egovRldMgrManageGnrService; + + // 첨부파일 정보 + @Resource(name="EgovFileMngService") + private EgovFileMngService fileMngService; + + @Override + public RestResponse insertInnorixFileAndRpplAjax(AdrInnorixFileVO adrInnorixFileVO) throws FdlException, Exception { + + try { + AdrInnorixFileEnumVO innorixEnumVO = AdrInnorixFileEnumVO.valueOf(adrInnorixFileVO.getJspFileName()); + adrInnorixFileVO = innorixEnumVO.conversion(innorixEnumVO, adrInnorixFileVO); + + // 파일 저장 후 atchFileId 받아옴 + if("INSERT".equals(adrInnorixFileVO.getMode())) + adrInnorixFileVO.setAtchFileId(this.insertFileData(adrInnorixFileVO)); + if("UPDATE".equals(adrInnorixFileVO.getMode())) + adrInnorixFileVO.setAtchFileId(this.updateFileData(adrInnorixFileVO)); + + log.info("adrInnorixFileListVO.isAdrRpplDoc() :: [{}]", adrInnorixFileVO.isAdrRpplDoc()); + + if(adrInnorixFileVO.isAdrRpplDoc()) + adrInnorixFileVO.setRpplDocSeq(this.insertAdrRpplDoc(adrInnorixFileVO)); + + // P_code_desc가 없으면 이력을 넣지 않음. + if(StringUtils.isNotEmpty(adrInnorixFileVO.getP_code_desc())) + this.ansSubmitAjax(adrInnorixFileVO); + + } catch (Exception e) { + e.printStackTrace(); + return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); + } + + return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), adrInnorixFileVO.getAtchFileId(),LocalDateTime.now()); + } + + /** + * @methodName : fileDataUpload + * @author : 이호영 + * @date : 2022.11.04 + * @description : 파일정보 업로드 + * @param innorixVO + * @return + * @throws Exception + */ + public String insertFileData(AdrInnorixFileVO innorixVO) throws Exception { + + + String atchFileId = idgenService.getNextStringId(); + + List result = this.fileChange(innorixVO, atchFileId, 0); + + // 파일 업로드 + fileManageDAO.insertFileInfs(result); + + return atchFileId; + } + + public String updateFileData(AdrInnorixFileVO innorixVO) throws Exception { + + + String atchFileId = innorixVO.getAtchFileId(); + + + FileVO fvo = new FileVO(); + fvo.setAtchFileId(atchFileId); + int fileSn = fileMngService.getMaxFileSN(fvo); + + List result = this.fileChange(innorixVO, atchFileId, fileSn); + + + // 파일 업로드 + fileManageDAO.updateFileInfs(result); + + return atchFileId; + } + + + + private List fileChange(AdrInnorixFileVO innorixVO, String atchFileId, int fileSn) { + + List result = new ArrayList(); + log.info(" file data 반복문 시작 :: [{}]", innorixVO.getInnorixFileListVO().size()); + for(InnorixFileVO innorixFileVO : innorixVO.getInnorixFileListVO()) + { + FileVO fileVO = new FileVO(); + // new 파일명 + String newName = innorixVO.getP_file_nm_prefix() + EgovStringUtil.getTimeStamp(); + + log.info("[{}]번쨰 newName :: [{}]", fileSn, newName); + + String oriFullPath = INNO_FILE_PATH + innorixFileVO.getServerFileName(); + String newFullPath = INNO_FILE_PATH + newName; + + try { + File orifile = FileUtils.getFile(oriFullPath); + File newfile = FileUtils.getFile(newFullPath); + FileUtils.moveFile(orifile, newfile); + } catch (IOException e) { + log.info("파일명 수정 실패 :: [{}] ==> [{}]", oriFullPath, newFullPath ); + e.printStackTrace(); + } + + fileVO.setAtchFileId(atchFileId); + fileVO.setFileSn(Integer.toString(fileSn)); + fileVO.setFileStreCours(INNO_FILE_PATH); + fileVO.setStreFileNm(newName); + fileVO.setOrignlFileNm(innorixFileVO.getServerFileName()); + fileVO.setFileExtsn(FilenameUtils.getExtension(oriFullPath)); + fileVO.setFileMg(Integer.toString(innorixFileVO.getFileSize())); + + result.add(fileVO); + + fileSn++; + + } + log.info(" // file data 반복문 끝 "); + return result; + } + + /** + * @methodName : updateAdrRpplDoc + * @author : 이호영 + * @date : 2022.11.04 + * @description : ADR_RPPL_DOC 테이블에 데이터 업로드 + * @param adrInnorixFileListVO + * @param fileNextId + * @return + * @throws Exception + */ + private String insertAdrRpplDoc(AdrInnorixFileVO adrInnorixFileListVO) throws Exception { + // RpplDoc Insert + log.info("RpplDoc Insert "); + AnsVO ansVO = new AnsVO(); + ansVO.setAdrSeq(adrInnorixFileListVO.getAdrSeq()); + // adrSn이 비여있으면 과거사건등록문서라 "1"이 고정으로 들어감 + ansVO.setAdrSn(StringUtils.isEmpty(adrInnorixFileListVO.getAdrSn()) ? "1" : adrInnorixFileListVO.getAdrSn()); + ansVO.setRpplDocSeq(egovRldMgrManageGnrService.getNextStringId()); + ansVO.setAdrDocTy(adrInnorixFileListVO.getAdrDocTy()); + ansVO.setAtchFileId(adrInnorixFileListVO.atchFileId); + ansVO.setRpplSeq(adrInnorixFileListVO.getRpplSeq()); + ansVO.setFrstRegistPnttm(adrInnorixFileListVO.getFrstRegistPnttm()); + ansVO.setFrstRegisterId(adrInnorixFileListVO.getFrstRegisterId()); + ansVO.setLastUpdtPnttm(adrInnorixFileListVO.getFrstRegistPnttm()); + ansVO.setLastUpdusrId(adrInnorixFileListVO.getLastUpdusrId()); + ansDAO.ansSubmitAjax_setp1(ansVO); + + log.info(" + ansVO.getRpplDocSeq() :: [{}]", ansVO.getRpplDocSeq()); + return ansVO.getRpplDocSeq(); + + } + + + private void ansSubmitAjax(AdrInnorixFileVO adrInnorixFileListVO) throws Exception { + + AnsVO ansVO = new AnsVO(); + + // ansDAO.ansSubmitAjax_setp2()를 위한 VO 생성 + // 기존 메소드를 타기위해 생성 + ansVO.setAdrSeq(adrInnorixFileListVO.getAdrSeq()); + ansVO.setAdrSn(adrInnorixFileListVO.getAdrSn()); + ansVO.setAdrDocTy(adrInnorixFileListVO.getAdrDocTy()); + ansVO.setRpplSeq(adrInnorixFileListVO.getRpplSeq()); + ansVO.setAdrDocCn1(adrInnorixFileListVO.getAdrDocCn1()); + ansVO.setOpenYn(adrInnorixFileListVO.getOpenYn()); + ansVO.setAtchFileId(adrInnorixFileListVO.getAtchFileId()); + ansVO.setFrstRegisterId(adrInnorixFileListVO.getFrstRegisterId()); + ansVO.setLastUpdusrId(adrInnorixFileListVO.getLastUpdusrId()); + // ansDAO.ansSubmitAjax_setp2()를 위한 VO 생성 + + ansVO.setRpplDocSeq(adrInnorixFileListVO.getRpplDocSeq()); + + adrHstryMgrDAO.insert4Func(adrInnorixFileListVO.getAdrSeq() + //, "상태코드수정" + , adrInnorixFileListVO.getP_code_desc() //, "조정진행관리>>조정진행목록>조정진행상세>사건문서>P>문서등록" //String p_code_desc - CC199 + //, adjReqMgrVO.getStatCd() + , adrInnorixFileListVO.getP_stat_cd() // , "A160" //String p_stat_cd + + , adrInnorixFileListVO.getFrstRegisterId() + , adrInnorixFileListVO.getLastUpdusrId() + , adrInnorixFileListVO.getP_adrHstryMgrSeq() //, String p_adrHstryMgrSeq , "" + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_DOC" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+adrInnorixFileListVO.getAdrSeq() + +"' AND adr_sn='"+adrInnorixFileListVO.getAdrSn() + +"' AND rppl_doc_seq='"+adrInnorixFileListVO.getRpplDocSeq() + +"' " //, String p_updateQuery + + ); + + ansDAO.ansSubmitAjax_setp2(ansVO); //ADR_RPPL_DOC_OPEN // 공계여부 + + + + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(adrInnorixFileListVO.getAdrSeq() + //, "상태코드수정" + , adrInnorixFileListVO.getP_code_desc() + //, adjReqMgrVO.getStatCd() + , adrInnorixFileListVO.getP_stat_cd() + + , adrInnorixFileListVO.getFrstRegisterId() + , adrInnorixFileListVO.getLastUpdusrId() + + , adrInnorixFileListVO.getP_adrHstryMgrSeq() //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_DOC_OPEN" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+adrInnorixFileListVO.getAdrSeq() + +"' AND adr_sn='"+adrInnorixFileListVO.getAdrSn() + +"' AND rppl_doc_seq='"+adrInnorixFileListVO.getRpplDocSeq() + +"' AND rppl_seq='"+adrInnorixFileListVO.getRpplSeq() + +"' " //, String p_updateQuery + + ); + + } + + + @Override + public RestResponse insertInnorixFile(AdrInnorixFileVO adrInnorixFileVO) { + + try { + // 파일 저장 후 atchFileId 받아옴 + adrInnorixFileVO.setAtchFileId(this.insertFileData(adrInnorixFileVO)); + } catch (Exception e) { + e.printStackTrace(); + return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); + } + + return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), adrInnorixFileVO.getAtchFileId(),LocalDateTime.now()); + } +} diff --git a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java index d7c31738..0b11510f 100644 --- a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java +++ b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java @@ -34,8 +34,8 @@ public final class MagicDBAPIUtil { } public static String encryptOnlyOneString(String stringVal) { -// return MagicDBAPI.encrypt(POLICY_NAME, stringVal); - return stringVal; + return MagicDBAPI.encrypt(POLICY_NAME, stringVal); +// return stringVal; } public static String decryptOnlyOneString(String stringVal) { diff --git a/src/main/java/kcc/com/cmm/web/InnorixFileController.java b/src/main/java/kcc/com/cmm/web/InnorixFileController.java index 7c7bdd80..b8777128 100644 --- a/src/main/java/kcc/com/cmm/web/InnorixFileController.java +++ b/src/main/java/kcc/com/cmm/web/InnorixFileController.java @@ -44,8 +44,17 @@ public class InnorixFileController { @Resource(name = "InnorixFileService") protected InnorixFileService innorixService; - @RequestMapping(value = {"/kccadr/common/insertInnorixFileAjax.do"}, method = RequestMethod.POST) - public ResponseEntity insertInnorixFileAjax(@RequestBody AdrInnorixFileVO adrInnorixFileVO) throws Exception { + /** + * @methodName : insertInnorixFileAndRpplAjax + * @author : 이호영 + * @date : 2022.12.26 + * @description : 파일등록 외에 rpplDoc 과 history 관련 Controller + * @param adrInnorixFileVO + * @return + * @throws Exception + */ + @RequestMapping(value = {"/kccadr/common/insertInnorixFileAndRpplAjax.do"}, method = RequestMethod.POST) + public ResponseEntity insertInnorixFileAndRpplAjax(@RequestBody AdrInnorixFileVO adrInnorixFileVO) throws Exception { //로그인 권한정보 불러오기 LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; @@ -59,7 +68,34 @@ public class InnorixFileController { adrInnorixFileVO.setLastUpdusrId(userId); - return ResponseEntity.ok(innorixService.insertInnorixFileAjax(adrInnorixFileVO)); + return ResponseEntity.ok(innorixService.insertInnorixFileAndRpplAjax(adrInnorixFileVO)); + } + + /** + * @methodName : insertInnorixFile + * @author : 이호영 + * @date : 2022.12.26 + * @description : 파일 insert 전용 + * @param adrInnorixFileVO + * @return + * @throws Exception + */ + @RequestMapping(value = {"/kccadr/common/insertInnorixFileAjax.do"}, method = RequestMethod.POST) + public ResponseEntity insertInnorixFile(@RequestBody AdrInnorixFileVO adrInnorixFileVO) throws Exception { + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + + adrInnorixFileVO.setFrstRegisterId(userId); + adrInnorixFileVO.setLastUpdusrId(userId); + + + return ResponseEntity.ok(innorixService.insertInnorixFile(adrInnorixFileVO)); } diff --git a/src/main/java/kcc/com/cmm/web/StreamDocsController.java b/src/main/java/kcc/com/cmm/web/StreamDocsController.java index 516d43c4..81c56f50 100644 --- a/src/main/java/kcc/com/cmm/web/StreamDocsController.java +++ b/src/main/java/kcc/com/cmm/web/StreamDocsController.java @@ -184,7 +184,7 @@ public class StreamDocsController { info.setAdrSeq(pdfConversionVO.getAdrSeq()); info = cmmService.selectPgrCmm(info); - if (!"400000".equals(info.getStatCd())) { //종료인 경우 + if ("400000".equals(info.getStatCd())) { //종료인 경우 System.out.println("종료된 경우OOOOOOOOOOOOOO"); //RestResponse rr = new RestResponse(null, "", null); diff --git a/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java b/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java index 63007ba9..5eba6e03 100644 --- a/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java +++ b/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java @@ -226,8 +226,16 @@ public class AdjstPayMentController { String requestUrl = scheme + "://" + serverName + serverPort; + + //고객사 임의데이터 ("요청URL" + "§" + "pk") - String merchantData = requestUrl + "/web/kccadr/accdnt/apm/adjstPayMentProcess.do" + "§"; + String merchantData = requestUrl + "/web/kccadr/accdnt/apm/adjstPayMentProcess.do" + "§"; + + if("local".equals(prodIsLocal)) { + merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + }else { + merchantData = "https://adr.copyright.or.kr" + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + } model.addAttribute("mid", mid); model.addAttribute("signKey", signKey); diff --git a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java index e3574f78..ee8e5d94 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -657,8 +657,14 @@ public class AdjstReqStatusController { String requestUrl = scheme + "://" + serverName + serverPort; + String merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + //고객사 임의데이터 ("요청URL" + "§" + "pk") - String merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + if("local".equals(prodIsLocal)) { + merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + }else { + merchantData = "https://adr.copyright.or.kr" + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + } model.addAttribute("mid", mid); model.addAttribute("signKey", signKey); diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index 20282a61..9dfab47b 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -1,6 +1,5 @@ package kcc.kccadr.adjCourtCnctn.web; -import java.util.ArrayList; import java.util.List; import javax.annotation.Resource; @@ -17,8 +16,6 @@ import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; -import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO; -import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.cmm.RestResponse; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java index 4976f512..9fa6fb38 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java @@ -123,5 +123,7 @@ public interface ApmService { void updtRpplPopPastAjax(RpplVO rpplVO); Map findByResPonDentDIdAndFileList(RpplVO rpplVO); + + String selectSbmtRejectApproval(String param) throws Exception; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java index 8615070d..2a352cae 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java @@ -231,5 +231,9 @@ public class ApmDAO extends EgovAbstractDAO { public RpplVO findByResPonDentDId(RpplVO rpplVO) { return (RpplVO) select("Apm.findByResPonDentDId", rpplVO); } + + public String selectSbmtRejectApproval(String param) throws Exception { + return (String) select("apmDAO.selectSbmtRejectApproval", param); + } } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java index 0c88b9da..e7a2c39f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java @@ -640,6 +640,13 @@ public class ApmServiceImpl implements ApmService { } + + + @Override + public String selectSbmtRejectApproval(String param) throws Exception { + return apmDAO.selectSbmtRejectApproval(param); + } + /** * @methodName : rpplDataEncrypt * @author : 이호영 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index b9d66151..02be69aa 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -256,7 +256,7 @@ public class ApmController { * @throws Exception */ @RequestMapping(value = "apmList.do") - public String apmList(@ModelAttribute("cmmVO") PgrCmmVO cmmVO, ModelMap model) throws Exception { + public String apmList(@ModelAttribute("cmmVO") PgrCmmVO cmmVO, HttpServletRequest request, ModelMap model) throws Exception { /* * if(apmVO.getPageUnit() != 10) { apmVO.setPageUnit(apmVO.getPageUnit()); } @@ -266,6 +266,12 @@ public class ApmController { cmmVO.setSearchSortOrd("DESC"); } + String beforeUrl = request.getHeader("Referer"); + + if(!beforeUrl.contains("apm")) { + cmmVO.setSearchMonth("3"); + } + if (StringUtil.isEmpty(cmmVO.getSearchStartDt())) { // 조회일시가 null인경우 Date today = new Date(); cmmVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, -1), "yyyyMMdd")); @@ -324,7 +330,7 @@ public class ApmController { // reqOlCdPst 값이 있으면 과거사건 조회하지 않음 model.addAttribute("list", cmmService.selectPgrCmmList(cmmVO)); - + model.addAttribute("cmmVO", cmmVO); if (!StringUtil.isEmpty(cmmVO.getSearchCondition()) && "20".equals(cmmVO.getSearchCondition())) { // 검색조건 신청인 @@ -392,6 +398,9 @@ public class ApmController { // 조정사건일반 PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + + info.setSearchMonth(cmmVO.getSearchMonth()); + model.addAttribute("info", info); @@ -534,6 +543,27 @@ public class ApmController { //진행상태가 결재요청상태 일때 결재결재선 중 결재 진행중인 사람 불러오기 model.addAttribute("sbmtStatus",apmService.selectSbmtIngStatus(cmmVO.getAdrSeq())); + //결재 반려 시 결재 상세에서 반려한 사람 표시 + String result = apmService.selectSbmtRejectApproval(cmmVO.getAdrSeq()); + String userNm = ""; + + if(result != null) { + /* + * splitResult[0] -> uniqueId + * splitResult[1] -> userNm + * splitResult[2] -> userTy + * */ + String[] splitResult = result.split("§"); + userNm = splitResult[1]; + if("mem".equals(splitResult[2])) { + userNm = egovCryptoUtil.decrypt(splitResult[1]) + " 조정부장"; + }else { + userNm = userNm + " 관리자"; + } + } + + model.addAttribute("rejectApproval", userNm); + /*//adr_mgr_detail 첨부파일 불러오기 FileVO fileVO = new FileVO(); @@ -2547,7 +2577,7 @@ public class ApmController { else { String ozrFilePath = "/admin/adrCorReqReport.ozr"; *String savePath = corReqVO.getAdrSeq() + "/ozFile/adrCorReqReport.pdf";* - String savePath = "\\\\192.168.39.125\\data3\\out\\" + corReqVO.getAdrSeq() + "\\ozFile\\adrCorReqReport.pdf";; + String savePath = "\\\\192.168.39.130\\data\\out\\" + corReqVO.getAdrSeq() + "\\ozFile\\adrCorReqReport.pdf";; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java index 2448d3d4..fa65333f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java @@ -411,7 +411,11 @@ public class ArmController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrKkaAgrReport.ozr"; String savePath = closeVO.getAdrSeq() + "/adrKkaAgrReport.pdf"; - savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/adrKkaAgrReport.pdf"; + if(req.getServerName().contains("localhost")) { + savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/ozFile/adrKkaAgrReport.pdf"; + }else { + savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf"; + } String jsonData = jsObjData.toJSONString(); jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -420,7 +424,7 @@ public class ArmController { //실서버 else{ String ozrFilePath = "/admin/adrKkaAgrReport.ozr"; - String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf"; String jsonData = jsObjData.toJSONString(); jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -534,7 +538,7 @@ public class ArmController { else{ String ozrFilePath = "/admin/adrKkaAgrReport.ozr"; *String savePath = closeVO.getAdrSeq() + "/ozFile/adrKkaAgrReport.pdf";* - String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf"; String jsonData = jsObjData.toJSONString(); jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java index 460c39ab..4c958fcc 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java @@ -312,7 +312,11 @@ public class CfrmController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrHjwReport.ozr"; String savePath = cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf"; - savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf"; + if(req.getServerName().contains("localhost")) { + savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf"; + }else { + savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf"; + } ozSchd.ozschdFileExport(ozrFilePath, repStr, savePath, req); } @@ -320,7 +324,7 @@ public class CfrmController { else{ String ozrFilePath = "/admin/adrHjwReport.ozr"; /*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf";*/ - String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf"; ozSchd.ozschdFileExport(ozrFilePath, repStr, savePath, req); } @@ -420,7 +424,7 @@ public class CfrmController { else{ String ozrFilePath = "/admin/adrHjwReport.ozr"; *String savePath = cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf";* - String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf"; ozSchd.ozschdFileExport(ozrFilePath, repStr, savePath, req); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java b/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java index c1ec4cce..ffdd3dfb 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java @@ -100,9 +100,13 @@ public class ChdController { @Value("#{globalSettings['Globals.prod.islocal']}") public void setIslocal(String path) { islocal = path; } - //개발, local oz 저장 경로 - @Value("#{globalSettings['Globals.oz.devPath']}") - private String ozDevPath; +// //개발, local oz 저장 경로 +// @Value("#{globalSettings['Globals.oz.devPath']}") +// private String ozDevPath; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devPdfSavePath']}") + private String ozDevPdfSavePath; /** * 기일변경통지 상세 TODO daenge 기일변경통지 상세 @@ -430,7 +434,12 @@ public class ChdController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrAppSlctReport.ozr"; String savePath = cmmVO.getAdrSeq() + "/adrAppSlctReport.pdf"; - savePath = ozDevPath + cmmVO.getAdrSeq() + "/adrAppSlctReport.pdf"; + + if(req.getServerName().contains("localhost")) { + savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/ozFile/adrAppSlctReport.pdf"; + }else { + savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf"; + } String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -440,7 +449,7 @@ public class ChdController { else{ String ozrFilePath = "/admin/adrAppSlctReport.ozr"; /*String savePath = cmmVO.getAdrSeq() + "/adrAppSlctReport.pdf";*/ - String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java b/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java index 1dd7407c..b8f9cb65 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java @@ -348,7 +348,11 @@ public class CrtController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrBsrtbsApprReport.ozr"; String savePath = closeVO.getAdrSeq() + "/adrBsrtbsApprReport.pdf"; - savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/adrBsrtbsApprReport.pdf"; + if(req.getServerName().contains("localhost")) { + savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/ozFile/adrBsrtbsApprReport.pdf"; + }else { + savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf"; + } String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -358,7 +362,7 @@ public class CrtController { else{ String ozrFilePath = "/admin/adrBsrtbsApprReport.ozr"; /*String savePath = closeVO.getAdrSeq() + "/adrBsrtbsApprReport.pdf";*/ - String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -457,7 +461,7 @@ public class CrtController { else{ String ozrFilePath = "/admin/adrBsrtbsApprReport.ozr"; *String savePath = closeVO.getAdrSeq() + "/ozFile/adrBsrtbsApprReport.pdf";* - String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java index 1c70aba6..a12b3647 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java @@ -119,9 +119,10 @@ public class DntController { @Value("#{globalSettings['Globals.ozFontPath']}") private String ozFontPath; - //개발, local oz 저장 경로 - @Value("#{globalSettings['Globals.oz.devPath']}") - private String ozDevPath; +// //개발, local oz 저장 경로 +// @Value("#{globalSettings['Globals.oz.devPath']}") +// private String ozDevPath; + //개발, local oz 서버 IP + port @@ -720,7 +721,7 @@ public class DntController { else{ String ozrFilePath = "/admin/adrAppSlctReport.ozr"; //*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrAppSlctReport.pdf";* - String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java index 948cdd5a..e0a4dc6a 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java @@ -589,8 +589,11 @@ public class DrtController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrKjosuReport.ozr"; String savePath = cmmVO.getAdrSeq() + "/adrKjosuReport.pdf"; - savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/adrKjosuReport.pdf"; - + if(req.getServerName().contains("localhost")) { + savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf"; + }else { + savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf"; + } String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req); @@ -599,7 +602,7 @@ public class DrtController { else{ String ozrFilePath = "/admin/adrKjosuReport.ozr"; /*String savePath = cmmVO.getAdrSeq() + "/adrKjosuReport.pdf";*/ - String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -763,7 +766,7 @@ public class DrtController { else{ String ozrFilePath = "/admin/adrKjosuReport.ozr"; //*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";* - String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -927,7 +930,7 @@ public class DrtController { else{ String ozrFilePath = "/admin/adrKjosuReport.ozr"; //*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";* - String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java b/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java index 1fa74092..db0492fc 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java @@ -573,7 +573,11 @@ public class DrtCtrController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrJjosuReport.ozr"; String savePath = cmmVO.getAdrSeq() + "/adrJjosuReport.pdf"; - savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/adrJjosuReport.pdf"; + if(req.getServerName().contains("localhost")) { + savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf"; + }else { + savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf"; + } String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -583,7 +587,7 @@ public class DrtCtrController { else{ String ozrFilePath = "/admin/adrJjosuReport.ozr"; /*String savePath = cmmVO.getAdrSeq() + "/adrJjosuReport.pdf";*/ - String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -806,7 +810,7 @@ public class DrtCtrController { else{ String ozrFilePath = "/admin/adrJjosuReport.ozr"; //*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";* - String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -1042,7 +1046,7 @@ public class DrtCtrController { else{ String ozrFilePath = "/admin/adrJjosuReport.ozr"; //*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";* - String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java b/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java index d20ed40d..2e64f44e 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java @@ -352,7 +352,11 @@ public class EntController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrCncltbsReport.ozr"; String savePath = closeVO.getAdrSeq() + "/adrCncltbsReport.pdf"; - savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/adrCncltbsReport.pdf"; + if(req.getServerName().contains("localhost")) { + savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/ozFile/adrCncltbsReport.pdf"; + }else { + savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf"; + } String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -362,7 +366,7 @@ public class EntController { else{ String ozrFilePath = "/admin/adrCncltbsReport.ozr"; /*String savePath = closeVO.getAdrSeq() + "/adrCncltbsReport.pdf";*/ - String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -482,7 +486,7 @@ public class EntController { else{ String ozrFilePath = "/admin/adrCncltbsReport.ozr"; *String savePath = closeVO.getAdrSeq() + "/ozFile/adrCncltbsReport.pdf";* - String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java index ff9d700b..33d23c1f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java @@ -897,7 +897,11 @@ public class InternalApprovManageController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrFrontReport.ozr"; String savePath = cmmVO.getAdrSeq() + "/ozFile/adrFrontReport.png"; - savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/ozFile/adrFrontReport.png"; + if(req.getServerName().contains("localhost")) { + savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/ozFile/adrFrontReport.png"; + }else { + savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrFrontReport.png"; + } String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -907,7 +911,7 @@ public class InternalApprovManageController { else{ String ozrFilePath = "/admin/adrFrontReport.ozr"; /*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrFrontReport.png";*/ - String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrFrontReport.png"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrFrontReport.png"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -1089,7 +1093,11 @@ public class InternalApprovManageController { if("local".equals(islocal)) { String ozrFilePath = "/adjReqReport.ozr"; String savePath = adjReqVO.getAdrSeq() + "/ozFile/adjReqReport.png"; - savePath = ozDevPdfSavePath + adjReqVO.getAdrSeq() + "/ozFile/adjReqReport.png"; + if(req.getServerName().contains("localhost")) { + savePath = ozDevPdfSavePath + adjReqVO.getAdrSeq() + "/ozFile/adjReqReport.png"; + }else { + savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + adjReqVO.getAdrSeq() + "\\ozFile\\adjReqReport.png"; + } String jsonData = jsObjData.toJSONString(); jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -1099,7 +1107,7 @@ public class InternalApprovManageController { else{ String ozrFilePath = "/adjReqReport.ozr"; /*String savePath = adjReqVO.getAdrSeq() + "/ozFile/adjReqReport.png";*/ - String savePath = "\\\\192.168.39.125\\data3\\out\\" + adjReqVO.getAdrSeq() + "\\ozFile\\adjReqReport.png"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + adjReqVO.getAdrSeq() + "\\ozFile\\adjReqReport.png"; String jsonData = jsObjData.toJSONString(); jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java b/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java index 45dd6796..77217b3b 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java @@ -549,7 +549,7 @@ public class OadController { else{ String ozrFilePath = "/admin/adrJkkjsReport.ozr"; *String savePath = closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf";* - String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrJkkjsReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrJkkjsReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -724,7 +724,7 @@ public class OadController { else{ String ozrFilePath = "/admin/adrJkkjsReport.ozr"; *String savePath = closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf";* - String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrJkkjsReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrJkkjsReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/ojct/web/OjctMgrController.java b/src/main/java/kcc/kccadr/adjPgrMgr/ojct/web/OjctMgrController.java index 1f9e991c..c8cb3a08 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/ojct/web/OjctMgrController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/ojct/web/OjctMgrController.java @@ -147,20 +147,22 @@ public class OjctMgrController { } - String atchFileId = ""; - final Map files = multiRequest.getFileMap(); - if (!files.isEmpty()) { - //조정신청_로 첨부파일 네이밍 - List result = fileUtil.parseFileInf(files, "이의 신청_", 0, "", "", ""); - atchFileId = fileMngService.insertFileInfs(result); - //첨부파일Id(atchFileId)를 해당 VO atchFileId변수에 저장 - ojctMgrVO.setAtchFileId(atchFileId); - } +// String atchFileId = ""; +// final Map files = multiRequest.getFileMap(); +// if (!files.isEmpty()) { +// //조정신청_로 첨부파일 네이밍 +// List result = fileUtil.parseFileInf(files, "이의 신청_", 0, "", "", ""); +// atchFileId = fileMngService.insertFileInfs(result); +// //첨부파일Id(atchFileId)를 해당 VO atchFileId변수에 저장 +// ojctMgrVO.setAtchFileId(atchFileId); +// } + System.out.println(" + ojctMgrVO.setAtchFileId() :: " + ojctMgrVO.getAtchFileId()); +// //사용자 유니크 아이디 받아오기 ojctMgrVO.setLastUpdusrId(userId); ojctMgrVO.setFrstRegisterId(userId); - ojctMgrVO.setAtchFileId(atchFileId); +// ojctMgrVO.setAtchFileId(atchFileId); if(ojctMgrVO.getAdrSeq() != null) { diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 3b5942e9..7580a5b8 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -137,7 +137,7 @@ public class AdjReqMgrPastController { int reqPerTotCnt = 0; if(StringUtils.isNotBlank(adjReqMgrPastVO.getAdrSeq())) { - + System.out.println("========================="); //오프라인 조정 신청 정보 불러오기. AdjReqMgrPastVO resultAdjReqMgrPast = adjReqMgrPastService.selectAdjReqMgrOffLineInfo(adjReqMgrPastVO); AdjReqMgrPastVO statCdInfo = adjReqMgrPastService.findByAdrHstryWhereStatCd(adjReqMgrPastVO); diff --git a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java index cb6b5c9e..a758254b 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java @@ -986,7 +986,7 @@ public class AdjReqMgrController { String ozrFilePath2 = "/adjReqReport.ozr"; //이준호 오즈리포트 export_0406_nas에 파일 저장 성공 - String savePath2 = "\\\\192.168.39.125\\data3\\out\\" + adjstReqVO.getAdrSeq() + "\\ozFile\\adjReqReport.pdf"; + String savePath2 = "\\\\192.168.39.130\\data\\out\\" + adjstReqVO.getAdrSeq() + "\\ozFile\\adjReqReport.pdf"; String jsonData2 = jsObjData.toJSONString(); @@ -1002,7 +1002,7 @@ public class AdjReqMgrController { String ozrFilePath2 = "/adjReqReport.ozr"; //이준호 오즈리포트 export 경로 앞에 "/"추가 테스트_220310 - String savePath2 = "\\\\192.168.39.125\\data3\\out\\adjReqReport2.pdf"; + String savePath2 = "\\\\192.168.39.130\\data\\out\\adjReqReport2.pdf"; System.out.println("@@@@@@@@@@@@@@@@@@adjstReqVO.getAdrSeq() :: @@@@@ =" + adjstReqVO.getAdrSeq()); System.out.println("@@@@@@@@@@@@@@@@@@ savePath2 :: @@@@@ = " + savePath2); diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 3cb611c2..25b5c40e 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -1709,6 +1709,15 @@ public class AdjstReqWebController { String reqCn1 = adjReqVO.getReqCn1().replaceAll("\r\n", "\\\\r\\\\n"); //신청취지 String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n"); //신청원인 + // 조정신청 3step 미리보기 시 신청 취지/원인에 데이터가 없으면 'null data'로 찍혀서 공백을 띄어쓰기 한칸으로 넣기_이준호_221226 + if("".equals(reqCn1)) { + reqCn1 = " "; + } + + if("".equals(reqCn2)) { + reqCn2 = " "; + } + if(!rpplNm.equals("")) { diff --git a/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java b/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java index 901bf54d..aa70c5c1 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java +++ b/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java @@ -30,7 +30,7 @@ public interface AprvlMgrService { ) throws Exception; //조정사건결재저장 - 2022-10고도화 - int insertAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO + String insertAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO , String p_code_desc , String p_stat_cd , String p_adrHstryMgrSeq diff --git a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java index c0e34881..ca19bc32 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java @@ -99,7 +99,7 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr } //조종사건결재 - public int insertAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO + public String insertAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO , String p_code_desc , String p_stat_cd , String p_adrHstryMgrSeq @@ -264,7 +264,8 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr ); //adr_hstry_mgr에 값 넣기 - 끝 - return rs; + /*return rs;*/ + return aprvlMgrVO.getSbmtSeq(); } //조종사건수정 diff --git a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java index 0a51289c..8c4d7bbe 100644 --- a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java +++ b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java @@ -376,12 +376,19 @@ public class AprvlMgr202210Controller { //조정사건결재 내용 추가해주기 //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 - i = aprvlMgrService.insertAdrSbmtMgr202210(aprvlMgrVO - , "조정진행관리>>조정진행목록>조정진행상세>결재요청" //String p_code_desc - CC199 - , "A070" //String p_stat_cd - , s_adrHstryMgrSeq - , adrSbmtLineMgrUsrVO +// i = aprvlMgrService.insertAdrSbmtMgr202210(aprvlMgrVO +// , "조정진행관리>>조정진행목록>조정진행상세>결재요청" //String p_code_desc - CC199 +// , "A070" //String p_stat_cd +// , s_adrHstryMgrSeq +// , adrSbmtLineMgrUsrVO +// ); + String sbmtSeq = aprvlMgrService.insertAdrSbmtMgr202210(aprvlMgrVO + , "조정진행관리>>조정진행목록>조정진행상세>결재요청" //String p_code_desc - CC199 + , "A070" //String p_stat_cd + , s_adrHstryMgrSeq + , adrSbmtLineMgrUsrVO ); + if(!"".equals(sbmtSeq)) i = 1; //조정부가 있는지 확인 하자. aprvlMgrVO = aprvlMgrService.selectDetail(aprvlMgrVO); @@ -434,6 +441,7 @@ public class AprvlMgr202210Controller { modelAndView.addObject("status", "success"); + modelAndView.addObject("sbmtSeq", sbmtSeq); }catch(Exception ex) { modelAndView.addObject("status", "fail"); modelAndView.addObject("message", "결재선 생성 실패.-step0"); diff --git a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java index 22af4c2f..0c0bc53c 100644 --- a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java +++ b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java @@ -1,404 +1,404 @@ -package kcc.kccadr.certDoc.web; - -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -import com.dreamsecurity.magicline.util.Log; - -import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; -import kcc.com.cmm.EgovMessageSource; -import kcc.com.cmm.util.StringUtil; -import kcc.com.utl.user.service.CheckLoginUtil; -import kcc.kccadr.adjPgrMgr.arm.service.CmntVO; -import kcc.kccadr.adjPgrMgr.cmm.service.CloseVO; -import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; -import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; -import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoDetailVO; -import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; -import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; -import kcc.kccadr.adjPgrMgr.dnt.service.DntService; -import kcc.kccadr.adjPgrMgr.dnt.service.DntVO; -import kcc.kccadr.adjPgrMgr.drt.service.AssVO; -import kcc.kccadr.adjPgrMgr.drt.service.DrtService; -import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; -import kcc.kccadr.adjPgrMgr.drtctr.service.AssCtrVO; -import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrService; -import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrVO; -import kcc.kccadr.adjRppl.service.AdjRpplService; -import kcc.kccadr.adjRppl.service.AdjRpplVO; -import kcc.kccadr.adjcclt.service.AdjstConciliatorService; -import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; -import kcc.kccadr.cmm.KccadrConstants; -import kcc.let.utl.fcc.service.EgovCryptoUtil; - -/** - * 대국민(사용자) - * 인증을 통한 송달서류 조회 controller 클래스를 정의한다. - * @author 김봉호 - * @since 2022.08.29 - * @version 1.0 - * @see - * - * 
- * << 개정이력(Modification Information) >>
- *
- *   수정일      수정자           수정내용
- *  -------    --------    ---------------------------
- *   2022.08.29  안주영          최초 생성
- *
- *
- */ -@Controller -public class CertDocController { - - //private static final Logger LOGGER = LoggerFactory.getLogger(AdjstChangeDateController.class); - - // eGov 공통 메세지 - @Resource(name = "egovMessageSource") - EgovMessageSource egovMessageSource; - - //로그인 체크 util - @Resource(name = "checkLoginUtil") - private CheckLoginUtil checkLoginUtil; - //암복호화 유틸 - @Resource(name = "egovCryptoUtil") - EgovCryptoUtil egovCryptoUtil; - - @Resource(name = "pgrCmmService") - private PgrCmmService cmmService; - - @Resource(name = "dlvinfoService") - private DlvinfoService dlvinfoService; - - @Resource(name = "drtCtrService") - private DrtCtrService drtCtrService; - - @Resource(name = "dntService") - private DntService dntService; - - @Resource(name = "drtService") - private DrtService drtService; - - @Resource(name="adjstConciliatorService") - private AdjstConciliatorService adjstConciliatorService; - - @Resource(name="adjRpplService") - private AdjRpplService adjRpplService; - - - /** - * 송달문서조회용 SNS 로그인 페이지 - */ - @RequestMapping("/web/kccadr/certDoc/snsLoginPage.do") - public String snsLoginPage(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { - - model.addAttribute("info", dlvinfoVO); - return "/web/kccadr/login/SsoLoginUsrSns"; - - } - - /** - * 송달문서조회용 SNS 로그인 callback 페이지 - */ - @RequestMapping("/web/kccadr/certDoc/snsCallBack.do") - public String snsCallBack(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { - - model.addAttribute("info", dlvinfoVO); - return "/web/kccadr/login/snsCallBack"; - - } - - - /** - * 송달서류 상세 - */ - @RequestMapping("/web/kccadr/certDoc/certDocInfo.do") - public String dlvDocInfo(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model, RedirectAttributes rs) throws Exception { - - AdjRpplVO rpplVO = new AdjRpplVO(); - rpplVO.setRpplSeq(dlvinfoVO.getRpplSeq()); - - rpplVO = adjRpplService.selectAdjRpplDetail(rpplVO); - - - String encEmail = egovCryptoUtil.encrypt(dlvinfoVO.getEmail()).trim(); - - String returnUrl = ""; - - System.out.println("+ 입력 Email :: "+ dlvinfoVO.getEmail()); - System.out.println("+ 입력 암호화 EmailencEmail :: "+ encEmail); - System.out.println("+ DB Email :: "+ rpplVO.getRpplEmail()); - /* - * dlvinfoVO.getEmail() :: hehihoho3@naver.com - * encEmail :: Lxt7qHEUH1ibf5qrdTjfZzHDaSMb28cFTu/hzZuU3ys= - * rpplVO.getRpplEmail() :: mrPLsRpt72UNCRSsLGnZnQ== - * */ - //둘 다 암호화된 값으로 비교해서 틀렸을 경우 메인페이지로 return - - if(!encEmail.equals(rpplVO.getRpplEmail())){ - rs.addFlashAttribute("returnMsg", "신청정보(이메일)가 일치하지 않습니다."); - rs.addFlashAttribute("logout", "Y"); - returnUrl = dlvinfoVO.getUrl(); - - return "redirect:" + returnUrl; - - //메인페이지로 - //return "redirect:/"; - } - - - //dlvrySeq로 기존 데이터 가져오기 - DlvinfoVO dlvinfoDetail = new DlvinfoVO(); - dlvinfoDetail = dlvinfoService.selectDlvryInfo(dlvinfoVO); - - //로그인 성공 시 adr_dlvry_social 테이블에 값 update - DlvinfoDetailVO dlvSocialVO = new DlvinfoDetailVO(); - dlvSocialVO.setDlvrySeq(dlvinfoVO.getDlvrySeq()); - dlvSocialVO.setRpplSeq(rpplVO.getRpplSeq()); - dlvSocialVO.setSocialType(dlvinfoVO.getSocialType()); // 1:카카오, 2:naver - dlvSocialVO.setDlvryDocTy(dlvinfoDetail.getDlvryDocTy()); - - dlvinfoService.updateAdjustDeliverySocialInfo(dlvSocialVO); - - - if(KccadrConstants.ADR_CLOSE_DOC_TY_80.equals(dlvSocialVO.getDlvryDocTy())) { //확정증명원 - - PgrCmmVO cmmVO = new PgrCmmVO(); - - cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - //사건 정보 불러오기 - model.addAttribute("info", cmmService.selectPgrCmm(cmmVO)); - - //종결문서에서 확정증명서 불러오기 - CloseVO closeVO = new CloseVO(); - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_80); - - model.addAttribute("closeDocInfo", cmmService.selectCloseDoc(closeVO)); - - returnUrl = "/web/kccadr/certDoc/cfrmDetail"; - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_10.equals(dlvSocialVO.getDlvryDocTy())) { //기일통지서 - - PgrCmmVO cmmVO = new PgrCmmVO(); - - cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - PgrCmmVO dntVO = getDntInfo(cmmVO); - model.addAttribute("info", dntVO); - - if(cmmVO.getSearchKeyword().equals("update")) { - // 조정기일 변경 조회 - DntVO dntNoticeVO = new DntVO(); - dntNoticeVO.setAdrSn(cmmVO.getAdrSn()); - dntNoticeVO.setAdrSeq(cmmVO.getAdrSeq()); - DntVO selectDateNoticeDate = dntService.selectDateNoticeDate(dntNoticeVO); - model.addAttribute("date",selectDateNoticeDate); - } - - returnUrl = "/web/kccadr/certDoc/dntDetail"; - - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_20.equals(dlvSocialVO.getDlvryDocTy())) { //기일조서 - - - PgrCmmVO cmmVO = new PgrCmmVO(); - - cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - DrtVO drtVO = new DrtVO(); - - drtVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - drtVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - List assList = drtService.selectAssList(drtVO); - - PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); - - model.addAttribute("assList", assList); - model.addAttribute("info", info); - - //조정위원 정보 불러오기 - PgrCmmVO dntVO = getDntInfo(cmmVO); - model.addAttribute("uiwonInfo", dntVO); - - returnUrl = "/web/kccadr/certDoc/drtDetail"; - - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_30.equals(dlvSocialVO.getDlvryDocTy())) { //조정권고안 - - CloseVO closeVO = new CloseVO(); - - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - - //조정기일 배석 정보 불러오기 - DrtCtrVO drtCtrVO = new DrtCtrVO(); - drtCtrVO.setAdrSeq(closeVO.getAdrSeq()); - drtCtrVO.setAdrSn(closeVO.getAdrSn()); - List assList = drtCtrService.selectAssList(drtCtrVO); - - //기일조서 정보 불러오기 - PgrCmmVO pgrCmmVO = new PgrCmmVO(); - pgrCmmVO.setAdrSeq(closeVO.getAdrSeq()); - pgrCmmVO.setPrtclSeq(closeVO.getPrtclSeq()); - PgrCmmVO info = cmmService.selectPgrCmm(pgrCmmVO); - - - //직권조정 조서 정보 가져오기 - model.addAttribute("assList", assList); - model.addAttribute("info", info); - - closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_30); - model.addAttribute("drtCtrVO", cmmService.selectCloseDoc(closeVO)); - - CmntVO cmntVO = new CmntVO(); - cmntVO.setAdrSeq(closeVO.getAdrSeq()); - cmntVO.setAdrSn(closeVO.getAdrSn()); - cmntVO.setCmntSeq(closeVO.getCmntSeq()); - cmntVO.setCmntTy(KccadrConstants.ADR_CLOSE_DOC_TY_30); - - //조정위원 의견 리스트 - model.addAttribute("list", cmmService.selectCmnList(cmntVO)); - - returnUrl = "/web/kccadr/certDoc/armDetail"; - - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_40.equals(dlvSocialVO.getDlvryDocTy())) { //조정조서 - - DrtCtrVO drtCtrVO = new DrtCtrVO(); - - drtCtrVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - drtCtrVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - PgrCmmVO cmmVO = new PgrCmmVO(); - - cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - - //조정기일 배석 정보 불러오기 - List assList = drtCtrService.selectAssList(drtCtrVO); - - //기일조서 정보 불러오기 - PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); - - //조정조서 정보 불러오기 - DrtCtrVO resultDrtCtrVO = drtCtrService.selectDrtCtrReport(drtCtrVO); - - model.addAttribute("assList", assList); - model.addAttribute("info", info); - model.addAttribute("drtCtrVO", resultDrtCtrVO); - - returnUrl = "/web/kccadr/certDoc/drtCtrDetail"; - - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_50.equals(dlvSocialVO.getDlvryDocTy())) { //취하종결통보서 - - CloseVO closeVO = new CloseVO(); - - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - model.addAttribute("info", cmmService.selectPgrCmm(closeVO)); - - returnUrl = "/web/kccadr/certDoc/entDetail"; - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_60.equals(dlvSocialVO.getDlvryDocTy())) { //직권조정결정서 - - CloseVO closeVO = new CloseVO(); - - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - //조정기일 배석 정보 불러오기 - DrtCtrVO drtCtrVO = new DrtCtrVO(); - drtCtrVO.setAdrSeq(closeVO.getAdrSeq()); - drtCtrVO.setAdrSn(closeVO.getAdrSn()); - List assList = drtCtrService.selectAssList(drtCtrVO); - model.addAttribute("assList", assList); - - //기일조서 정보 불러오기 - PgrCmmVO pgrCmmVO = new PgrCmmVO(); - pgrCmmVO.setAdrSeq(closeVO.getAdrSeq()); - pgrCmmVO.setPrtclSeq(closeVO.getPrtclSeq()); - PgrCmmVO info = cmmService.selectPgrCmm(pgrCmmVO); - model.addAttribute("info", info); - - //직권조정 조서 정보 가져오기 - closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_60); - model.addAttribute("drtCtrVO", cmmService.selectCloseDoc(closeVO)); - - //조정위원들 의견 정보 불러오기(전체 불러오기 - memSeq로 그룹핑해서 중복 제거했음) 20220209 - 우영두 추가 - AdjstConciliatorVO adjstConciliatorVO = new AdjstConciliatorVO(); - adjstConciliatorVO.setAdrSeq(closeVO.getAdrSeq()); - adjstConciliatorVO.setAdrSn(closeVO.getAdrSn()); - adjstConciliatorVO.setCmntTy(dlvinfoDetail.getDlvryDocTy()); //문서종류 코드 번호 전달 - - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(adjstConciliatorVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(100); - paginationInfo.setPageSize(adjstConciliatorVO.getPageSize()); - - adjstConciliatorVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - adjstConciliatorVO.setLastIndex(paginationInfo.getLastRecordIndex()); - adjstConciliatorVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - List cmnList = adjstConciliatorService.selectAdjstRecommendationCommentListGroup(adjstConciliatorVO); - - model.addAttribute("cmnList",cmnList); - - returnUrl = "/web/kccadr/certDoc/oadDetail"; - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_70.equals(dlvSocialVO.getDlvryDocTy())) { //불성립조정통보서 - - CloseVO closeVO = new CloseVO(); - - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - model.addAttribute("info", cmmService.selectPgrCmm(closeVO)); - - returnUrl = "/web/kccadr/certDoc/crtDetail"; - - } - - return returnUrl; - - } - - - @SuppressWarnings("unused") - private PgrCmmVO getDntInfo(PgrCmmVO cmmVO) throws Exception { - PgrCmmVO dntVO = cmmService.selectPgrCmm(cmmVO); - if (!StringUtil.isEmpty(dntVO.getMemNames())) { - String[] memNames = dntVO.getMemNames().split(", "); - String[] assSeqes = dntVO.getAssSeqes().split(", "); - - if(memNames.length==1) { - dntVO.setAddUsrNm0(memNames[0]); - dntVO.setAssSeq0(assSeqes[0]); - }else if(memNames.length>1) { - dntVO.setAddUsrNm0(memNames[0]); - dntVO.setAssSeq0(assSeqes[0]); - dntVO.setAddUsrNm1(memNames[1]); - dntVO.setAssSeq1(assSeqes[1]); - } - - } - return dntVO; - } - -} +package kcc.kccadr.certDoc.web; + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.dreamsecurity.magicline.util.Log; + +import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.EgovMessageSource; +import kcc.com.cmm.util.StringUtil; +import kcc.com.utl.user.service.CheckLoginUtil; +import kcc.kccadr.adjPgrMgr.arm.service.CmntVO; +import kcc.kccadr.adjPgrMgr.cmm.service.CloseVO; +import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; +import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; +import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoDetailVO; +import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; +import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; +import kcc.kccadr.adjPgrMgr.dnt.service.DntService; +import kcc.kccadr.adjPgrMgr.dnt.service.DntVO; +import kcc.kccadr.adjPgrMgr.drt.service.AssVO; +import kcc.kccadr.adjPgrMgr.drt.service.DrtService; +import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; +import kcc.kccadr.adjPgrMgr.drtctr.service.AssCtrVO; +import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrService; +import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrVO; +import kcc.kccadr.adjRppl.service.AdjRpplService; +import kcc.kccadr.adjRppl.service.AdjRpplVO; +import kcc.kccadr.adjcclt.service.AdjstConciliatorService; +import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; +import kcc.kccadr.cmm.KccadrConstants; +import kcc.let.utl.fcc.service.EgovCryptoUtil; + +/** + * 대국민(사용자) + * 인증을 통한 송달서류 조회 controller 클래스를 정의한다. + * @author 김봉호 + * @since 2022.08.29 + * @version 1.0 + * @see + * + * 
+ * << 개정이력(Modification Information) >>
+ *
+ *   수정일      수정자           수정내용
+ *  -------    --------    ---------------------------
+ *   2022.08.29  안주영          최초 생성
+ *
+ *
+ */ +@Controller +public class CertDocController { + + //private static final Logger LOGGER = LoggerFactory.getLogger(AdjstChangeDateController.class); + + // eGov 공통 메세지 + @Resource(name = "egovMessageSource") + EgovMessageSource egovMessageSource; + + //로그인 체크 util + @Resource(name = "checkLoginUtil") + private CheckLoginUtil checkLoginUtil; + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + @Resource(name = "pgrCmmService") + private PgrCmmService cmmService; + + @Resource(name = "dlvinfoService") + private DlvinfoService dlvinfoService; + + @Resource(name = "drtCtrService") + private DrtCtrService drtCtrService; + + @Resource(name = "dntService") + private DntService dntService; + + @Resource(name = "drtService") + private DrtService drtService; + + @Resource(name="adjstConciliatorService") + private AdjstConciliatorService adjstConciliatorService; + + @Resource(name="adjRpplService") + private AdjRpplService adjRpplService; + + + /** + * 송달문서조회용 SNS 로그인 페이지 + */ + /*@RequestMapping("/web/kccadr/certDoc/snsLoginPage.do") + public String snsLoginPage(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { + + model.addAttribute("info", dlvinfoVO); + return "/web/kccadr/login/SsoLoginUsrSns"; + + }*/ + + /** + * 송달문서조회용 SNS 로그인 callback 페이지 + */ + @RequestMapping("/web/kccadr/certDoc/snsCallBack.do") + public String snsCallBack(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { + + model.addAttribute("info", dlvinfoVO); + return "/web/kccadr/login/snsCallBack"; + + } + + + /** + * 송달서류 상세 + */ + @RequestMapping("/web/kccadr/certDoc/certDocInfo.do") + public String dlvDocInfo(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model, RedirectAttributes rs) throws Exception { + + AdjRpplVO rpplVO = new AdjRpplVO(); + rpplVO.setRpplSeq(dlvinfoVO.getRpplSeq()); + + rpplVO = adjRpplService.selectAdjRpplDetail(rpplVO); + + + String encEmail = egovCryptoUtil.encrypt(dlvinfoVO.getEmail()).trim(); + + String returnUrl = ""; + + System.out.println("+ 입력 Email :: "+ dlvinfoVO.getEmail()); + System.out.println("+ 입력 암호화 EmailencEmail :: "+ encEmail); + System.out.println("+ DB Email :: "+ rpplVO.getRpplEmail()); + /* + * dlvinfoVO.getEmail() :: hehihoho3@naver.com + * encEmail :: Lxt7qHEUH1ibf5qrdTjfZzHDaSMb28cFTu/hzZuU3ys= + * rpplVO.getRpplEmail() :: mrPLsRpt72UNCRSsLGnZnQ== + * */ + //둘 다 암호화된 값으로 비교해서 틀렸을 경우 메인페이지로 return + + if(!encEmail.equals(rpplVO.getRpplEmail())){ + rs.addFlashAttribute("returnMsg", "신청정보(이메일)가 일치하지 않습니다."); + rs.addFlashAttribute("logout", "Y"); + returnUrl = dlvinfoVO.getUrl(); + + return "redirect:" + returnUrl; + + //메인페이지로 + //return "redirect:/"; + } + + + //dlvrySeq로 기존 데이터 가져오기 + DlvinfoVO dlvinfoDetail = new DlvinfoVO(); + dlvinfoDetail = dlvinfoService.selectDlvryInfo(dlvinfoVO); + + //로그인 성공 시 adr_dlvry_social 테이블에 값 update + DlvinfoDetailVO dlvSocialVO = new DlvinfoDetailVO(); + dlvSocialVO.setDlvrySeq(dlvinfoVO.getDlvrySeq()); + dlvSocialVO.setRpplSeq(rpplVO.getRpplSeq()); + dlvSocialVO.setSocialType(dlvinfoVO.getSocialType()); // 1:카카오, 2:naver + dlvSocialVO.setDlvryDocTy(dlvinfoDetail.getDlvryDocTy()); + + dlvinfoService.updateAdjustDeliverySocialInfo(dlvSocialVO); + + + if(KccadrConstants.ADR_CLOSE_DOC_TY_80.equals(dlvSocialVO.getDlvryDocTy())) { //확정증명원 + + PgrCmmVO cmmVO = new PgrCmmVO(); + + cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + //사건 정보 불러오기 + model.addAttribute("info", cmmService.selectPgrCmm(cmmVO)); + + //종결문서에서 확정증명서 불러오기 + CloseVO closeVO = new CloseVO(); + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_80); + + model.addAttribute("closeDocInfo", cmmService.selectCloseDoc(closeVO)); + + returnUrl = "/web/kccadr/certDoc/cfrmDetail"; + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_10.equals(dlvSocialVO.getDlvryDocTy())) { //기일통지서 + + PgrCmmVO cmmVO = new PgrCmmVO(); + + cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + PgrCmmVO dntVO = getDntInfo(cmmVO); + model.addAttribute("info", dntVO); + + if(cmmVO.getSearchKeyword().equals("update")) { + // 조정기일 변경 조회 + DntVO dntNoticeVO = new DntVO(); + dntNoticeVO.setAdrSn(cmmVO.getAdrSn()); + dntNoticeVO.setAdrSeq(cmmVO.getAdrSeq()); + DntVO selectDateNoticeDate = dntService.selectDateNoticeDate(dntNoticeVO); + model.addAttribute("date",selectDateNoticeDate); + } + + returnUrl = "/web/kccadr/certDoc/dntDetail"; + + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_20.equals(dlvSocialVO.getDlvryDocTy())) { //기일조서 + + + PgrCmmVO cmmVO = new PgrCmmVO(); + + cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + DrtVO drtVO = new DrtVO(); + + drtVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + drtVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + List assList = drtService.selectAssList(drtVO); + + PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + + model.addAttribute("assList", assList); + model.addAttribute("info", info); + + //조정위원 정보 불러오기 + PgrCmmVO dntVO = getDntInfo(cmmVO); + model.addAttribute("uiwonInfo", dntVO); + + returnUrl = "/web/kccadr/certDoc/drtDetail"; + + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_30.equals(dlvSocialVO.getDlvryDocTy())) { //조정권고안 + + CloseVO closeVO = new CloseVO(); + + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + + //조정기일 배석 정보 불러오기 + DrtCtrVO drtCtrVO = new DrtCtrVO(); + drtCtrVO.setAdrSeq(closeVO.getAdrSeq()); + drtCtrVO.setAdrSn(closeVO.getAdrSn()); + List assList = drtCtrService.selectAssList(drtCtrVO); + + //기일조서 정보 불러오기 + PgrCmmVO pgrCmmVO = new PgrCmmVO(); + pgrCmmVO.setAdrSeq(closeVO.getAdrSeq()); + pgrCmmVO.setPrtclSeq(closeVO.getPrtclSeq()); + PgrCmmVO info = cmmService.selectPgrCmm(pgrCmmVO); + + + //직권조정 조서 정보 가져오기 + model.addAttribute("assList", assList); + model.addAttribute("info", info); + + closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_30); + model.addAttribute("drtCtrVO", cmmService.selectCloseDoc(closeVO)); + + CmntVO cmntVO = new CmntVO(); + cmntVO.setAdrSeq(closeVO.getAdrSeq()); + cmntVO.setAdrSn(closeVO.getAdrSn()); + cmntVO.setCmntSeq(closeVO.getCmntSeq()); + cmntVO.setCmntTy(KccadrConstants.ADR_CLOSE_DOC_TY_30); + + //조정위원 의견 리스트 + model.addAttribute("list", cmmService.selectCmnList(cmntVO)); + + returnUrl = "/web/kccadr/certDoc/armDetail"; + + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_40.equals(dlvSocialVO.getDlvryDocTy())) { //조정조서 + + DrtCtrVO drtCtrVO = new DrtCtrVO(); + + drtCtrVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + drtCtrVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + PgrCmmVO cmmVO = new PgrCmmVO(); + + cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + + //조정기일 배석 정보 불러오기 + List assList = drtCtrService.selectAssList(drtCtrVO); + + //기일조서 정보 불러오기 + PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + + //조정조서 정보 불러오기 + DrtCtrVO resultDrtCtrVO = drtCtrService.selectDrtCtrReport(drtCtrVO); + + model.addAttribute("assList", assList); + model.addAttribute("info", info); + model.addAttribute("drtCtrVO", resultDrtCtrVO); + + returnUrl = "/web/kccadr/certDoc/drtCtrDetail"; + + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_50.equals(dlvSocialVO.getDlvryDocTy())) { //취하종결통보서 + + CloseVO closeVO = new CloseVO(); + + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + model.addAttribute("info", cmmService.selectPgrCmm(closeVO)); + + returnUrl = "/web/kccadr/certDoc/entDetail"; + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_60.equals(dlvSocialVO.getDlvryDocTy())) { //직권조정결정서 + + CloseVO closeVO = new CloseVO(); + + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + //조정기일 배석 정보 불러오기 + DrtCtrVO drtCtrVO = new DrtCtrVO(); + drtCtrVO.setAdrSeq(closeVO.getAdrSeq()); + drtCtrVO.setAdrSn(closeVO.getAdrSn()); + List assList = drtCtrService.selectAssList(drtCtrVO); + model.addAttribute("assList", assList); + + //기일조서 정보 불러오기 + PgrCmmVO pgrCmmVO = new PgrCmmVO(); + pgrCmmVO.setAdrSeq(closeVO.getAdrSeq()); + pgrCmmVO.setPrtclSeq(closeVO.getPrtclSeq()); + PgrCmmVO info = cmmService.selectPgrCmm(pgrCmmVO); + model.addAttribute("info", info); + + //직권조정 조서 정보 가져오기 + closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_60); + model.addAttribute("drtCtrVO", cmmService.selectCloseDoc(closeVO)); + + //조정위원들 의견 정보 불러오기(전체 불러오기 - memSeq로 그룹핑해서 중복 제거했음) 20220209 - 우영두 추가 + AdjstConciliatorVO adjstConciliatorVO = new AdjstConciliatorVO(); + adjstConciliatorVO.setAdrSeq(closeVO.getAdrSeq()); + adjstConciliatorVO.setAdrSn(closeVO.getAdrSn()); + adjstConciliatorVO.setCmntTy(dlvinfoDetail.getDlvryDocTy()); //문서종류 코드 번호 전달 + + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(adjstConciliatorVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(100); + paginationInfo.setPageSize(adjstConciliatorVO.getPageSize()); + + adjstConciliatorVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + adjstConciliatorVO.setLastIndex(paginationInfo.getLastRecordIndex()); + adjstConciliatorVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + List cmnList = adjstConciliatorService.selectAdjstRecommendationCommentListGroup(adjstConciliatorVO); + + model.addAttribute("cmnList",cmnList); + + returnUrl = "/web/kccadr/certDoc/oadDetail"; + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_70.equals(dlvSocialVO.getDlvryDocTy())) { //불성립조정통보서 + + CloseVO closeVO = new CloseVO(); + + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + model.addAttribute("info", cmmService.selectPgrCmm(closeVO)); + + returnUrl = "/web/kccadr/certDoc/crtDetail"; + + } + + return returnUrl; + + } + + + @SuppressWarnings("unused") + private PgrCmmVO getDntInfo(PgrCmmVO cmmVO) throws Exception { + PgrCmmVO dntVO = cmmService.selectPgrCmm(cmmVO); + if (!StringUtil.isEmpty(dntVO.getMemNames())) { + String[] memNames = dntVO.getMemNames().split(", "); + String[] assSeqes = dntVO.getAssSeqes().split(", "); + + if(memNames.length==1) { + dntVO.setAddUsrNm0(memNames[0]); + dntVO.setAssSeq0(assSeqes[0]); + }else if(memNames.length>1) { + dntVO.setAddUsrNm0(memNames[0]); + dntVO.setAssSeq0(assSeqes[0]); + dntVO.setAddUsrNm1(memNames[1]); + dntVO.setAssSeq1(assSeqes[1]); + } + + } + return dntVO; + } + +} diff --git a/src/main/java/kcc/kccadr/cmm/KccadrPdfConversion.java b/src/main/java/kcc/kccadr/cmm/KccadrPdfConversion.java index ddd5fa7d..5de09128 100644 --- a/src/main/java/kcc/kccadr/cmm/KccadrPdfConversion.java +++ b/src/main/java/kcc/kccadr/cmm/KccadrPdfConversion.java @@ -1080,38 +1080,42 @@ public class KccadrPdfConversion extends EgovAbstractServiceImpl { for(AdjstReqStatusVO tmpAdjstReqStatusVO : adrFileList) { if(!"0".equals(tmpAdjstReqStatusVO.getAdrDocCn2())) { - conversionNo++; //변환 후 파일명 순번 - - //step1.파일위치 변경 - //sht => out/adrseq - FileVO fileVO = new FileVO(); - fileVO.setAtchFileId(tmpAdjstReqStatusVO.getAtchFileId()); - fileVO.setFileSn(tmpAdjstReqStatusVO.getFileSn()); - - FileVO nfile = p_egovFileMngService.selectFileInf(fileVO); - - //step1.copy and rename - String s_src_file_name = nfile.streFileNm; - String oriFileName = nfile.orignlFileNm; - String fileExt = nfile.fileExtsn; - //pdf 변환솔루션에서 변환가능 확장자 - //pdf, ppt, pptx, xls, xlsx, doc, docx, docm, dotx, txt, hwp, hwpx, jpg, jpe, jpeg, gif, png, bmp - String possibleExt = "PDF,PPT,PPTX,XLS,XLSX,DOC,DOCX,DOCM,DOTX,TXT,HWP,HWPX,JPG,JPE,JPEG,GIF,PNG,BMP"; - - if(possibleExt.contains(fileExt.toUpperCase())) - { - File tmpSrcFile = new File(pdfMakepath + s_src_file_name); - File tmpDestFile = new File(conversionBeforeUri + conversionNo + "." + fileExt); - FileUtils.copyFile(tmpSrcFile, tmpDestFile); - - map = new HashMap(); - map.put("INURI", pdfFilepathOut + p_adrSeq + "/conversionbefore/" + conversionNo + "." + fileExt); // 변환대상 파일 - map.put("OUTURI", conversionPdfUri+"conversionAfter_"+ Integer.toString(conversionNo) + ".pdf"); // 변환후 파일 - map.put("ISWEB", "0"); // 웹문서 여부 - map.put("ISEXIST", "0"); // 기존 PDF파일 존재 여부 => 기존파일일경우 INURI, OUTURI 동일 - map.put("BOOKMARKNAME", oriFileName); // 북마크에 삽입될 실제 파일명 - mapList.add(map); - } + try { + conversionNo++; //변환 후 파일명 순번 + + //step1.파일위치 변경 + //sht => out/adrseq + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(tmpAdjstReqStatusVO.getAtchFileId()); + fileVO.setFileSn(tmpAdjstReqStatusVO.getFileSn()); + + FileVO nfile = p_egovFileMngService.selectFileInf(fileVO); + + //step1.copy and rename + String s_src_file_name = nfile.streFileNm; + String oriFileName = nfile.orignlFileNm; + String fileExt = nfile.fileExtsn; + //pdf 변환솔루션에서 변환가능 확장자 + //pdf, ppt, pptx, xls, xlsx, doc, docx, docm, dotx, txt, hwp, hwpx, jpg, jpe, jpeg, gif, png, bmp + String possibleExt = "PDF,PPT,PPTX,XLS,XLSX,DOC,DOCX,DOCM,DOTX,TXT,HWP,HWPX,JPG,JPE,JPEG,GIF,PNG,BMP"; + + if(possibleExt.contains(fileExt.toUpperCase())) + { + File tmpSrcFile = new File(pdfMakepath + s_src_file_name); + File tmpDestFile = new File(conversionBeforeUri + conversionNo + "." + fileExt); + FileUtils.copyFile(tmpSrcFile, tmpDestFile); + + map = new HashMap(); + map.put("INURI", pdfFilepathOut + p_adrSeq + "/conversionbefore/" + conversionNo + "." + fileExt); // 변환대상 파일 + map.put("OUTURI", conversionPdfUri+"conversionAfter_"+ Integer.toString(conversionNo) + ".pdf"); // 변환후 파일 + map.put("ISWEB", "0"); // 웹문서 여부 + map.put("ISEXIST", "0"); // 기존 PDF파일 존재 여부 => 기존파일일경우 INURI, OUTURI 동일 + map.put("BOOKMARKNAME", oriFileName); // 북마크에 삽입될 실제 파일명 + mapList.add(map); + } + } catch (Exception e) { + System.out.println("atchFile Exception!!!!!!!!!!!"); + } } } diff --git a/src/main/java/kcc/kccadr/ojct/web/OjctWebController.java b/src/main/java/kcc/kccadr/ojct/web/OjctWebController.java index 0de74e2f..a16bd19c 100644 --- a/src/main/java/kcc/kccadr/ojct/web/OjctWebController.java +++ b/src/main/java/kcc/kccadr/ojct/web/OjctWebController.java @@ -85,9 +85,13 @@ public class OjctWebController { @Value("#{globalSettings['Globals.prod.islocal']}") public void setIslocal(String path) { islocal = path; } - //개발, local oz 저장 경로 - @Value("#{globalSettings['Globals.oz.devPath']}") - private String ozDevPath; +// //개발, local oz 저장 경로 +// @Value("#{globalSettings['Globals.oz.devPath']}") +// private String ozDevPath; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devPdfSavePath']}") + private String ozDevPdfSavePath; /** * 이의신청 목록 화면(사용자) @@ -376,7 +380,11 @@ public class OjctWebController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrOjctReport.ozr"; String savePath = ojctVO.getAdrSeq() + "/adrOjctReport.pdf"; - savePath = ozDevPath + ojctVO.getAdrSeq() + "/adrOjctReport.pdf"; + if(req.getServerName().contains("localhost")) { + savePath = ozDevPdfSavePath + ojctVO.getAdrSeq() + "/ozFile/adrOjctReport.pdf"; + }else { + savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + ojctVO.getAdrSeq() + "\\ozFile\\adrOjctReport.pdf"; + } String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -386,7 +394,7 @@ public class OjctWebController { else{ String ozrFilePath = "/admin/adrOjctReport.ozr"; /*String savePath = ojctVO.getAdrSeq() + "/adrOjctReport.pdf";*/ - String savePath = "\\\\192.168.39.125\\data3\\out\\" + ojctVO.getAdrSeq() + "\\ozFile\\adrOjctReport.pdf"; + String savePath = "\\\\192.168.39.130\\data\\out\\" + ojctVO.getAdrSeq() + "\\ozFile\\adrOjctReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 diff --git a/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java b/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java index ddba5751..4641ac51 100644 --- a/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java +++ b/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java @@ -37,14 +37,17 @@ public class OzSchdExportUtil { //개발서버 및 운영서버 구분에 따른 서버 정보 셋팅 String serverNm = request.getServerName(); - if(serverNm.contains("localhost") || serverNm.contains("119.193.215.98") || serverNm.contains("iten.co.kr")) { + if(serverNm.contains("localhost") + || serverNm.contains("119.193.215.98") + || serverNm.contains("iten.co.kr") + ) { - ozApiUrl = "http://192.168.0.125:8091/oz80/server"; - ozApiIp = "192.168.0.125"; +// ozApiUrl = "http://192.168.0.125:8091/oz80/server"; +// ozApiIp = "192.168.0.125"; //개발서버 - ozApiIp = "192.168.0.176"; - ozApiUrl = "http://"+ozApiIp+":8091/oz80/server"; + ozApiIp = "192.168.0.200"; + ozApiUrl = "http://192.168.0.176:8091/oz80/server"; }else { @@ -195,7 +198,8 @@ public class OzSchdExportUtil { if(p_devServerCheckString.indexOf(p_serverNm)>-1) { System.out.println(p_islocal + "환경입니다.-inner"); //저장파일 경로 - dev 서버의 경우는 oz report가linux 서버에서 작동되어 하기와 같이 경로 설정해야함(IP 불필요) - savePath = p_ozDevPath + "/" + p_adrSeq + "/ozFile/" + p_savePdfFileName; + savePath = "\\" + p_ozDevPath + "\\" + p_adrSeq + "\\ozFile\\" + p_savePdfFileName; +// savePath = p_ozDevPath + "/" + p_adrSeq + "/ozFile/" + p_savePdfFileName; //savePath = p_ozDevPath + "\\" + p_adrSeq + "\\" + p_savePdfFileName; //savePath = p_ozDevPath + "/" + p_savePdfFileName; diff --git a/src/main/java/kcc/let/main/web/EgovMainController.java b/src/main/java/kcc/let/main/web/EgovMainController.java index a6b9541f..628e3c70 100644 --- a/src/main/java/kcc/let/main/web/EgovMainController.java +++ b/src/main/java/kcc/let/main/web/EgovMainController.java @@ -214,157 +214,157 @@ public class EgovMainController { } } - PaginationInfo paginationInfo = new PaginationInfo(); - {//일일관리자 접속 리스트 - LoginLog loginLog = new LoginLog(); - paginationInfo.setCurrentPageNo(loginLog.getPageIndex()); - paginationInfo.setRecordCountPerPage(loginLog.getPageUnit()); - paginationInfo.setPageSize(loginLog.getPageSize()); - - loginLog.setFirstIndex(paginationInfo.getFirstRecordIndex()); - loginLog.setLastIndex(paginationInfo.getLastRecordIndex()); - loginLog.setRecordCountPerPage(10); //50개까지 보여주기 - //if(null != loginVO){ loginLog.setSiteId(loginVO.getSiteId()); } - List adminLogList = loginLogService.selectMainAmdinLog(loginLog); - int adminLogListCnt = loginLogService.selectMainAmdinLogTotCnt(loginLog); - paginationInfo.setTotalRecordCount(adminLogListCnt); - model.addAttribute("paginationInfo", paginationInfo); - model.addAttribute("adminLogList", adminLogList); - } - {// 최근 게시물 / 새개시물 카운트 - //0번째 부터 6개의 항목만 조회 - boardVO.setFirstIndex(0); - boardVO.setRecordCountPerPage(5); - // 최신날짜 우선순위 조회 - boardVO.setSearchSortCnd("frstRegisterPnttm"); - boardVO.setSearchSortOrd("desc"); - List adminBoardList = bbsMngService.selectAdminMainBoard(boardVO); - model.addAttribute("adminBoardList", adminBoardList); - - int adminMainNewBoardCnt = bbsMngService.selectAdminMainNewBoardCnt(boardVO); - model.addAttribute("adminMainNewBoardCnt", adminMainNewBoardCnt); - - } - {// 관리자 로그관리 리스트 - LoginLog loginLog = new LoginLog(); - //0번째 부터 6개의 항목만 조회 - loginLog.setFirstIndex(0); - loginLog.setRecordCountPerPage(6); - // 최신날짜 우선순위 조회 - loginLog.setSearchSortCnd("creatDt"); - loginLog.setSearchSortOrd("desc"); - List adminLogList = loginLogService.selectAmdinLog(loginLog); - model.addAttribute("adminLogList", adminLogList); - - } - {//신규가입회원 목록 - UserDefaultVO userSearchVO = new UserDefaultVO(); - - //0번째 부터 4개의 항목만 조회 - userSearchVO.setFirstIndex(0); - userSearchVO.setRecordCountPerPage(4); - - // 가입일시 우선순위 조회 - userSearchVO.setSearchSortCnd("sbscrbDe"); - userSearchVO.setSearchSortOrd("desc"); - - userSearchVO.setAdminYn("N"); - List userList = userManageService.selectUserList(userSearchVO); - model.addAttribute("userList", userList); - - UserDefaultVO userCount = userManageService.selectUserCount(); - model.addAttribute("userCount", userCount); - } - - {//접속통계 사용자만 - StatsVO statsVO = new StatsVO(); - statsVO.setRecordCountPerPage(20); //일카운터(20개) - statsVO.setFirstIndex(0); - List statsDayList = conectStatsService.selectMainStatsDay(statsVO); //일일접속카운터(관리자) - List statsMonthList = conectStatsService.selectMainStatsMonth(statsVO); //월별접속카운터(관리자) - List statsYearList = conectStatsService.selectMainStatsYear(statsVO); //연도변접속카운터(관리자) - {//일일통계 /* 연도없애기 */ - JSONObject statsObject = new JSONObject(); - JSONArray cntArray = new JSONArray(); - JSONArray dateArray = new JSONArray(); - for(StatsVO tempStatsVO : statsDayList){ - cntArray.add(tempStatsVO.getCnt()); - dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length())); - } - statsObject.put("cnt" , cntArray); - statsObject.put("date" , dateArray); - model.addAttribute("statsDayList", statsObject); - } - {//월통계 - JSONObject statsObject = new JSONObject(); - JSONArray cntArray = new JSONArray(); - JSONArray dateArray = new JSONArray(); - for(StatsVO tempStatsVO : statsMonthList){ - cntArray.add(tempStatsVO.getCnt()); - dateArray.add(tempStatsVO.getStatsDate()); - } - statsObject.put("cnt" , cntArray); - statsObject.put("date" , dateArray); - model.addAttribute("statsMonthList", statsObject); - } - {//년통계 - JSONObject statsObject = new JSONObject(); - JSONArray cntArray = new JSONArray(); - JSONArray dateArray = new JSONArray(); - cntArray.add(0); //데이터가 2018 한건만 조회 되어서 2017년도 0 넣어줌 - dateArray.add("2017"); - for(StatsVO tempStatsVO : statsYearList){ - cntArray.add(tempStatsVO.getCnt()); - dateArray.add(tempStatsVO.getStatsDate()); - } - statsObject.put("cnt" , cntArray); - statsObject.put("date" , dateArray); - model.addAttribute("statsYearList", statsObject); - } - - //PC, 모바일 접속통계(주간) - statsVO.setRecordCountPerPage(7); //일카운터(7일 : 일주일) - statsVO.setFirstIndex(0); - List statsPcDayList = conectStatsService.selectPcMainStatsDay(statsVO); //일일접속카운터(사용자) - List statsMobileDayList = conectStatsService.selectMobileMainStatsDay(statsVO); //일일접속카운터(사용자) - List statsAllDayList = conectStatsService.selectPcMobileMainStatsDay(statsVO); //모바일+PC(사용자) - {//PC - JSONObject statsObject = new JSONObject(); - JSONArray cntArray = new JSONArray(); - JSONArray dateArray = new JSONArray(); - for(StatsVO tempStatsVO : statsPcDayList){ - cntArray.add(tempStatsVO.getCnt()); - dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) ); - } - statsObject.put("cnt" , cntArray); - statsObject.put("date" , dateArray); - model.addAttribute("statsPcDayList", statsObject); - } - {//모바일 - JSONObject statsObject = new JSONObject(); - JSONArray cntArray = new JSONArray(); - JSONArray dateArray = new JSONArray(); - for(StatsVO tempStatsVO : statsMobileDayList){ - cntArray.add(tempStatsVO.getCnt()); - dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) ); - } - statsObject.put("cnt" , cntArray); - statsObject.put("date" , dateArray); - model.addAttribute("statsMobileDayList", statsObject); - } - {//전체 - JSONObject statsObject = new JSONObject(); - JSONArray cntArray = new JSONArray(); - JSONArray dateArray = new JSONArray(); - for(StatsVO tempStatsVO : statsAllDayList){ - cntArray.add(tempStatsVO.getCnt()); - dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) ); - } - statsObject.put("cnt" , cntArray); - statsObject.put("date" , dateArray); - model.addAttribute("statsPcMobileDayList", statsObject); - } - } +// PaginationInfo paginationInfo = new PaginationInfo(); +// {//일일관리자 접속 리스트 +// LoginLog loginLog = new LoginLog(); +// paginationInfo.setCurrentPageNo(loginLog.getPageIndex()); +// paginationInfo.setRecordCountPerPage(loginLog.getPageUnit()); +// paginationInfo.setPageSize(loginLog.getPageSize()); +// +// loginLog.setFirstIndex(paginationInfo.getFirstRecordIndex()); +// loginLog.setLastIndex(paginationInfo.getLastRecordIndex()); +// loginLog.setRecordCountPerPage(10); //50개까지 보여주기 +// //if(null != loginVO){ loginLog.setSiteId(loginVO.getSiteId()); } +// List adminLogList = loginLogService.selectMainAmdinLog(loginLog); +// int adminLogListCnt = loginLogService.selectMainAmdinLogTotCnt(loginLog); +// paginationInfo.setTotalRecordCount(adminLogListCnt); +// model.addAttribute("paginationInfo", paginationInfo); +// model.addAttribute("adminLogList", adminLogList); +// } +// {// 최근 게시물 / 새개시물 카운트 +// //0번째 부터 6개의 항목만 조회 +// boardVO.setFirstIndex(0); +// boardVO.setRecordCountPerPage(5); +// // 최신날짜 우선순위 조회 +// boardVO.setSearchSortCnd("frstRegisterPnttm"); +// boardVO.setSearchSortOrd("desc"); +// List adminBoardList = bbsMngService.selectAdminMainBoard(boardVO); +// model.addAttribute("adminBoardList", adminBoardList); +// +// int adminMainNewBoardCnt = bbsMngService.selectAdminMainNewBoardCnt(boardVO); +// model.addAttribute("adminMainNewBoardCnt", adminMainNewBoardCnt); +// +// } +// {// 관리자 로그관리 리스트 +// LoginLog loginLog = new LoginLog(); +// //0번째 부터 6개의 항목만 조회 +// loginLog.setFirstIndex(0); +// loginLog.setRecordCountPerPage(6); +// // 최신날짜 우선순위 조회 +// loginLog.setSearchSortCnd("creatDt"); +// loginLog.setSearchSortOrd("desc"); +// List adminLogList = loginLogService.selectAmdinLog(loginLog); +// model.addAttribute("adminLogList", adminLogList); +// +// } +// {//신규가입회원 목록 +// UserDefaultVO userSearchVO = new UserDefaultVO(); +// +// //0번째 부터 4개의 항목만 조회 +// userSearchVO.setFirstIndex(0); +// userSearchVO.setRecordCountPerPage(4); +// +// // 가입일시 우선순위 조회 +// userSearchVO.setSearchSortCnd("sbscrbDe"); +// userSearchVO.setSearchSortOrd("desc"); +// +// userSearchVO.setAdminYn("N"); +// List userList = userManageService.selectUserList(userSearchVO); +// model.addAttribute("userList", userList); +// +// UserDefaultVO userCount = userManageService.selectUserCount(); +// model.addAttribute("userCount", userCount); +// } +// +// {//접속통계 사용자만 +// StatsVO statsVO = new StatsVO(); +// statsVO.setRecordCountPerPage(20); //일카운터(20개) +// statsVO.setFirstIndex(0); +// List statsDayList = conectStatsService.selectMainStatsDay(statsVO); //일일접속카운터(관리자) +// List statsMonthList = conectStatsService.selectMainStatsMonth(statsVO); //월별접속카운터(관리자) +// List statsYearList = conectStatsService.selectMainStatsYear(statsVO); //연도변접속카운터(관리자) +// {//일일통계 /* 연도없애기 */ +// JSONObject statsObject = new JSONObject(); +// JSONArray cntArray = new JSONArray(); +// JSONArray dateArray = new JSONArray(); +// for(StatsVO tempStatsVO : statsDayList){ +// cntArray.add(tempStatsVO.getCnt()); +// dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length())); +// } +// statsObject.put("cnt" , cntArray); +// statsObject.put("date" , dateArray); +// model.addAttribute("statsDayList", statsObject); +// } +// {//월통계 +// JSONObject statsObject = new JSONObject(); +// JSONArray cntArray = new JSONArray(); +// JSONArray dateArray = new JSONArray(); +// for(StatsVO tempStatsVO : statsMonthList){ +// cntArray.add(tempStatsVO.getCnt()); +// dateArray.add(tempStatsVO.getStatsDate()); +// } +// statsObject.put("cnt" , cntArray); +// statsObject.put("date" , dateArray); +// model.addAttribute("statsMonthList", statsObject); +// } +// {//년통계 +// JSONObject statsObject = new JSONObject(); +// JSONArray cntArray = new JSONArray(); +// JSONArray dateArray = new JSONArray(); +// cntArray.add(0); //데이터가 2018 한건만 조회 되어서 2017년도 0 넣어줌 +// dateArray.add("2017"); +// for(StatsVO tempStatsVO : statsYearList){ +// cntArray.add(tempStatsVO.getCnt()); +// dateArray.add(tempStatsVO.getStatsDate()); +// } +// statsObject.put("cnt" , cntArray); +// statsObject.put("date" , dateArray); +// model.addAttribute("statsYearList", statsObject); +// } +// +// //PC, 모바일 접속통계(주간) +// statsVO.setRecordCountPerPage(7); //일카운터(7일 : 일주일) +// statsVO.setFirstIndex(0); +// List statsPcDayList = conectStatsService.selectPcMainStatsDay(statsVO); //일일접속카운터(사용자) +// List statsMobileDayList = conectStatsService.selectMobileMainStatsDay(statsVO); //일일접속카운터(사용자) +// List statsAllDayList = conectStatsService.selectPcMobileMainStatsDay(statsVO); //모바일+PC(사용자) +// {//PC +// JSONObject statsObject = new JSONObject(); +// JSONArray cntArray = new JSONArray(); +// JSONArray dateArray = new JSONArray(); +// for(StatsVO tempStatsVO : statsPcDayList){ +// cntArray.add(tempStatsVO.getCnt()); +// dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) ); +// } +// statsObject.put("cnt" , cntArray); +// statsObject.put("date" , dateArray); +// model.addAttribute("statsPcDayList", statsObject); +// } +// {//모바일 +// JSONObject statsObject = new JSONObject(); +// JSONArray cntArray = new JSONArray(); +// JSONArray dateArray = new JSONArray(); +// for(StatsVO tempStatsVO : statsMobileDayList){ +// cntArray.add(tempStatsVO.getCnt()); +// dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) ); +// } +// statsObject.put("cnt" , cntArray); +// statsObject.put("date" , dateArray); +// model.addAttribute("statsMobileDayList", statsObject); +// } +// {//전체 +// JSONObject statsObject = new JSONObject(); +// JSONArray cntArray = new JSONArray(); +// JSONArray dateArray = new JSONArray(); +// for(StatsVO tempStatsVO : statsAllDayList){ +// cntArray.add(tempStatsVO.getCnt()); +// dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) ); +// } +// statsObject.put("cnt" , cntArray); +// statsObject.put("date" , dateArray); +// model.addAttribute("statsPcMobileDayList", statsObject); +// } +// } //조정 목록, 이번달 현황 조회(최근 접수, 진행 사건, 처리현황) PgrCmmVO cmmVO = new PgrCmmVO(); 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 f17631bd..9ecfe1aa 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -398,8 +398,8 @@ public class EgovLoginController { LOGGER.debug("@ prod @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@Start"); //sMSOracleService.selectOracleTest(); // 연동 테스트. 콘솔 로그 확인 AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO(); - sMSOracleService.insertSmsSend(adjReqMgrVO); -// sMSOracleService.insertSmsSendTest(); +// sMSOracleService.insertSmsSend(adjReqMgrVO); + sMSOracleService.insertSmsSendTest(); LOGGER.debug("@ prod @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@End"); //} // diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index a0ebcb55..32bed20e 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -175,8 +175,9 @@ Globals.prod.islocal=local Globals.ozFontPath=/home/oz80/fontTestDir/ #oz \uac1c\ubc1c\uc11c\ubc84IP & \uc800\uc7a5\uacbd\ub85c -\uc2e4\uc11c\ubc84IP\ub294 \ud558\ub4dc\ucf54\ub529\ucc98\ub9ac Globals.oz.devServerIp=192.168.0.176:8091 -Globals.oz.devSchedulerIp=192.168.0.176 -Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data +Globals.oz.devSchedulerIp=192.168.0.200 +#Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data +Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 508724b5..af3f5471 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -182,9 +182,11 @@ Globals.prod.islocal=local Globals.ozFontPath=/home/oz80/fontTestDir/ #oz \uac1c\ubc1c\uc11c\ubc84IP & \uc800\uc7a5\uacbd\ub85c -\uc2e4\uc11c\ubc84IP\ub294 \ud558\ub4dc\ucf54\ub529\ucc98\ub9ac Globals.oz.devServerIp=192.168.0.176:8091 -Globals.oz.devSchedulerIp=192.168.0.176 +#Globals.oz.devSchedulerIp=192.168.0.176 +Globals.oz.devSchedulerIp=192.168.0.200 #scheduler \uc11c\ubc84\uc5d0 \uc0dd\uc131\ub418\ub294 \uacbd\ub85c \uc785\ub2c8\ub2e4. -Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data/out +#Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data/out +Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out\\ Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index 1127ba14..8764a7ca 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -179,7 +179,8 @@ Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 -Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out +#Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out +Globals.oz.realPdfSavePath=\\192.168.39.130\\data\\out #\uc2e4\uc11c\ubc84 Globals.ozFontPath=/home/oz80/fontTestDir/ @@ -203,7 +204,7 @@ Globals.pay.siteDomain=https://adr.copyright.or.kr/web/kccadr/payment/inipay Globals.MagicDB.PolicyName=POLICY001 #Streamdocs \ub4f1\ub85d URL -Globals.Streamdocs.Url= +Globals.Streamdocs.Url=http://192.168.39.144:8080/streamdocs/v4/documents # \uce74\uce74\uc624\uc54c\ub9bc\ud1a1(\ube44\uc988\ubfcc\ub9ac\uc624) API URL #\uac1c\ubc1c\uc11c\ubc84 diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml index 314ff7bd..a56407c0 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml @@ -1301,5 +1301,33 @@ + + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml index fb4dc243..a44d509a 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml @@ -198,6 +198,7 @@ , REG_NM = #regNm# , LAST_UPDUSR_ID = #lastUpdusrId# , LAST_UPDT_PNTTM = SYS_DATETIME + , DLVRY_DOC_TY = #dlvryDocTy# WHERE ADR_SEQ = #adrSeq# AND ADR_SN = #adrSn# AND DLVRY_SEQ = #dlvrySeq# diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert.jsp index fce0ca95..7a6b68eb 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert.jsp @@ -25,9 +25,12 @@ + + + + + + + + @@ -331,6 +403,7 @@ function wrapWindowByMask(){ +" />
@@ -500,74 +573,10 @@ function wrapWindowByMask(){ 서명이미지 - - -
- - - - - - - - - - - - - - - - - - - -
파일 명종류크기삭제
-

첨부하실 파일을 마우스로 끌어서 넣어주세요.

-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - -
파일 명종류크기삭제
- - - - "> - - "> - - -
-
+ + +

* 첨부파일을 등록해 주세요. (최대3개)

+

@@ -578,7 +587,7 @@ function wrapWindowByMask(){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert_ing.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert_ing.jsp new file mode 100644 index 00000000..99199d85 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert_ing.jsp @@ -0,0 +1,653 @@ +<%-- + Class Name : EgovUserInsert.jsp + Description : 사용자등록View JSP + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2009.03.03 JJY 최초 생성 + 2011.08.31 JJY 경량환경 버전 생성 + + author : 공통서비스 개발팀 JJY + since : 2009.03.03 +--%> +<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> + + + + +" /> + +
+
+ + +
+

관리자등록

+
    +
    • +
  • +

    관리자관리

    +
    • +
  • +

    관리자관리

    +
    • +
  • 관리자등록
    • +
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + <%-- + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + +
사이트명 + +
관리자아이디 + + + + + + +
비밀번호 + + +
+ + 비밀번호 문자 + 숫자 + 특수 문자 포함, 최소 8~20자리 + +
비밀번호확인 + +
로그인 유형 +
+ +
+
이름 + + +
권한 + +
직책 + + + + + +
부서 + +
전화번호 + + +
팩스번호 + + +
담당업무 + + +
이메일주소 + + +
서명이미지 + + +

* 첨부파일을 등록해 주세요. (최대3개)

+

+
+
+ + + +
+
+ +
+
+ +
+
+ +
+
+
+ + + + + + + + + + +
+
+ +
+
+
+

아이디 중복 확인

+ +
+
+

+

+ 사용할 아이디 +
+
+
+ 중복확인을 실행하십시오 +
+ +

+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp index 9395b372..f7796d80 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp @@ -175,7 +175,12 @@ function fn_goDetail(courtSeq){ - + + + + + + @@ -186,6 +191,11 @@ function fn_goDetail(courtSeq){ 분야 결과 사건번호 + + 배당일자 + 사무처리기한 + 보고일자 + 조정위원 결정일자 삭제 diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmDetail.jsp index 474b122b..e400e38d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmDetail.jsp @@ -31,13 +31,14 @@ } function tabPageLoad(idx) { - + var url = getPageUrl(idx); $('#tabContent').load(url, { "adrSeq" : $("#adrSeq").val(), "adrSn" : $("#adrSn").val(), - "reqOlCd" : $("#reqOlCd").val() + "reqOlCd" : $("#reqOlCd").val(), + "searchMonth" : $("#searchMonth").val() }, function(res, status, xhr) { console.log(status); }); @@ -74,6 +75,7 @@ " /> " /> " /> + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index f184dd63..b9dec0d7 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -337,8 +337,48 @@ $(document).ready(function(){ } //결재 팝업 이후 처리내용 - function fnc_aprvl_pop_ret(param){ - location.reload(); + function fnc_aprvl_pop_ret(sbmtSeq, sbmtTy){ + $('#sbmtSeq').val(sbmtSeq); + $('#sbmtTy').val(sbmtTy); + fncApprPass(); +// location.reload(); + } + + /* 기일통지서 승인요청 후 자동으로 조정부장 결재되도록 처리 */ + function fncApprPass(){ + var data = { + adrSeq : $("#adrSeq").val(), + adrSn : $("#adrSn").val(), + sbmtSeq : $("#sbmtSeq").val(), + sbmtTy : $("#sbmtTy").val(), + sbmtYn : 'Y' + } + + var statCd = $('#statCd').val(); + $.ajax({ + type: "POST", + url: "/web/kccadr/adjcclt/ai/adjstConciliatorApmSave.do", + data: JSON.stringify(data), + dataType:'json', + async: false, + processData: false, + contentType: "application/json", + cache: false, + success: function (returnData, status) { + if(returnData.result == 'FAIL'){ + if(returnData.message != ''){ + alert(returnData.message); + }else{ + alert("처리중 오류가 발생하였습니다."); + } + }else if(returnData.result == 'SUCCESS'){ + var s_adrHstryMgrSeq = returnData.adrHstryMgrSeq; + + } + location.reload(); + }, + error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } + }); } /* 워크플로우 */ @@ -766,8 +806,21 @@ $(document).ready(function(){ + + + + + + + + + + + + +
" /> " /> @@ -2038,6 +2091,9 @@ $(document).ready(function(){ ( 결재 대기 중) + + ( 반려) +

diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp index 48e90e0c..52cfa876 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp @@ -653,7 +653,9 @@ * pdf Stream road */ function fn_read_streamDocs(url){ - window.open(url); + var url2 = url; + url2 = url2.replace("http://192.168.39.144:8080", ""); + window.open(url2); } function fnc_download_endFile(){ diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp index 3bda36b7..45ce1bf4 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp @@ -26,6 +26,7 @@ + @@ -225,60 +226,21 @@ //등록 버튼 function fncReg() { - var f = document.getElementById("listForm"); - var data = new FormData(f); - _fileForm2.forEach(function(obj, idx) { - if (obj) - data.append("file" + idx, obj.fileObj); - }); if (validation()) { if(confirm("사건문서를 등록 하시겠습니까?")){ - if(control.getUploadFiles().length > 0){ - var postObj = new Object(); postObj.innoDirPath = $('#innoDirPath').val(); control.setPostData(postObj); // 업로드시 함께 전달될 POST Param 추가 control.upload(); // 업로드 시작 - }else{ - alert("등록된 첨부파일이 없습니다."); return false; - } - -// $.ajax({ -// type : "POST", -// enctype : 'multipart/form-data', -// url : "/kccadr/adjPgrMgr/apm/docRegPopAjax.do", -// data : data, -// dataType : 'json', -// async : false, -// processData : false, -// contentType : false, -// cache : false, -// success : function(returnData, status) { -// if (returnData.result == 'success') { -// alert("사건문서 제출이 완료되었습니다."); -// opener.location.reload(true); -// self.close(); -// } else { -// alert(returnData.message); -// } - -// }, -// error : function(e) { -// alert("사건문서 제출에 실패하였습니다."); -// console.log("ERROR : ", e); -// } -// }); } - } - } // 파일 업로드 솔루션 init 셋팅 @@ -289,15 +251,14 @@ el: '#fileControl' // 컨트롤 출력 HTML 객체 ID , transferMode: 'both' // 업로드, 다운로드 혼합사용 , installUrl: '/innorix/install/install.html' // Agent 설치 페이지 - , uploadUrl: '/innorix/exam/upload_test_220916.jsp' // 업로드 URL + , uploadUrl: '/innorix/exam/upload.jsp' // 업로드 URL , height:80 , width: 635 }); // 업로드 완료 이벤트 control.on('uploadComplete', function (p) { - fn_insertFile(p.files); // 파일 정보 DB isnert function - control.removeAllFiles(); // control 초기화 + fn_callBackInnorix(p.files); // 파일 정보 DB isnert function }); }; @@ -305,12 +266,14 @@ /* * 파일 정보 DB insert Ajax * */ - function fn_insertFile(data){ + function fn_callBackInnorix(data){ + + var url = ""; var filePath = location.pathname; var jspFileName = filePath.substring(filePath.lastIndexOf("/")+1, filePath.lastIndexOf(".")); - - var resultData = { + + var sendData = { "adrSeq": $('#adrSeq').val() , "adrSn": $('#adrSn').val() , "adrDocTy": $('#adrDocTy').val() @@ -319,37 +282,19 @@ , "openYn": $('#openYn').val() , "jspFileName": jspFileName , "innorixFileListVO": data + , "successMsg" : "사건문서 제출이 완료되었습니다." } - - console.log('resultData :: ', resultData); - $.ajax({ - type: "POST", - url: "", - data: JSON.stringify(resultData), - dataType:'json', - async: false, - processData: false, - contentType: "application/json", - cache: false, - success: function (returnData) { - if(returnData.status == "OK"){ - alert("사건문서 제출이 완료되었습니다."); - opener.location.reload(true); - self.close(); - }else{ - alert(returnData.data); - return false; - } - }, - error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } - }); - + /* + * 공통 : innorixCommon.js + * fn_innorixCmmAjax() 호출 후 status가 성공(OK)이면 실행 + */ + if(fn_innorixCmmAjax(sendData, url) == "OK") + { + opener.location.reload(true); + self.close(); + } } - - - - 사건관련문서 등록 diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp index fd38b97f..6b5d1430 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp @@ -862,7 +862,7 @@ function fn_save_aprvl() { if (returnData.status == "success") { alert("결재요청 완료되었습니다."); //top.window.opener.parent.location.reload(); - top.window.opener.fnc_aprvl_pop_ret(); + top.window.opener.fnc_aprvl_pop_ret(returnData.sbmtSeq, $("#sbmtTyCd").val()); fncGoClose(); }else{ alert("ERROR"); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp index 13fc27fc..954d2442 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp @@ -862,7 +862,7 @@ function fn_save_aprvl() { if (returnData.status == "success") { alert("결재요청 완료되었습니다."); //top.window.opener.parent.location.reload(); - top.window.opener.fnc_aprvl_pop_ret(); + top.window.opener.fnc_aprvl_pop_ret(returnData.sbmtSeq, $("#sbmtTyCd").val()); fncGoClose(); }else{ alert("ERROR"); diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeInqire.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeInqire.jsp index 922e337a..1b22db0b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeInqire.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeInqire.jsp @@ -22,6 +22,8 @@ <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%pageContext.setAttribute("crlf", "\r\n"); %> +<%pageContext.setAttribute("crlt", "<"); %> +<%pageContext.setAttribute("crgt", ">"); %> <% response.setHeader("Cache-Control","no-store"); response.setHeader("Pragma","no-cache"); @@ -316,7 +318,8 @@ function fn_egov_select_commentList(pageNo) { ${fn:replace(result.nttCn, crlf , '
')} - + <%-- --%> +

diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp index 968a1107..711c7be0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp @@ -237,9 +237,11 @@
신청내용 -
- 신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(￦3,000,000)을 지급한다. -
+ +
+ +
+
@@ -256,9 +258,11 @@
신청내용 -
- 신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(￦3,000,000)을 지급한다. -
+ +
+ +
+
@@ -276,9 +280,11 @@
신청내용 -
- 신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(￦3,000,000)을 지급한다. -
+ +
+ +
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp index 51886759..6b7c0d35 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp @@ -92,7 +92,7 @@ result = false; return false; } - if (isEmpty($('input[name=rpplEmail01]').eq(idx).val())) { + /* if (isEmpty($('input[name=rpplEmail01]').eq(idx).val())) { alert('이메일1을 입력해 주세요.'); $('input[name=rpplEmail01]').eq(idx).focus(); result = false; @@ -103,7 +103,7 @@ $('input[name=rpplEmail02]').eq(idx).focus(); result = false; return false; - } + } */ if (isEmpty($('select[name=rpplPhone01]').eq(idx).val())) { alert('연락처1를 입력해 주세요.'); $('select[name=rpplPhone01]').eq(idx).focus(); @@ -317,18 +317,18 @@ -

+

이메일

- "> + " onkeyup="onlyAlphabetNumberEmail(this)"> @ - "> + " onkeyup="onlyAlphabetNumberEmail(this)"> - "> + " onkeyup="onlyNumber(this)"> - - "> + " onkeyup="onlyNumber(this)"> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp index ab3b539e..aecf7400 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp @@ -383,18 +383,18 @@ function fn_submit(){ -

+

이메일

"> - "> + " onkeyup="onlyAlphabetNumberEmail(this)"> @ - "> + " onkeyup="onlyAlphabetNumberEmail(this)"> <%-- - - "> + " onkeyup="onlyNumber(this)"> - - "> + " onkeyup="onlyNumber(this)"> "> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index 53a06c6c..5b0212ae 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -525,9 +525,11 @@ var AdjstReq = { }, step3Save : function(mode, previewYn, adrSeq){ // previewYn : 조정신청등록 3단계 미리보기 버튼 클릭시 > 3단계 저장 처리후 팝업오픈 - if(!this.validStep(this.STEP)){ - return false; - } + if(previewYn != 'Y'){ + if(!this.validStep(this.STEP)){ + return false; + } + } var data = new FormData($("#"+this.STEP)[0]); //첨부파일 등록 처리 @@ -549,12 +551,13 @@ var AdjstReq = { // 등록 구분 코드 삽입.. data.append("mode" , mode); - - if(!confirm(msg)){ - if(mode == "${KccadrConstants.ADR_MODE_UPT_TO_GOPREV}"){ // 수정 후 전 페이지 - AdjstReq.fncGoPrev(); - } - return false; + if(previewYn != 'Y'){ + if(!confirm(msg)){ + if(mode == "${KccadrConstants.ADR_MODE_UPT_TO_GOPREV}"){ // 수정 후 전 페이지 + AdjstReq.fncGoPrev(); + } + return false; + } } var depth = this.expDivision(this.STEP); @@ -572,7 +575,9 @@ var AdjstReq = { cache: false, success: function (returnData, status) { if(returnData.result == 'SUCCESS'){ - alert(endMsg); + if(previewYn != 'Y'){ + alert(endMsg); + } $("#atchFileId").val(returnData.rsVO.atchFileId); if(mode == "${KccadrConstants.ADR_MODE_SMT}"){ AdjstReq.fncGoMyAdjstListPage(); diff --git a/src/main/webapp/WEB-INF/lib/MagicDB.conf b/src/main/webapp/WEB-INF/lib/MagicDB.conf index 4e2c4b08..2b8ccfc2 100644 --- a/src/main/webapp/WEB-INF/lib/MagicDB.conf +++ b/src/main/webapp/WEB-INF/lib/MagicDB.conf @@ -1,35 +1,36 @@ -#------------------------------------------------ -# MagicDB Module Configuration File -#------------------------------------------------ -[GLOBAL] -ID = plugin -PWD = kRg/dHemliWHkzyLwAX1Zw== -LOG = false -LOGFILEPATH = /usr/local/MagicDB/logs -LOGFILENAME = MagicDB - -# 0 : DEBUG ,1 : INFO ,2 : ERROR ,3 : WARN -LOG_LEVEL = 2 -SERVER_NUM = 1 -IP01 = 192.168.0.176 -PORT01 = 51001 -#IP02 = 127.0.0.1 -#PORT02 = 51001 - -#LOGPROPERTIES=D:/workspace/MDBMigrationCubrid/lib/log4j.properties - -# HMAC -#32bit APP_HASH = uGDvAIA8roDOBAmiPlb0hLbn0k6q63AqREVDHb2+nfs= -#64bit APP_HASH = rspNT+R+iOUAyO4UKWk/iMAa2CJrSUh+0jBhT2mWHIE= -APP_HASH = rspNT+R+iOUAyO4UKWk/iMAa2CJrSUh+0jBhT2mWHIE= -APP_PATH = /home/oracle/MagicDB/lib/libMagicDB.so - -KCMV_MODE = false - -LICENSE = /usr/local/MagicDB/conf/CAOSLib_MagicDB.lic - -ACC_IGNORE = true - -#FILE_POLICY = false -#FILE_POLICY_NUM = 1 -#FILE_POLICY_NAME01 = D:\MagicDBAPI\bin\MAGICDB_POLICY.dat +#------------------------------------------------ +# MagicDB Module Configuration File +#------------------------------------------------ +[GLOBAL] +ID = plugin +PWD = kRg/dHemliWHkzyLwAX1Zw== +LOG = false +LOGFILEPATH = /usr/local/MagicDB/logs +LOGFILENAME = MagicDB + +# 0 : DEBUG ,1 : INFO ,2 : ERROR ,3 : WARN +LOG_LEVEL = 2 +SERVER_NUM = 2 +IP01 = 192.168.39.185 +PORT01 = 51001 +IP02 = 192.168.39.186 +PORT02 = 51001 + +#LOGPROPERTIES=D:/workspace/MDBMigrationCubrid/lib/log4j.properties + +# ��� HMAC �� +#32bit APP_HASH = uGDvAIA8roDOBAmiPlb0hLbn0k6q63AqREVDHb2+nfs= +#64bit APP_HASH = rspNT+R+iOUAyO4UKWk/iMAa2CJrSUh+0jBhT2mWHIE= +APP_HASH = rspNT+R+iOUAyO4UKWk/iMAa2CJrSUh+0jBhT2mWHIE= +APP_PATH = /home/oracle/MagicDB/lib/libMagicDB.so + +KCMV_MODE = false + +#LICENSE = /usr/local/MagicDB/conf/CAOSLib_MagicDB.lic +LICENSE = /usr/local/MagicDB/conf/jcaos.lic + +ACC_IGNORE = true + +#FILE_POLICY = false +#FILE_POLICY_NUM = 1 +#FILE_POLICY_NAME01 = D:\MagicDBAPI\bin\MAGICDB_POLICY.dat diff --git a/src/main/webapp/WEB-INF/lib/jcaos.lic b/src/main/webapp/WEB-INF/lib/jcaos.lic index e48cfa2c..20b84796 100644 --- a/src/main/webapp/WEB-INF/lib/jcaos.lic +++ b/src/main/webapp/WEB-INF/lib/jcaos.lic @@ -1 +1 @@ -MIHHBAEzBAVKQ0FPUwQQx9GxucD6wNuxx8Cnv/jIuAQWSlRLVC0wMDAwMC0yMjA5MTMtMDI0MQQABAAECjIwMjMtMDEtMTAEgYA0ODc4RDA3N0RFRUI3MkQzMkIyNzgxNjkyMEYxRTE2MDgzNTdFQTBEOEYyODA4RTVBMTQ4NjUyNjI1MEJCQzdGMjA0ODVENTlBOTZBNzA2NUU4MEM3RUVFMkMwQjg1RjU2Qjk3NTY3QzdEMjREMUIyMjBFNzdFQjFFOUI3NzE1Qw== \ No newline at end of file +MIIBDwQBMwQFSkNBT1MEEMfRsbnA+sDbscfAp7/4yLgEFkpUS1MtMDAwMDAtMjIxMTI5LTAzMjQwCAQABAAEAAQAMD4EDTIyMi4yMzEuNDMuNjYEDTIyMi4yMzEuNDMuNjkEDjE5Mi4xNjguMzkuMTg1BA4xOTIuMTY4LjM5LjE4NgQABIGAOTYyNjk5QkQ2RUNCOEIwNjg4MEFGMTA4NUZCN0Q4OTYwNEMxRTE4MDhBODIyQ0UzMDIxQjQxRjhEQ0ExMDVDRENCMDAwMDJBMUY5NjE2QUU5OUQ5MTgyRTQwOEI1RUQzQzFCMzQ4NUIxQTVCNzc2QzdGRERDNDdDRTU2QjIxOTCiCjAIBAAEAAQABAA= \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 6cce55eb..d795f97f 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -140,5 +140,5 @@ - + diff --git a/src/main/webapp/innorix/exam/upload.jsp b/src/main/webapp/innorix/exam/upload.jsp index 65dffe30..dd898bf4 100644 --- a/src/main/webapp/innorix/exam/upload.jsp +++ b/src/main/webapp/innorix/exam/upload.jsp @@ -1,15 +1,18 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page import="com.innorix.transfer.InnorixUpload" %> - +<%-- <%@ page import="egovframework.rte.fdl.property.EgovPropertyService" %> --%> <% // CORS체크를 위한 OPTIONS 메소드가 들어오므로 POST 일 경우에만 동작하도록 조건 추가 if (request.getMethod().equals("POST")) { String directory = InnorixUpload.getServletAbsolutePath(request); - System.out.println("========== directory :: " + directory + " =========="); - directory = directory.substring(0, directory.lastIndexOf("/") + 1) + "data"; +// directory = directory.substring(0, directory.lastIndexOf("/") + 1) + "data"; +// directory = PropertyService.getString("Globals.fileStorePath"); + directory = "/usr/local/tomcat/file/sht/"; int maxPostSize = 2147482624; // bytes + + InnorixUpload uploader = new InnorixUpload(request, response, maxPostSize, directory); /* @@ -32,6 +35,26 @@ if (request.getMethod().equals("POST")) String _type = uploader.getParameter("type"); // 커스텀 정의 POST Param 1 String _part = uploader.getParameter("part"); // 커스텀 정의 POST Param 2 String _transferId = uploader.getParameter("_transferId"); // TransferId + String _innoFilePath = uploader.getParameter("innoDirPath"); // 커스텀 정의 POST Param 2 + + /* + + 현재 페이지를 호출하는 jsp에서 + " /> + 위 코드를 작성하고 + + control.upload() 전에 + + + var postObj = new Object(); + postObj.innoDirPath = $('#innoDirPath').val(); + control.setPostData(postObj); // 업로드시 함께 전달될 POST Param 추가 + + 위 코드를 넣어 줘야 함 + + */ + uploader.setDirectory(_innoFilePath); + String _run_retval = uploader.run(); // 개별파일 업로드 완료 diff --git a/src/main/webapp/innorix/exam/upload_test_220916.jsp b/src/main/webapp/innorix/exam/upload_ori.jsp similarity index 77% rename from src/main/webapp/innorix/exam/upload_test_220916.jsp rename to src/main/webapp/innorix/exam/upload_ori.jsp index dd898bf4..65dffe30 100644 --- a/src/main/webapp/innorix/exam/upload_test_220916.jsp +++ b/src/main/webapp/innorix/exam/upload_ori.jsp @@ -1,18 +1,15 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page import="com.innorix.transfer.InnorixUpload" %> -<%-- <%@ page import="egovframework.rte.fdl.property.EgovPropertyService" %> --%> + <% // CORS체크를 위한 OPTIONS 메소드가 들어오므로 POST 일 경우에만 동작하도록 조건 추가 if (request.getMethod().equals("POST")) { String directory = InnorixUpload.getServletAbsolutePath(request); -// directory = directory.substring(0, directory.lastIndexOf("/") + 1) + "data"; -// directory = PropertyService.getString("Globals.fileStorePath"); - directory = "/usr/local/tomcat/file/sht/"; + System.out.println("========== directory :: " + directory + " =========="); + directory = directory.substring(0, directory.lastIndexOf("/") + 1) + "data"; int maxPostSize = 2147482624; // bytes - - InnorixUpload uploader = new InnorixUpload(request, response, maxPostSize, directory); /* @@ -35,26 +32,6 @@ if (request.getMethod().equals("POST")) String _type = uploader.getParameter("type"); // 커스텀 정의 POST Param 1 String _part = uploader.getParameter("part"); // 커스텀 정의 POST Param 2 String _transferId = uploader.getParameter("_transferId"); // TransferId - String _innoFilePath = uploader.getParameter("innoDirPath"); // 커스텀 정의 POST Param 2 - - /* - - 현재 페이지를 호출하는 jsp에서 - " /> - 위 코드를 작성하고 - - control.upload() 전에 - - - var postObj = new Object(); - postObj.innoDirPath = $('#innoDirPath').val(); - control.setPostData(postObj); // 업로드시 함께 전달될 POST Param 추가 - - 위 코드를 넣어 줘야 함 - - */ - uploader.setDirectory(_innoFilePath); - String _run_retval = uploader.run(); // 개별파일 업로드 완료 diff --git a/src/main/webapp/innorix/innorix.js b/src/main/webapp/innorix/innorix.js index e37b2f56..032fa2da 100644 --- a/src/main/webapp/innorix/innorix.js +++ b/src/main/webapp/innorix/innorix.js @@ -1,49 +1,51 @@ -/* - * innorix-wp9 1.0.0 - * INNORIX Transfer solution - * Wed, 18 May 2022 09:39:57 GMT - * - * Copyright (C) INNORIX / innorix-dev-team, http://innorix.com - */ - -// 라이선스 유형 : INNORIX WP 91일 체험 (만료 2022-09-30) -/*var INNORIX_LICENSE = "WEiCgfGkBpqQN/Zw0Ae0YQDFQoK5vit/hNZK/8gGNUm+mtjwAJr4dLSFCiLgiY9BOWSg925hgOfaW1olUgUTccrrl6Y=";*/ -// 라이선스 유형 : INNORIX WP 91일 체험 (만료 2022-12-31) -var INNORIX_LICENSE = "SQeXVJiPNj/2u6W8BXoc1pX1l1D0Dc1azbDxUT+BQPLxsV86kF62+FUvIaofOXnArJTjp9kn/ZtUA+Ps0JFla2QGiu0="; - -var INNORIX_VERSION = '1.1.3.458'; -var INNORIX_WIN_VERSION = '1.1.3.458'; -var INNORIX_MAC_VERSION = '1.1.3.458'; -var INNORIX_LINUX_VERSION = '1.1.3.458'; - -var innorix_install_retry_count = 3; - -!function(t,e){"object"==typeof module&&"object"==typeof module.exports?module.exports=t.document?e(t,!0):function(t){if(!t.document)throw new Error("jQuery requires a window with a document");return e(t)}:e(t)}("undefined"!=typeof window?window:this,function(t,e){function i(t){var e=!!t&&"length"in t&&t.length,i=pt.type(t);return"function"!==i&&!pt.isWindow(t)&&("array"===i||0===e||"number"==typeof e&&e>0&&e-1 in t)}function n(t,e,i){if(pt.isFunction(e))return pt.grep(t,function(t,n){return!!e.call(t,n,t)!==i});if(e.nodeType)return pt.grep(t,function(t){return t===e!==i});if("string"==typeof e){if(St.test(e))return pt.filter(e,t,i);e=pt.filter(e,t)}return pt.grep(t,function(t){return pt.inArray(t,e)>-1!==i})}function o(t,e){do{t=t[e]}while(t&&1!==t.nodeType);return t}function r(t){var e={};return pt.each(t.match(Et)||[],function(t,i){e[i]=!0}),e}function s(){nt.addEventListener?(nt.removeEventListener("DOMContentLoaded",a),t.removeEventListener("load",a)):(nt.detachEvent("onreadystatechange",a),t.detachEvent("onload",a))}function a(){(nt.addEventListener||"load"===t.event.type||"complete"===nt.readyState)&&(s(),pt.ready())}function l(t,e,i){if(void 0===i&&1===t.nodeType){var n="data-"+e.replace(Nt,"-$1").toLowerCase();if("string"==typeof(i=t.getAttribute(n))){try{i="true"===i||"false"!==i&&("null"===i?null:+i+""===i?+i:Ot.test(i)?pt.parseJSON(i):i)}catch(ot){}pt.data(t,e,i)}else i=void 0}return i}function h(t){var e;for(e in t)if(("data"!==e||!pt.isEmptyObject(t[e]))&&"toJSON"!==e)return!1;return!0}function c(t,e,i,n){if(Rt(t)){var o,r,s=pt.expando,a=t.nodeType,l=a?pt.cache:t,h=a?t[s]:t[s]&&s;if(h&&l[h]&&(n||l[h].data)||void 0!==i||"string"!=typeof e)return h||(h=a?t[s]=it.pop()||pt.guid++:s),l[h]||(l[h]=a?{}:{toJSON:pt.noop}),"object"!=typeof e&&"function"!=typeof e||(n?l[h]=pt.extend(l[h],e):l[h].data=pt.extend(l[h].data,e)),r=l[h],n||(r.data||(r.data={}),r=r.data),void 0!==i&&(r[pt.camelCase(e)]=i),"string"==typeof e?null==(o=r[e])&&(o=r[pt.camelCase(e)]):o=r,o}}function u(t,e,i){if(Rt(t)){var n,o,r=t.nodeType,s=r?pt.cache:t,a=r?t[pt.expando]:pt.expando;if(s[a]){if(e&&(n=i?s[a]:s[a].data)){pt.isArray(e)?e=e.concat(pt.map(e,pt.camelCase)):e in n?e=[e]:(e=pt.camelCase(e),e=e in n?[e]:e.split(" ")),o=e.length;for(;o--;)delete n[e[o]];if(i?!h(n):!pt.isEmptyObject(n))return}(i||(delete s[a].data,h(s[a])))&&(r?pt.cleanData([t],!0):ut.deleteExpando||s!=s.window?delete s[a]:s[a]=void 0)}}}function d(t,e,i,n){var o,r=1,s=20,a=n?function(){return n.cur()}:function(){return pt.css(t,e,"")},l=a(),h=i&&i[3]||(pt.cssNumber[e]?"":"px"),c=(pt.cssNumber[e]||"px"!==h&&+l)&&Ft.exec(pt.css(t,e));if(c&&c[3]!==h){h=h||c[3],i=i||[],c=+l||1;do{r=r||".5",c/=r,pt.style(t,e,c+h)}while(r!==(r=a()/l)&&1!==r&&--s)}return i&&(c=+c||+l||0,o=i[1]?c+(i[1]+1)*i[2]:+i[2],n&&(n.unit=h,n.start=c,n.end=o)),o}function p(t){var e=Vt.split("|"),i=t.createDocumentFragment();if(i.createElement)for(;e.length;)i.createElement(e.pop());return i}function f(t,e){var i,n,o=0,r="undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e||"*"):"undefined"!=typeof t.querySelectorAll?t.querySelectorAll(e||"*"):void 0;if(!r)for(r=[],i=t.childNodes||t;null!=(n=i[o]);o++)!e||pt.nodeName(n,e)?r.push(n):pt.merge(r,f(n,e));return void 0===e||e&&pt.nodeName(t,e)?pt.merge([t],r):r}function g(t,e){for(var i,n=0;null!=(i=t[n]);n++)pt._data(i,"globalEval",!e||pt._data(e[n],"globalEval"))}function m(t){Ht.test(t.type)&&(t.defaultChecked=t.checked)}function v(t,e,i,n,o){for(var r,s,a,l,h,c,u,d=t.length,v=p(e),_=[],x=0;d>x;x++)if((s=t[x])||0===s)if("object"===pt.type(s))pt.merge(_,s.nodeType?[s]:s);else if(jt.test(s)){for(l=l||v.appendChild(e.createElement("div")),h=(Wt.exec(s)||["",""])[1].toLowerCase(),u=$t[h]||$t._default,l.innerHTML=u[1]+pt.htmlPrefilter(s)+u[2],r=u[0];r--;)l=l.lastChild;if(!ut.leadingWhitespace&&Ut.test(s)&&_.push(e.createTextNode(Ut.exec(s)[0])),!ut.tbody)for(s="table"!==h||qt.test(s)?""!==u[1]||qt.test(s)?0:l:l.firstChild,r=s&&s.childNodes.length;r--;)pt.nodeName(c=s.childNodes[r],"tbody")&&!c.childNodes.length&&s.removeChild(c);for(pt.merge(_,l.childNodes),l.textContent="";l.firstChild;)l.removeChild(l.firstChild);l=v.lastChild}else _.push(e.createTextNode(s));for(l&&v.removeChild(l),ut.appendChecked||pt.grep(f(_,"input"),m),x=0;s=_[x++];)if(n&&pt.inArray(s,n)>-1)o&&o.push(s);else if(a=pt.contains(s.ownerDocument,s),l=f(v.appendChild(s),"script"),a&&g(l),i)for(r=0;s=l[r++];)zt.test(s.type||"")&&i.push(s);return l=null,v}function _(){return!0}function x(){return!1}function y(){try{return nt.activeElement}catch(t){}}function b(t,e,i,n,o,r){var s,a;if("object"==typeof e){"string"!=typeof i&&(n=n||i,i=void 0);for(a in e)b(t,a,i,n,e[a],r);return t}if(null==n&&null==o?(o=i,n=i=void 0):null==o&&("string"==typeof i?(o=n,n=void 0):(o=n,n=i,i=void 0)),!1===o)o=x;else if(!o)return t;return 1===r&&(s=o,o=function(t){return pt().off(t),s.apply(this,arguments)},o.guid=s.guid||(s.guid=pt.guid++)),t.each(function(){pt.event.add(this,e,o,n,i)})}function w(t,e){return pt.nodeName(t,"table")&&pt.nodeName(11!==e.nodeType?e:e.firstChild,"tr")?t.getElementsByTagName("tbody")[0]||t.appendChild(t.ownerDocument.createElement("tbody")):t}function S(t){return t.type=(null!==pt.find.attr(t,"type"))+"/"+t.type,t}function C(t){var e=ne.exec(t.type);return e?t.type=e[1]:t.removeAttribute("type"),t}function T(t,e){if(1===e.nodeType&&pt.hasData(t)){var i,n,o,r=pt._data(t),s=pt._data(e,r),a=r.events;if(a){delete s.handle,s.events={};for(i in a)for(n=0,o=a[i].length;o>n;n++)pt.event.add(e,i,a[i][n])}s.data&&(s.data=pt.extend({},s.data))}}function k(t,e){var i,n,o;if(1===e.nodeType){if(i=e.nodeName.toLowerCase(),!ut.noCloneEvent&&e[pt.expando]){o=pt._data(e);for(n in o.events)pt.removeEvent(e,n,o.handle);e.removeAttribute(pt.expando)}"script"===i&&e.text!==t.text?(S(e).text=t.text,C(e)):"object"===i?(e.parentNode&&(e.outerHTML=t.outerHTML),ut.html5Clone&&t.innerHTML&&!pt.trim(e.innerHTML)&&(e.innerHTML=t.innerHTML)):"input"===i&&Ht.test(t.type)?(e.defaultChecked=e.checked=t.checked,e.value!==t.value&&(e.value=t.value)):"option"===i?e.defaultSelected=e.selected=t.defaultSelected:"input"!==i&&"textarea"!==i||(e.defaultValue=t.defaultValue)}}function D(t,e,i,n){e=rt.apply([],e);var o,r,s,a,l,h,c=0,u=t.length,d=u-1,p=e[0],g=pt.isFunction(p);if(g||u>1&&"string"==typeof p&&!ut.checkClone&&ie.test(p))return t.each(function(o){var r=t.eq(o);g&&(e[0]=p.call(this,o,r.html())),D(r,e,i,n)});if(u&&(h=v(e,t[0].ownerDocument,!1,t,n),o=h.firstChild,1===h.childNodes.length&&(h=o),o||n)){for(a=pt.map(f(h,"script"),S),s=a.length;u>c;c++)r=h,c!==d&&(r=pt.clone(r,!0,!0),s&&pt.merge(a,f(r,"script"))),i.call(t[c],r,c);if(s)for(l=a[a.length-1].ownerDocument,pt.map(a,C),c=0;s>c;c++)r=a[c],zt.test(r.type||"")&&!pt._data(r,"globalEval")&&pt.contains(l,r)&&(r.src?pt._evalUrl&&pt._evalUrl(r.src):pt.globalEval((r.text||r.textContent||r.innerHTML||"").replace(oe,"")));h=o=null}return t}function E(t,e,i){for(var n,o=e?pt.filter(e,t):t,r=0;null!=(n=o[r]);r++)i||1!==n.nodeType||pt.cleanData(f(n)),n.parentNode&&(i&&pt.contains(n.ownerDocument,n)&&g(f(n,"script")),n.parentNode.removeChild(n));return t}function I(t,e){var i=pt(e.createElement(t)).appendTo(e.body),n=pt.css(i[0],"display");return i.detach(),n}function A(t){var e=nt,i=le[t];return i||(i=I(t,e),"none"!==i&&i||(ae=(ae||pt("