diff --git a/src/main/java/cokr/xit/fims/biz/cmm/dao/FimsCrackdownMgtMapper.java b/src/main/java/cokr/xit/fims/biz/cmm/dao/FimsCrackdownMgtMapper.java deleted file mode 100644 index 0f042aeb..00000000 --- a/src/main/java/cokr/xit/fims/biz/cmm/dao/FimsCrackdownMgtMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package cokr.xit.fims.biz.cmm.dao; - -import java.util.List; -import java.util.Map; - -import org.apache.ibatis.session.RowBounds; - -import org.egovframe.rte.psl.dataaccess.mapper.Mapper; -import cokr.xit.fims.biz.cmm.FimsCrackdownDTO; -import cokr.xit.fims.biz.cmm.NtriDTO; -import cokr.xit.fims.biz.ec.CtznStmtDTO; -import cokr.xit.fims.biz.rt.RtDTO; -import cokr.xit.fims.framework.biz.cmm.CmmAnsTmplDTO; - -@Mapper -public interface FimsCrackdownMgtMapper { - - List selectCrackdowns(final Map paraMap, final RowBounds rowBounds); - FimsCrackdownDTO.Info selectCrackdown(final T t); - // RtDTO.Reglt selectRtReglt(final T t); - FimsCrackdownDTO.Ctzn selectCtznStmtInfo(final FimsCrackdownDTO.Request reqDTO); - - String selectRegltSts(final String crdnId); - void updateRtReglt(final FimsCrackdownDTO.Info dto); - void updateProcessStsAndProcessDtRtReglt(final FimsCrackdownDTO.Info dto); - void saveEcCtznSttemntAnswer(final CtznStmtDTO.Ans dto); - CtznStmtDTO.Ans selectEcCtznSttemntAnswer(final String interfaceSeqN); - - CmmAnsTmplDTO.Dtl selectCtznAnswerTmplInfo(final FimsCrackdownDTO.AnsRequest dto); - List selectProcessSttusChangeHist(final FimsCrackdownDTO.AnsRequest dto); - List selectRtpyrAdresHist(final FimsCrackdownDTO.AnsRequest dto); - List selectElctrnNticSndng(final FimsCrackdownDTO.AnsRequest dto); - List selectCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto); - - void insertCtznSttemntCmplt(FimsCrackdownDTO.CtznSttemntCmplt dto); - - int selectCrackdownVhrnoCnt(final String vhrno); - NtriDTO.CrackdownPhotoLayout selectCrackdownPhotoLayout(T t); -} diff --git a/src/main/java/cokr/xit/fims/biz/cmm/service/FimsCrackdownMgtService.java b/src/main/java/cokr/xit/fims/biz/cmm/service/FimsCrackdownMgtService.java deleted file mode 100644 index cb82ff54..00000000 --- a/src/main/java/cokr/xit/fims/biz/cmm/service/FimsCrackdownMgtService.java +++ /dev/null @@ -1,46 +0,0 @@ -package cokr.xit.fims.biz.cmm.service; - -import java.util.List; -import java.util.Map; - -import org.apache.ibatis.session.RowBounds; - -import cokr.xit.fims.biz.cmm.FimsCrackdownDTO; -import cokr.xit.fims.biz.cmm.NtriDTO; -import cokr.xit.fims.biz.ec.CtznStmtDTO; -import cokr.xit.fims.biz.rt.RtDTO; -import cokr.xit.fims.framework.biz.cmm.CmmAnsTmplDTO; -import cokr.xit.fims.framework.biz.cmm.XitLoginVO; -import cokr.xit.fims.framework.core.utils.XitCmmnUtil; - -public interface FimsCrackdownMgtService { - List findCrackdownInfos(final Map paraMap, final RowBounds pagingInfo); - Map findCrackdownInfo(final FimsCrackdownDTO.Request dto); - - void saveImposeTgt(final FimsCrackdownDTO.SaveRequest saveDTO); - void saveEnlight(final FimsCrackdownDTO.SaveRequest saveDTO); - void saveDisallow(final FimsCrackdownDTO.SaveRequest saveDTO); - - - CmmAnsTmplDTO.Dtl findCtznAnswerTmplInfo(final FimsCrackdownDTO.AnsRequest dto); - CtznStmtDTO.Ans findCtznStmtAnswer(final FimsCrackdownDTO.AnsRequest dto); - List findProcessSttusChangeHist(final FimsCrackdownDTO.AnsRequest dto); - List findRtpyrAdresHist(final FimsCrackdownDTO.AnsRequest dto); - List findElctrnNticSndng(final FimsCrackdownDTO.AnsRequest dto); - List findCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto); - void addCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto); - - void modifyCtznStmtAnswer(final CtznStmtDTO.Ans dto); - String addCtznStmtAnswer(final String interfaceSeqN); - void addCtznStmtAnswers(final List interfaceSeqList); - - - int findCrackdownVhrnoCnt(final String vhrno); - - Map sendCrackdownPhotoToNtri(final List dtoList); - - default XitLoginVO getUserInfo(){ - return XitCmmnUtil.getUserInfo(); - } - -} diff --git a/src/main/java/cokr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java b/src/main/java/cokr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java deleted file mode 100644 index abf84f22..00000000 --- a/src/main/java/cokr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java +++ /dev/null @@ -1,466 +0,0 @@ -package cokr.xit.fims.biz.cmm.service.bean; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.concurrent.atomic.AtomicInteger; - -import cokr.xit.foundation.component.AbstractServiceBean; -import cokr.xit.fims.biz.cmm.service.FimsCrackdownMgtService; -import cokr.xit.fims.biz.ec.util.NextGenInterfaceUtils; -import cokr.xit.fims.framework.biz.cmm.service.XitFrameCodeService; -import org.apache.commons.io.FileUtils; -import org.apache.ibatis.session.RowBounds; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import cokr.xit.fims.biz.FimsConst; -import cokr.xit.fims.biz.cmm.NtriDTO; -import cokr.xit.fims.biz.cmm.dao.FimsCrackdownMgtMapper; -import cokr.xit.fims.biz.cmm.FimsCrackdownDTO; -import cokr.xit.fims.biz.ec.dao.EcCtznSttemntMapper; -import cokr.xit.fims.biz.ec.CtznStmtAnsSendDTO; -import cokr.xit.fims.biz.ec.CtznStmtDTO; -import cokr.xit.fims.biz.rt.dao.RtCrackdownMgtMapper; -import cokr.xit.fims.biz.rt.RtDTO; -import cokr.xit.fims.biz.utils.FimsBizUtils; -import cokr.xit.fims.framework.biz.cmm.CmmAnsTmplDTO; -import cokr.xit.fims.framework.biz.cmm.CmmFileDTO; -import cokr.xit.fims.framework.biz.cmm.service.CmmFileService; -import cokr.xit.fims.framework.biz.util.ExtnlInterfaceUtils; -import cokr.xit.fims.framework.support.exception.BizRuntimeException; -import cokr.xit.fims.framework.support.util.Checks; -import cokr.xit.fims.framework.support.util.constants.MessageKey; -import cokr.xit.fims.framework.support.util.xml.XmlParseUtils; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -import javax.annotation.Resource; - -@Slf4j -@RequiredArgsConstructor -@Service -public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements FimsCrackdownMgtService { - - private String uploadResPath = "/data/fims/extnl/rcv"; - - private String uploadRootPath ="/data/fims/upload"; - - - private String sendFilePath = "/data/fims/SND"; - - - private String uploadTempPath = "/temp"; - @Resource(name = "xitFrameCodeService") - private XitFrameCodeService xitFrameCodeService; - - private final FimsCrackdownMgtMapper mapper; - private final RtCrackdownMgtMapper rtCrackdownMgtMapper; - private final EcCtznSttemntMapper ecCtznSttemntMapper; - private final CmmFileService cmmFileService; - - @Override - @Transactional(readOnly = true) - public List findCrackdownInfos(final Map paraMap, final RowBounds rowBounds){ - return mapper.selectCrackdowns(paraMap, rowBounds); - } - - @Override - @Transactional(readOnly = true) - public Map findCrackdownInfo(FimsCrackdownDTO.Request reqDTO) { - Map rtnMap = new HashMap<>(); - - // 단속구분코드 : 01-고정형CCTV, 02-주행형CCTV, 07-버스장착형CCTV, 09-시민신고(국민신문고) - FimsCrackdownDTO.Info infoDTO = new FimsCrackdownDTO.Info(); - RtDTO.Rtpyr rtpyrDTO = new RtDTO.Rtpyr(); - FimsCrackdownDTO.Ctzn ctznDTO = new FimsCrackdownDTO.Ctzn(); - - if(Checks.isNotEmpty(reqDTO.getCrdnId())){ - infoDTO = mapper.selectCrackdown(reqDTO); - if(Checks.isNotEmpty(infoDTO.getRtpyrId())){ - rtpyrDTO = rtCrackdownMgtMapper.selectRtRtpyr(infoDTO.getRtpyrId()); - } - if(Objects.equals(reqDTO.getCrdnSeCd(), FimsConst.CrdnSeCd.CITIZEN.getCode())){ - ctznDTO = mapper.selectCtznStmtInfo(reqDTO); - } - } - rtnMap.put("infoDTO", infoDTO); - rtnMap.put("rtpyrDTO", rtpyrDTO); - rtnMap.put("ctznDTO", ctznDTO); - return rtnMap; - } - - @Override - @Transactional - public void saveImposeTgt(final FimsCrackdownDTO.SaveRequest saveDTO) { - FimsCrackdownDTO.Info infoDTO = saveDTO.getInfoDTO(); - FimsCrackdownDTO.Ctzn ctznDTO = saveDTO.getCtznDTO(); - RtDTO.Rtpyr rtpyrDTO = saveDTO.getRtpyrDTO(); - - // 1. 납부자 정보 등록 및 변경 - if (Checks.isEmpty(rtpyrDTO.getRtpyrId())) { - rtpyrDTO.setRgtr(getUserInfo().getUniqId()); - rtCrackdownMgtMapper.insertRtRtpyr(rtpyrDTO); - } else { - rtpyrDTO.setMdfr(getUserInfo().getUniqId()); - rtCrackdownMgtMapper.updateRtRtpyr(rtpyrDTO); - } - - // 2. 단속 테이블 정보 반영 - 처리상태, 시구군, 법정동, 특기사항, 특기사항코드, 위반코드, 차량명, 차대번호 - // 진행상태 - 부과대상 - //시군구 추가 - //면제차량 여부 추가 : $('input:checkbox[name=sysSeCd]:checked').val() - infoDTO.setRtpyrId(rtpyrDTO.getRtpyrId()); - infoDTO.setCrdnSttsCd(FimsConst.CrdnSttsCd.CRACKDOWN.getCode()); - infoDTO.setMdfr(getUserInfo().getUniqId()); - - // 단속 상태 변경 여부 - 이력테이블 - boolean isStsChange = !Objects.equals(infoDTO.getCrdnSttsCd(), mapper.selectRegltSts(infoDTO.getCrdnId())); - mapper.updateRtReglt(infoDTO); - - // 이력테이블 - if(isStsChange){ - rtCrackdownMgtMapper.insertRtProcessSttsChangeHist( - RtDTO.SttusChangeHist.builder() - .crdnId(infoDTO.getCrdnId()) - .crdnSttsCd(infoDTO.getCrdnSttsCd()) - .rgtr(getUserInfo().getUniqId()) - .build() - ); - } - - - // 2. 외부연계정보 반영 : - if(!FimsConst.CrdnSeCd.CITIZEN.getCode().equals(saveDTO.getCrdnSeCd()) - && Checks.isNotEmpty(saveDTO.getFileLinkId())){ - - - return; - } - - // 시민신고인 경우 - if(FimsConst.CrdnSeCd.CITIZEN.getCode().equals(saveDTO.getCrdnSeCd()) - && Checks.isNotEmpty(saveDTO.getInterfaceSeqN()) ) { - - updateCtznAndAnswer(saveDTO, infoDTO, FimsConst.CtznStmtDtlStsCode.ACCEPTANCE.getCode(), - FimsConst.AnswerSeCode.IMPOSE.getCode(), "01"); - } - - } - - @Override - @Transactional - public void saveEnlight(final FimsCrackdownDTO.SaveRequest saveDTO) { - FimsCrackdownDTO.Info infoDTO = saveDTO.getInfoDTO(); - FimsCrackdownDTO.Ctzn ctznDTO = saveDTO.getCtznDTO(); - RtDTO.Rtpyr rtpyrDTO = saveDTO.getRtpyrDTO(); - - // 1. 납부자 정보 등록 및 변경 - if (Checks.isEmpty(rtpyrDTO.getRtpyrId())) { - rtpyrDTO.setRgtr(getUserInfo().getUniqId()); - rtCrackdownMgtMapper.insertRtRtpyr(rtpyrDTO); - } else { - rtpyrDTO.setMdfr(getUserInfo().getUniqId()); - rtCrackdownMgtMapper.updateRtRtpyr(rtpyrDTO); - } - - // 2. 단속 테이블 정보 반영 - 처리상태, 시구군, 법정동, 특기사항, 특기사항코드, 위반코드, 차량명, 차대번호 - // 진행상태 - 부과대상 - //시군구 추가 - //면제차량 여부 추가 : $('input:checkbox[name=sysSeCd]:checked').val() - infoDTO.setRtpyrId(rtpyrDTO.getRtpyrId()); - infoDTO.setCrdnSttsCd(FimsConst.CrdnSttsCd.ENLIGHT.getCode());; - infoDTO.setMdfr(getUserInfo().getUniqId()); - - // 단속 상태 변경 여부 - 이력테이블 - boolean isStsChange = !Objects.equals(infoDTO.getCrdnSttsCd(), mapper.selectRegltSts(infoDTO.getCrdnId())); - mapper.updateRtReglt(infoDTO); - - // 이력테이블 - if(isStsChange){ - rtCrackdownMgtMapper.insertRtProcessSttsChangeHist( - RtDTO.SttusChangeHist.builder() - .crdnId(infoDTO.getCrdnId()) - .crdnSttsCd(infoDTO.getCrdnSttsCd()) - .rgtr(getUserInfo().getUniqId()) - .build() - ); - } - - // 2. 외부연계정보 반영 : - if(!FimsConst.CrdnSeCd.CITIZEN.getCode().equals(saveDTO.getCrdnSeCd()) - && Checks.isNotEmpty(saveDTO.getFileLinkId())){ - - - return; - } - - // 시민신고인 경우 - if(FimsConst.CrdnSeCd.CITIZEN.getCode().equals(saveDTO.getCrdnSeCd()) - && Checks.isNotEmpty(saveDTO.getInterfaceSeqN()) ) { - - updateCtznAndAnswer(saveDTO, infoDTO, FimsConst.CtznStmtDtlStsCode.ACCEPTANCE.getCode(), - FimsConst.AnswerSeCode.ENLIGHT.getCode(), infoDTO.getEnlightResnCode()); - } - - - } - - @Override - @Transactional - public void saveDisallow(final FimsCrackdownDTO.SaveRequest saveDTO) { - FimsCrackdownDTO.Info infoDTO = saveDTO.getInfoDTO(); - RtDTO.Erpp erppDTO = saveDTO.getErppDTO(); - - infoDTO.setCrdnSttsCd(FimsConst.CrdnSttsCd.DISALLOW.getCode()); - infoDTO.setMdfr(getUserInfo().getUniqId()); - - // 단속 상태 변경 여부 - 이력테이블 - boolean isStsChange = !Objects.equals(infoDTO.getCrdnSttsCd(), mapper.selectRegltSts(infoDTO.getCrdnId())); - mapper.updateProcessStsAndProcessDtRtReglt(infoDTO); - - // 이력테이블 - if(isStsChange){ - rtCrackdownMgtMapper.insertRtProcessSttsChangeHist( - RtDTO.SttusChangeHist.builder() - .crdnId(infoDTO.getCrdnId()) - .crdnSttsCd(infoDTO.getCrdnSttsCd()) - .rgtr(getUserInfo().getUniqId()) - .build() - ); - } - - erppDTO.setRgtr(getUserInfo().getUniqId()); - erppDTO.setSysSeCd(getUserInfo().getOrgId()); - erppDTO.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getNsttCd())); - rtCrackdownMgtMapper.insertRtErpp(erppDTO); - - // 시민신고인 경우 - if(FimsConst.CrdnSeCd.CITIZEN.getCode().equals(saveDTO.getCrdnSeCd()) - && Checks.isNotEmpty(saveDTO.getInterfaceSeqN())) { - - updateCtznAndAnswer(saveDTO, infoDTO, FimsConst.CtznStmtDtlStsCode.NON_ACCEPTABLE.getCode(), - FimsConst.AnswerSeCode.DISALLOW.getCode(), erppDTO.getLevyExclRsnCd()); - } - - } - - @Override - public CmmAnsTmplDTO.Dtl findCtznAnswerTmplInfo(final FimsCrackdownDTO.AnsRequest dto) { - // 부과인 경우 사유코드 기본값 - if(Objects.equals(dto.getAnswerSeCode(), FimsConst.AnswerSeCode.IMPOSE.getCode())) - dto.setResnCode("01"); - return mapper.selectCtznAnswerTmplInfo(dto); - } - - @Override - public CtznStmtDTO.Ans findCtznStmtAnswer(final FimsCrackdownDTO.AnsRequest dto) { - return ecCtznSttemntMapper.selectEcCtznSttemntAnswer(dto); - } - @Override - public List findProcessSttusChangeHist(final FimsCrackdownDTO.AnsRequest dto){ - return mapper.selectProcessSttusChangeHist(dto); - } - @Override - public List findRtpyrAdresHist(final FimsCrackdownDTO.AnsRequest dto){ - return mapper.selectRtpyrAdresHist(dto); - } - @Override - public List findElctrnNticSndng(final FimsCrackdownDTO.AnsRequest dto){ - return mapper.selectElctrnNticSndng(dto); - } - @Override - public List findCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto) { - return mapper.selectCtznSttemntCmplt(dto); - } - - @Override - public void addCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto) { - dto.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getNsttCd())); - dto.setRgtr(getUserInfo().getUniqId()); - mapper.insertCtznSttemntCmplt(dto); - } - - @Override - public void modifyCtznStmtAnswer(final CtznStmtDTO.Ans dto) { - ecCtznSttemntMapper.updatecvlcptPrcsRsltCnOfEcCtznSttemntAnswer(dto); - } - - @Override - public void addCtznStmtAnswers(List interfaceSeqList) { - interfaceSeqList.forEach(this::addCtznStmtAnswer); - } - - @Override - @Transactional - public String addCtznStmtAnswer(final String interfaceSeqN) { - // 답변 xml 파일 생성 - List fileDtlList = cmmFileService.findFilesByInfTypeAndInfKey( - CmmFileDTO.FileMst.builder() - .infType(FimsConst.FileInfType.NATL_NEWS_PAPER_RCV.getCode()) - .infKey(interfaceSeqN+"01") - .build()); - - String tgtPath = uploadResPath + fileDtlList.get(0).getFilePath(); - final String fileName = interfaceSeqN + ".xml"; - - CtznStmtDTO.Ans ansDTO = mapper.selectEcCtznSttemntAnswer(interfaceSeqN); - CtznStmtAnsSendDTO sendDto = CtznStmtDTO.Ans.getCtznStmtAnsDTO(ansDTO); - String xmlStr = XmlParseUtils.writeObjectToXml(sendDto, CtznStmtAnsSendDTO.class); - - byte[] bytes = xmlStr.getBytes(); - Path path = Paths.get(tgtPath + "/" + fileName); - - try { - // 대상폴더 미 존재시 생성 - File f = FileUtils.getFile(tgtPath); - if(!f.exists()) f.mkdirs(); - Files.write(path, bytes); - } catch (IOException e) { - String msg = "시민 신고 답변 파일 생성 오류"; - e.printStackTrace(); - log.error("{}", msg); - throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, msg); - } - - // 답변 테이블 update : cvlcpt_prcs_cmptn_dt - // - - // 시민신고 상태 - 답변완료 update - //ecCtznSttemntMapper.update(); - - return tgtPath + "/" + fileName; - } - - /** - * 
-     * 시민신고 상태 변경
-     * 1. 시민신고 상세 상태 변경
-     * 2. 시민신고상세의 모든 상태가 수용 또는 미수용인 경우
-     * 2-1. 시민신고 마스터 상태 답변 가능 상태로 변경
-     * 2-2. 시민신고 답변 데이타 생성
-     * @param saveDTO
-     * @param infoDTO
-     * @param ctznSttemntDetailStatusCode 시민신고 상세 진행 상태 코드
-     * @param answerSeCode 답변 구분 코드
-     * @param resnCode 사유코드
-     *
- */ - @Transactional - public void updateCtznAndAnswer(FimsCrackdownDTO.SaveRequest saveDTO, FimsCrackdownDTO.Info infoDTO, final String ctznSttemntDetailStatusCode, final String answerSeCode, final String resnCode) { - // 1. 시민신고 상세 상태 변경 - CtznStmtDTO.Request ctznRequest = getCtznRequestDTO(saveDTO); - - - - // 2. 시민신고상세의 모든 상태가 수용 또는 미수용인 경우 - //if(mapper.selectPossiblecheckAns(infoDTO.getInterfaceSeqN()) == 0){ - - // 2-1. 시민신고 마스터 상태 답변 가능 상태로 변경 - //mapper.update(ctznRequest); - - // 2-2. 시민신고 답변 데이타 생성 - // GET 답변 템플릿 - FimsCrackdownDTO.AnsRequest ansReqDTO = new FimsCrackdownDTO.AnsRequest(); - ansReqDTO.setTmplatId(FimsConst.TmplatId.CTZN.getCode()); - ansReqDTO.setAnswerSeCode(answerSeCode); - ansReqDTO.setResnCode(resnCode); - ansReqDTO.setVhrno(infoDTO.getVhrno()); - - - String ansTxt = getAnswerText(mapper.selectCtznAnswerTmplInfo(ansReqDTO)); - CtznStmtDTO.Ans ansDTO = CtznStmtDTO.Ans.builder() - .sggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getNsttCd())) - .sysSeCd(getUserInfo().getOrgId()) - .interfaceSeqN(saveDTO.getInterfaceSeqN()) - .cvlcptPrcsRsltCn(ansTxt) - .rgtr(getUserInfo().getUniqId()) - .build(); - mapper.saveEcCtznSttemntAnswer(ansDTO); - //} - } - - public int findCrackdownVhrnoCnt(final String vhrno){ - return mapper.selectCrackdownVhrnoCnt(vhrno); - } - - /** - * 
-     * 주정차/전용차로 과태료 위반 단속 사진 전
-     * FIMS -> 차세대 세외수입 연계 (file to file)
-     * 위반정보와 단속 사진을 zip 파일로 압축 하여 전송
-     * @param dtoList List
-     * @return Map successCnt - 성공건수, errorList - 에러목록
-     *
- */ - @Override - public Map sendCrackdownPhotoToNtri(List dtoList) { - AtomicInteger sucessCnt = new AtomicInteger(0); - List errorList = new ArrayList<>(); - - dtoList.forEach(param -> { - NtriDTO.CrackdownPhotoLayout layoutDto = mapper.selectCrackdownPhotoLayout(param); - - List fileDtlList = cmmFileService.findFilesByInfTypeAndInfKey( - CmmFileDTO.FileMst.builder() - .infType(FimsBizUtils.getFileInfType(param.getCrdnSeCd())) - .infKey(param.getExtnlInterfaceId()) - .build()); - - NtriDTO.PhotoFileError errDTO = NextGenInterfaceUtils.makeNtriInterfacePhotoZip( - param, - layoutDto, - fileDtlList, - FimsBizUtils.getSendNtriPhotoInterfaceFileName(param.getCrdnSeCd()), - uploadRootPath, - sendFilePath, - uploadTempPath - ); - - // TODO :: 성공시 상태 변경 필요 - 시점은?? ESB 연계 성공시 해야 하는지 결정 필요 - // TODO :: ESB 연계 성공시 해야 한다면 체크 포인트 필요 -> 배치로 처리 해야 될 듯 - if(errDTO == null){ - sucessCnt.getAndIncrement(); - }else{ - errorList.add(errDTO); - } - }); - Map rsltMap = new HashMap<>(); - rsltMap.put("successCnt", sucessCnt.get()); - rsltMap.put("errorList", errorList); - return rsltMap; - } - - - - - - - - - private CtznStmtDTO.Request getCtznRequestDTO(final FimsCrackdownDTO.SaveRequest saveDTO){ - return CtznStmtDTO.Request - .builder() - .mdfr(getUserInfo().getUniqId()) - .interfaceSeqN(saveDTO.getInterfaceSeqN()) - .build(); - } - - private String getAnswerText(CmmAnsTmplDTO.Dtl dto){ - return Optional.of(dto) - .map(o -> (Checks.isNotEmpty(o.getPrface())? o.getPrface() : "") - + (Checks.isNotEmpty(o.getAnswerCn())? o.getAnswerCn() : "") - + (Checks.isNotEmpty(o.getTlface())? o.getTlface(): "")) - .orElseGet(() -> ""); - } - -} diff --git a/src/main/java/cokr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java b/src/main/java/cokr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java deleted file mode 100644 index ccd17b66..00000000 --- a/src/main/java/cokr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java +++ /dev/null @@ -1,293 +0,0 @@ -package cokr.xit.fims.biz.cmm.web; - -import java.util.List; -import java.util.Map; -import java.util.Objects; - -import cokr.xit.foundation.web.AbstractController; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.ModelAndView; - -import cokr.xit.fims.biz.FimsConst; -import cokr.xit.fims.biz.cmm.FimsCrackdownDTO; -import cokr.xit.fims.biz.cmm.NtriDTO; -import cokr.xit.fims.biz.cmm.service.FimsCrackdownMgtService; -import cokr.xit.fims.biz.ec.CtznStmtDTO; -import cokr.xit.fims.biz.rt.RtDTO; -import cokr.xit.fims.biz.rt.service.RtCrackdownMgtService; -import cokr.xit.fims.biz.utils.FimsBizUtils; -import cokr.xit.fims.framework.biz.cmm.service.CmmFileService; -import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.support.mybatis.MybatisUtils; -import cokr.xit.fims.framework.support.util.AjaxMessageMapRenderer; -import cokr.xit.fims.framework.support.util.constants.MessageKey; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -/** - * - */ -@Slf4j -@RequiredArgsConstructor -@Controller -@RequestMapping(name = "", value = "/fims/{biz}/cmm") -public class FimsCrackDownMgtController extends AbstractController { - - private String fileRcvRoot = "/data/fims/extnl/rcv"; - - private String rcvBusinstallCctvPath = "/businstall"; - - private String rcvNatlNewspaperPath ="/natl-newspaper"; - - private String extnlCarUrl = "http://211.119.124.9:18090"; - - private final FimsCrackdownMgtService service; - private final RtCrackdownMgtService rtService; - private final CmmFileService cmmFileService; - - - @RequestMapping(name = "", value = "/cmmFimsCrackdownEditPopup") - public ModelAndView cmmFimsCrackdownEditPopup(final FimsCrackdownDTO.Request dto){ - - ModelAndView mav = new ModelAndView(); - - mav.addObject("extnlCarUrl", extnlCarUrl); - mav.addObject("param", dto); - - if(Objects.equals(FimsConst.CrdnSttsCd.CRACKDOWN_INIT.getCode(), dto.getCrdnSttsCd())) { - mav.addObject("pageTitle", "초기자료 편집"); - }else if(Objects.equals(FimsConst.CrdnSttsCd.CRACKDOWN.getCode(), dto.getCrdnSttsCd())) { - mav.addObject("pageTitle", "과태료 시스템 등록"); - } - FimsConst.CrdnSeCd crdnSeCdEnum = null; - if(dto.getCrdnSeCd() != null && !dto.getCrdnSeCd().equals("")){ - for (FimsConst.CrdnSeCd e : FimsConst.CrdnSeCd.values()) { - if (e.getCode().equals(dto.getCrdnSeCd())) { - crdnSeCdEnum = e; - break; - } - } - } else { - crdnSeCdEnum = FimsConst.CrdnSeCd.UNKNOWN; - } - - mav.addObject("txtTitle", Objects.requireNonNull(crdnSeCdEnum, "초기자료 편집").getDesc()); - mav.setViewName(FimsConst.FIMS_JSP_BASE_PATH + "cmm/cmmFimsCrackdownEditPopup.popup"); - - return mav; - } - - @RequestMapping(name = "", value = "/cmmFimsCrackdownTotMgtPopup") - public ModelAndView cmmFimsCrackdownTotMgtPopup(final FimsCrackdownDTO.Request dto){ - ModelAndView mav = new ModelAndView(); - - mav.addObject("param", dto); - mav.addObject("pageTitle", "개별총정보 "); - mav.setViewName(FimsConst.FIMS_JSP_BASE_PATH + "cmm/cmmFimsCrackdownTotMgtPopup.popup"); - return mav; - } - - @RequestMapping(name = "", value = "/cmmCrackdownRcvFilePopup") - public ModelAndView cmmCrackdownRcvFilePopup(){ - ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"cmm/cmmCrackdownRcvFilePopup.popup"); - mav.addObject("busInstallDirPath", fileRcvRoot + rcvBusinstallCctvPath); - mav.addObject("ctznDirPath", fileRcvRoot + rcvNatlNewspaperPath); - return mav; - } - - @RequestMapping(name = "", value = "/cmmEnlightDisallowPopup") - public ModelAndView cmmEnlightDisallowPopup(final String bizDiv){ - ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"cmm/cmmEnlightDisallowPopup.popup"); - - mav.addObject("pageTitle", "서손 / 계도 처리"); - mav.addObject("bizDiv", bizDiv); - if(bizDiv.equals(FimsConst.PopupWorkDiv.ENLIGHT.getCode())) { - mav.addObject("txtTitle", FimsConst.PopupWorkDiv.ENLIGHT.getDesc()); - }else { - mav.addObject("txtTitle", FimsConst.PopupWorkDiv.DISALLOW.getDesc()); - } - return mav; - } - - @RequestMapping(name = "", value = "/cmmImposePopup") - public ModelAndView cmmImposePopup(final String bizDiv){ - ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"cmm/cmmImposePopup.popup"); - mav.addObject("pageTitle", "과태료 시스템 등록"); - - mav.addObject("txtTitle", "과태료 시스템 등록"); - return mav; - } - - @RequestMapping(name = "", value = "/cmmCtznAnswerPreviewPopup") - public ModelAndView cmmCtznAnswerPreviewPopup(final FimsCrackdownDTO.AnsRequest dto){ - ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"cmm/cmmCtznAnswerPreviewPopup.popup"); - - mav.addObject("pageTitle", "답변내용미리보기"); - mav.addObject("param", dto); - mav.addObject("txtTitle", "답변 내용"); - return mav; - } - - @RequestMapping(name = "", value = "/cmmCtznComplaintHistPopup") - public ModelAndView cmmCtznComplaintHistPopup(final FimsCrackdownDTO.CtznCmpltRequest dto){ - ModelAndView mav = new ModelAndView(); - - mav.addObject("param", dto); - mav.addObject("pageTitle", "민원 이력 "); - mav.setViewName(FimsConst.FIMS_JSP_BASE_PATH + "cmm/cmmCtznComplaintHistPopup.popup"); - return mav; - } - - @RequestMapping(name = "", value = "/cmmCarCrackdownCntPopup") - public ModelAndView cmmCarCrackdownCntPopup(final RtDTO.Request dto){ - ModelAndView mav = new ModelAndView(); - - mav.addObject("param", dto); - mav.addObject("pageTitle", "차량 단속건 조회"); - mav.setViewName(FimsConst.FIMS_JSP_BASE_PATH + "cmm/cmmCarCrackdownCntPopup.popup"); - return mav; - } - - @RequestMapping(name = "", value = "/findCrackdownInfos") - public ModelAndView findCrackdownInfos(@RequestParam final Map paraMap) { - - return new ModelAndView("jsonView").addObject("result",service.findCrackdownInfos(paraMap, MybatisUtils.getPagingInfo(paraMap))); - } - - - @RequestMapping(name = "", value = "/findCrackdownInfoAndAttchFiles") - public ModelAndView findCrackdownInfoAndAttchFiles(final FimsCrackdownDTO.Request dto) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - Map dtlData = service.findCrackdownInfo(dto); - mav.addAllObjects(dtlData); - mav.addObject("attchFiles", null); - //mav.addObject("attchFiles", rtService.findRtRegltAttchFiles(dto)); - return mav; - } - - @RequestMapping(name = "", value = "/findRcvPathFiles") - public ModelAndView findRcvPathFiles(final String dirPath){ - return new ModelAndView("jsonView").addObject("result",FimsBizUtils.getRcvPathFiles(dirPath)); - } - - /** - * 부과대상 저장 - * @param saveDTO - * @return - */ - @PostMapping(name = "", value="/saveImposeTgt") - public ModelAndView saveImposeTgt(@RequestBody FimsCrackdownDTO.SaveRequest saveDTO){ - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - service.saveImposeTgt(saveDTO); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); - - return mav; - } - - @PostMapping(name = "", value="/saveEnlight") - public ModelAndView saveEnlight(@RequestBody FimsCrackdownDTO.SaveRequest saveDTO){ - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - service.saveEnlight(saveDTO); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); - - return mav; - } - - @PostMapping(name = "", value="/saveDisallow") - public ModelAndView saveDisallow(@RequestBody FimsCrackdownDTO.SaveRequest saveDTO){ - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - service.saveDisallow(saveDTO); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); - - return mav; - } - - @RequestMapping(name = "", value = "/findCtznStmtAnswer") - public ModelAndView findCtznStmtAnswer(final FimsCrackdownDTO.AnsRequest dto){ - return new ModelAndView("jsonView").addObject("result",service.findCtznStmtAnswer(dto)); - } - - @PostMapping(name = "", value = "/modifyCtznStmtAnswer") - public ModelAndView modifyCtznStmtAnswer(final CtznStmtDTO.Ans dto){ - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - service.modifyCtznStmtAnswer(dto); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_UPDATE_SUCCESS); - return mav; - } - - @RequestMapping(name = "", value = "/addCtznStmtAnswer") - public ModelAndView addCtznStmtAnswer(final String interfaceSeqN) { - return new ModelAndView("jsonView").addObject("result",service.addCtznStmtAnswer(interfaceSeqN)); - } - - @RequestMapping(name = "", value = "/addCtznStmtAnswers") - public ModelAndView addCtznStmtAnswers(@RequestBody final List interfaceSeqList) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - service.addCtznStmtAnswers(interfaceSeqList); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_SUCCESS); - return mav; - } - - @RequestMapping(name = "", value = "/findCtznAnswerTmplInfo") - public ModelAndView findCtznAnswerTmplInfo(final FimsCrackdownDTO.AnsRequest dto){ - return new ModelAndView("jsonView").addObject("result",service.findCtznAnswerTmplInfo(dto)); - } - - @RequestMapping(name = "", value = "/findProcessSttusChangeHist") - public ModelAndView findProcessSttusChangeHist(final FimsCrackdownDTO.AnsRequest dto){ - return new ModelAndView("jsonView").addObject("result",service.findProcessSttusChangeHist(dto)); - } - - @RequestMapping(name = "", value = "/findRtpyrAdresHist") - public ModelAndView findRtpyrAdresHist(final FimsCrackdownDTO.AnsRequest dto){ - return new ModelAndView("jsonView").addObject("result",service.findRtpyrAdresHist(dto)); - } - - @RequestMapping(name = "", value = "/findElctrnNticSndng") - public ModelAndView findElctrnNticSndng(final FimsCrackdownDTO.AnsRequest dto){ - return new ModelAndView("jsonView").addObject("result",service.findElctrnNticSndng(dto)); - } - - @RequestMapping(name = "", value = "/findCtznSttemntCmplt") - public ModelAndView findCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto){ - return new ModelAndView("jsonView").addObject("result",service.findCtznSttemntCmplt(dto)); - } - - @RequestMapping(name = "", value = "/addCtznSttemntCmplt") - public ModelAndView addCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - service.addCtznSttemntCmplt(dto); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_SUCCESS); - return mav; - } - - @RequestMapping(name = "", value = "/findCrackdownVhrnoCnt") - public ModelAndView findCrackdownVhrnoCnt(final String vhrno){ - return new ModelAndView("jsonView").addObject("result",service.findCrackdownVhrnoCnt(vhrno)); - } - - /** - * 
-     * 주정차/전용차로 과태료 위반 단속 사진 전
-     * FIMS -> 차세대 세외수입 연계 (file to file)
-     * 위반정보와 단속 사진을 zip 파일로 압축 하여 전송
-     * @param dtoList List
-     * @return
-     *
- */ - @RequestMapping(name = "", value = "/sendCrackdownPhotoToNtri") - public ModelAndView sendCrackdownPhotoToNtri(@RequestBody final List dtoList){ - return new ModelAndView("jsonView").addObject("result",service.sendCrackdownPhotoToNtri(dtoList)); - } - -} diff --git a/src/main/java/cokr/xit/fims/biz/ec/dao/EcCctvCrackdownMapper.java b/src/main/java/cokr/xit/fims/biz/ec/dao/EcCctvCrackdownMapper.java deleted file mode 100644 index cdc07a9b..00000000 --- a/src/main/java/cokr/xit/fims/biz/ec/dao/EcCctvCrackdownMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package cokr.xit.fims.biz.ec.dao; - -import java.util.List; -import java.util.Map; - -import org.apache.ibatis.session.RowBounds; - -import org.egovframe.rte.psl.dataaccess.mapper.Mapper; -import cokr.xit.fims.biz.ec.CctvCrackdownDTO; - -@Mapper -public interface EcCctvCrackdownMapper { - List selectEcExtrlRegltCntcs(final Map paraMap, final RowBounds rowBounds); - CctvCrackdownDTO.ExtrlRegltCntc selectEcExtrlRegltCntc(final T t); - int insertEcExtrlRegltCntc(final CctvCrackdownDTO.ExtrlRegltCntc dto); - void updateEcExtrlRegltCntc(final CctvCrackdownDTO.ExtrlRegltCntc dto); - - //----------------------------------------------------- - // 단속자료 생성 - 단속 처리 - //----------------------------------------------------- - void insertRtRegltFromEcExtrRegltCntc(final T t); - //----------------------------------------------------- - // 단속자료 생성 - 서손 처리 - //----------------------------------------------------- - void insertRtErppFromEcExtrRegltCntc(final CctvCrackdownDTO.Request dto); - - void updateStatusAndCrdnIdOfEcExtrRegltCntc(final CctvCrackdownDTO.Request dto); - -} diff --git a/src/main/java/cokr/xit/fims/biz/ec/dao/EcCtznSttemntMapper.java b/src/main/java/cokr/xit/fims/biz/ec/dao/EcCtznSttemntMapper.java deleted file mode 100644 index e2e25d4c..00000000 --- a/src/main/java/cokr/xit/fims/biz/ec/dao/EcCtznSttemntMapper.java +++ /dev/null @@ -1,55 +0,0 @@ -package cokr.xit.fims.biz.ec.dao; - -import java.util.List; -import java.util.Map; - -import cokr.xit.fims.biz.FimsConst; -import cokr.xit.fims.biz.cmm.FimsCrackdownDTO; -import org.apache.ibatis.session.RowBounds; - -import org.egovframe.rte.psl.dataaccess.mapper.Mapper; -import cokr.xit.fims.biz.ec.CtznStmtDTO; -import cokr.xit.fims.framework.biz.cmm.CmmFileDTO; - -@Mapper -public interface EcCtznSttemntMapper { - List selectEcCtznSttemnts(final Map paraMap, final RowBounds rowBounds); - CtznStmtDTO.Mst selectEcCtznSttemnt(final CtznStmtDTO.Request dto); - List selectEcCtznSttemntDetails(final CtznStmtDTO.Request dto); - CtznStmtDTO.Dtl selectEcCtznSttemntDetail(final CtznStmtDTO.Request dto); - - int insertEcCtznSttemnt(final CtznStmtDTO.Mst dto); - - int deleteEcCtznSttemnt(final CtznStmtDTO.Dtl dtl); - - - List selectCtznSttemnts(final Map paraMap, final RowBounds rowBounds); - - - //----------------------------------------------------- - // 단속자료 생성 - 단속 처리 - //----------------------------------------------------- - void insertRtRegltFromCtznStmt(final FimsCrackdownDTO.Request dto); - //----------------------------------------------------- - // 단속자료 생성 - 서손 처리 - //----------------------------------------------------- - void insertRtErppFromCtznStmt(final CtznStmtDTO.Request dto); - - CtznStmtDTO.Ans selectCreateEcCtznSttemntAnswer(final CtznStmtDTO.Request dto); - CtznStmtDTO.Ans selectEcCtznSttemntAnswer(final T t); - - - - void saveEcCtznSttemntAnswer(final CtznStmtDTO.Ans dto); - void updatecvlcptPrcsRsltCnOfEcCtznSttemntAnswer(final CtznStmtDTO.Ans dto); - - - int dragAndDropSaveImg(final CmmFileDTO.FileDtl vo); - - int dragAndDropDeleteImg(final CmmFileDTO.FileDtl vo); - - - List dragAndDropIsExists(final CmmFileDTO.FileDtl vo); - - -} diff --git a/src/main/java/cokr/xit/fims/biz/ec/dao/EcNatlNewspaperMapper.java b/src/main/java/cokr/xit/fims/biz/ec/dao/EcNatlNewspaperMapper.java deleted file mode 100644 index 9d82c155..00000000 --- a/src/main/java/cokr/xit/fims/biz/ec/dao/EcNatlNewspaperMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package cokr.xit.fims.biz.ec.dao; - -import java.util.List; -import java.util.Map; - -import org.apache.ibatis.session.RowBounds; - -import org.egovframe.rte.psl.dataaccess.mapper.Mapper; -import cokr.xit.fims.biz.ec.NatlNewspaperRcvDTO; -import cokr.xit.fims.biz.ec.NatlNewspaperRcvXmlDTO; - -@Mapper -public interface EcNatlNewspaperMapper { - List selectEsbInterfaces(Map paraMap, RowBounds rowBounds); - NatlNewspaperRcvDTO selectEsbInterface(final String interfaceSeqN); - - int insertEsbInterface(final NatlNewspaperRcvXmlDTO dto); - - int insertEsbInterfaceFile(final NatlNewspaperRcvXmlDTO dto); - - -} diff --git a/src/main/java/cokr/xit/fims/biz/ec/web/EcCctvCrackdownController.java b/src/main/java/cokr/xit/fims/biz/ec/web/EcCctvCrackdownController.java deleted file mode 100644 index 6866ede8..00000000 --- a/src/main/java/cokr/xit/fims/biz/ec/web/EcCctvCrackdownController.java +++ /dev/null @@ -1,160 +0,0 @@ -package cokr.xit.fims.biz.ec.web; - -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - -import cokr.xit.foundation.web.AbstractController; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.ModelAndView; - -import cokr.xit.fims.biz.FimsConst; -import cokr.xit.fims.biz.ec.CctvCrackdownDTO; -import cokr.xit.fims.biz.ec.FolderReqDTO; -import cokr.xit.fims.biz.ec.service.EcCctvCrackdownService; -import cokr.xit.fims.biz.utils.FimsBizUtils; -import cokr.xit.fims.framework.biz.cmm.CmmFileDTO; -import cokr.xit.fims.framework.biz.cmm.service.CmmFileService; -import cokr.xit.fims.framework.core.constants.FrameworkConstants; - -import cokr.xit.fims.framework.support.mybatis.MybatisUtils; -import cokr.xit.fims.framework.support.util.AjaxMessageMapRenderer; -import cokr.xit.fims.framework.support.util.constants.MessageKey; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -@RequiredArgsConstructor -@Controller -@RequestMapping(name = "", value = "/fims/{biz}/ec") -public class EcCctvCrackdownController extends AbstractController { - - - - - private final EcCctvCrackdownService service; - private final CmmFileService fileService; - - - - - @GetMapping(name = "", value = "/findExtrlRegltCntcs") - public ModelAndView findExtrlRegltCntcs(@RequestParam final Map paraMap) { - return new ModelAndView("jsonView").addObject("result",service.findExtrlRegltCntcs(paraMap, MybatisUtils.getPagingInfo(paraMap))); - } - - @RequestMapping(name = "", value = "/findExtrlRegltCntcAndAttchFiles") - public ModelAndView findExtrlRegltCntcAndAttchFiles(final CctvCrackdownDTO.Request dto) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - mav.addObject("extrDTO", service.findExtrlRegltCntc(dto)); - mav.addObject("attchFiles", fileService.findFilesByInfTypeAndInfKey( - CmmFileDTO.FileMst.builder() - .infType(FimsBizUtils.getFileInfType(dto.getCrdnSeCd())) - .infKey(dto.getFileLinkId()) - .build())); - return mav; - } - - @RequestMapping(name = "", value = "/findExtrlRegltCntc") - public ModelAndView findExtrlRegltCntc(final CctvCrackdownDTO.Request dto) { - return new ModelAndView("jsonView").addObject("result", service.findExtrlRegltCntc(dto)); - } - - @PostMapping(name = "", value = "/saveCctvCrackdownDatas") - public ModelAndView saveCctvCrackdownDatas(final CctvCrackdownDTO.Request dto) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - service.saveCctvCrackdownDatas(dto); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_SUCCESS); - return mav; - } - - @PostMapping(name = "", value = "/saveBusCctvCrackdownDatas") - public ModelAndView saveBusCctvCrackdownDatas(@RequestBody final FolderReqDTO dto) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - service.saveBusCctvCrackdownDatas(dto); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_SUCCESS); - return mav; - } - - @PostMapping(name = "", value = "/modifyExtrlRegltCntc") - public ModelAndView modifyExtrlRegltCntc(final CctvCrackdownDTO.ExtrlRegltCntc dto) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - service.modifyExtrlRegltCntc(dto); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_UPDATE_SUCCESS); - return mav; - } - - /** - * 단속자료 생성 - * @param dto CctvCrackdownDTO.Request - * @return - */ - @PostMapping(name = "", value = "/saveExtrRtReglt") - public ModelAndView saveExtrRtReglt(final CctvCrackdownDTO.Request dto) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - service.saveRtReglt(dto); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); - return mav; - } - - /** - * 서손 자료 생성 - * @param dto CctvCrackdownDTO.Request - * @return - */ - @PostMapping(name = "", value = "/saveExtrRtErpp") - public ModelAndView saveExtrRtErpp(final CctvCrackdownDTO.Request dto) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - service.saveRtErpp(dto); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); - return mav; - } - - /** - * @see cokr.xit.fims.biz.cmm.web.FimsCrackDownMgtController#findRcvPathFiles(String) - * @param dirPath - * @return - */ - @Deprecated - @RequestMapping(name = "", value = "/findBusCctvCrackdownFiles") - public ModelAndView findBusCctvCrackdownFiles(final String dirPath){ - return new ModelAndView("jsonView").addObject("result",FimsBizUtils.getRcvPathFiles(dirPath)); - } - - @RequestMapping(name = "", value = "/findExtrlRegltCntcAttchFiles") - public ModelAndView findExtrlRegltCntcAttchFiles(final String fileLinkId, final String crdnSeCd) { - return new ModelAndView("jsonView").addObject("result", - fileService.findFilesByInfTypeAndInfKey( - CmmFileDTO.FileMst.builder() - .infType(FimsBizUtils.getFileInfType(crdnSeCd)) - .infKey(fileLinkId) - .build()).stream() - .filter(dtl -> !Objects.equals("png", dtl.getFileExtsn())) - .collect(Collectors.toList()) - ); - } - - @RequestMapping(name = "", value = "/sendEcExtrlCrackdownRespons") - public ModelAndView sendEcExtrlCrackdownRespons(final String fileLinkId, final String crdnSeCd) { - return new ModelAndView("jsonView").addObject("result", - fileService.findFilesByInfTypeAndInfKey( - CmmFileDTO.FileMst.builder() - .infType(FimsBizUtils.getFileInfType(crdnSeCd)) - .infKey(fileLinkId) - .build()).stream() - .filter(dtl -> !Objects.equals("png", dtl.getFileExtsn())) - .collect(Collectors.toList()) - ); - } -} diff --git a/src/main/java/cokr/xit/fims/biz/ec/web/EcCtznSttemntController.java b/src/main/java/cokr/xit/fims/biz/ec/web/EcCtznSttemntController.java deleted file mode 100644 index a2cf1df2..00000000 --- a/src/main/java/cokr/xit/fims/biz/ec/web/EcCtznSttemntController.java +++ /dev/null @@ -1,148 +0,0 @@ -package cokr.xit.fims.biz.ec.web; - -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - -import cokr.xit.foundation.web.AbstractController; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.ModelAndView; - -import cokr.xit.fims.biz.FimsConst; -import cokr.xit.fims.biz.ec.CtznStmtDTO; -import cokr.xit.fims.biz.ec.service.EcCtznSttemntService; -import cokr.xit.fims.framework.biz.cmm.CmmFileDTO; -import cokr.xit.fims.framework.biz.cmm.service.CmmFileService; -import cokr.xit.fims.framework.core.constants.FrameworkConstants; - -import cokr.xit.fims.framework.support.mybatis.MybatisUtils; -import cokr.xit.fims.framework.support.util.AjaxMessageMapRenderer; -import cokr.xit.fims.framework.support.util.constants.MessageKey; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -@RequiredArgsConstructor -@Controller -@RequestMapping(name = "", value = "/fims/{biz}/ec") -public class EcCtznSttemntController extends AbstractController { - - - private final EcCtznSttemntService service; - private final CmmFileService fileService; - - - @RequestMapping(name = "", value = "/ecCtznSttemntMgtPopup") - public ModelAndView ecCtznSttemntMgtPopup(final CtznStmtDTO.Request reqDTO){ - ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"ec/ecCtznSttemntMgtPopup.popup"); - - CtznStmtDTO.Request newReqDTO = CtznStmtDTO.Request.builder() - .interfaceSeqN(reqDTO.getInterfaceSeqN()) - .build(); - mav.addObject("reqDTO", reqDTO); - mav.addObject("ctznDTO", service.findCtznStmt(newReqDTO)); - mav.addObject("ctznDtlDTOs", service.findCtznStmtDtls(newReqDTO)); - return mav; - } - - @RequestMapping(name = "", value = "/ecCtznSttemntAnsMgtPopup") - public ModelAndView ecCtznSttemntAnsMgtPopup(final CtznStmtDTO.Request reqDTO){ - ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"ec/ecCtznSttemntAnsMgtPopup.popup"); - - mav.addObject("ansDTO", service.findCtznStmtAnswer(reqDTO)); - return mav; - } - - @GetMapping(name = "", value = "/findCtznStmts") - public ModelAndView findCtznStmts(@RequestParam final Map paraMap) { - return new ModelAndView("jsonView").addObject("result",service.findCtznStmts(paraMap, MybatisUtils.getPagingInfo(paraMap))); - } - - @RequestMapping (value = "/findCtznStmtDtls") - public ModelAndView findCtznStmtDtls(final CtznStmtDTO.Request dto) { - return new ModelAndView("jsonView").addObject("result",service.findCtznStmtDtls(dto)); - } - - @GetMapping(name = "", value = "/findCtznStmtDtl") - public ModelAndView findCtznStmtDtl(final CtznStmtDTO.Request dto) { - return new ModelAndView("jsonView").addObject("result",service.findCtznStmtDtl(dto)); - } - - @RequestMapping(name = "", value = "/findCtznStmtDtlAndAttchFiles") - public ModelAndView findCtznStmtDtlAndAttchFiles(final CtznStmtDTO.Request dto) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - mav.addObject("ctznDTO", service.findCtznStmt(dto)); - mav.addObject("ctznDtlDTOs", service.findCtznStmtDtls(dto)); - mav.addObject("attchFiles", fileService.findFilesByEsbInterfaces( - CmmFileDTO.FileMst.builder() - .infType(FimsConst.FileInfType.NATL_NEWS_PAPER_RCV.getCode()) - .infKey(dto.getInterfaceSeqN()) - .build()).stream() - .filter(dtl -> !Objects.equals("png", dtl.getFileExtsn())) - .collect(Collectors.toList())); - return mav; - } - - @RequestMapping(name = "", value = "/findCtznStmtAttchFiles") - public ModelAndView findCtznStmtAttchFiles(final CtznStmtDTO.Request dto) { - return new ModelAndView("jsonView").addObject("result", - fileService.findFilesByEsbInterfaces( - CmmFileDTO.FileMst.builder() - .infType(FimsConst.FileInfType.NATL_NEWS_PAPER_RCV.getCode()) - .infKey(dto.getInterfaceSeqN()) - .build()).stream() - .filter(dtl -> !Objects.equals("png", dtl.getFileExtsn())) - .collect(Collectors.toList()) - ); - } - - - - @PostMapping(name = "", value = "/removeCtznStmtDtl") - public ModelAndView removeCtznStmtDtl(final CtznStmtDTO.Dtl dto) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - service.removeEcCtznSttemnt(dto); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_DELETE_SUCCESS); - return mav; - } - - - - /** - * 서손 자료 생성 - * @param dto CtznStmtDTO.Request - * @return - */ - @PostMapping(name = "", value = "/saveRtErpp") - public ModelAndView saveRtErpp(final CtznStmtDTO.Request dto) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - service.saveRtErpp(dto); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); - return mav; - } - - - - @RequestMapping(name = "", value = "/saveImg") - public ModelAndView saveImg (@RequestBody final Map paraMap) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - service.dragAndDropSaveImg(paraMap); - - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_SUCCESS); - return mav; - } - - @RequestMapping(name = "", value = "/saveCtznStmtAns") - public ModelAndView saveCtznStmtAns(final CtznStmtDTO.Ans dto) { - return new ModelAndView("jsonView").addObject("result",service.saveCtznStmtAns(dto)); - } -} diff --git a/src/main/java/cokr/xit/fims/biz/ec/web/EcNatlNewspaperController.java b/src/main/java/cokr/xit/fims/biz/ec/web/EcNatlNewspaperController.java deleted file mode 100644 index 79b5a5a2..00000000 --- a/src/main/java/cokr/xit/fims/biz/ec/web/EcNatlNewspaperController.java +++ /dev/null @@ -1,94 +0,0 @@ -package cokr.xit.fims.biz.ec.web; - -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - -import cokr.xit.foundation.web.AbstractController; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.ModelAndView; - -import cokr.xit.fims.biz.FimsConst; -import cokr.xit.fims.biz.ec.FolderReqDTO; -import cokr.xit.fims.biz.ec.service.EcNatlNewspaperService; -import cokr.xit.fims.biz.utils.FimsBizUtils; -import cokr.xit.fims.framework.biz.cmm.CmmFileDTO; -import cokr.xit.fims.framework.biz.cmm.service.CmmFileService; -import cokr.xit.fims.framework.core.constants.FrameworkConstants; - -import cokr.xit.fims.framework.support.mybatis.MybatisUtils; -import cokr.xit.fims.framework.support.util.AjaxMessageMapRenderer; -import cokr.xit.fims.framework.support.util.constants.MessageKey; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -@RequiredArgsConstructor -@Controller -@RequestMapping(name = "", value = "/fims/{biz}/ec") -public class EcNatlNewspaperController extends AbstractController { - - - private final EcNatlNewspaperService service; - private final CmmFileService fileService; - - - - - @RequestMapping(name = "", value = "/ecNatlNewspaperPopup") - public ModelAndView ecNatlNewspaperMgtPopup(final String interfaceSeqN){ - ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"ec/ecNatlNewspaperPopup.popup"); - mav.addObject("rcvXmlDTO", service.findEsbInterface(interfaceSeqN)); - mav.addObject("interfaceSeqN", interfaceSeqN); - mav.addObject("attchFiles", fileService.findFilesByEsbInterfaces( - CmmFileDTO.FileMst.builder() - .infType(FimsConst.FileInfType.NATL_NEWS_PAPER_RCV.getCode()) - .infKey(interfaceSeqN) - .build())); - return mav; - } - - /** - * @see cokr.xit.fims.biz.cmm.web.FimsCrackDownMgtController#findRcvPathFiles(String) - * @param dirPath - * @return - */ - @Deprecated - @RequestMapping(name = "", value = "/findNatlNewspaperFiles") - public ModelAndView findDirFiles(final String dirPath){ - return new ModelAndView("jsonView").addObject("result",FimsBizUtils.getRcvPathFiles(dirPath)); - } - - @PostMapping(name = "", value = "/saveNatlNewspaers") - public ModelAndView saveNatlNewspaer(@RequestBody final FolderReqDTO dto) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - service.saveEsbRvcParse(dto); - - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_SUCCESS); - return mav; - } - - @GetMapping(name = "", value = "/findNatlNewspaers") - public ModelAndView findNatlNewspaers(@RequestParam final Map paraMap) { - return new ModelAndView("jsonView").addObject("result",service.findEsbInterfaces(paraMap, MybatisUtils.getPagingInfo(paraMap))); - } - - @RequestMapping(name = "", value = "/findNatlNewspaperAttchFiles") - public ModelAndView findNatlNewspaperAttchFiles(final String interfaceSeqN) { - return new ModelAndView("jsonView").addObject("result", - fileService.findFilesByEsbInterfaces( - CmmFileDTO.FileMst.builder() - .infType(FimsConst.FileInfType.NATL_NEWS_PAPER_RCV.getCode()) - .infKey(interfaceSeqN) - .build()).stream() - .filter(dtl -> !Objects.equals("png", dtl.getFileExtsn())) - .collect(Collectors.toList()) - ); - } -} diff --git a/src/main/java/cokr/xit/fims/biz/rt/dao/RtCrackdownMgtMapper.java b/src/main/java/cokr/xit/fims/biz/rt/dao/RtCrackdownMgtMapper.java deleted file mode 100644 index 30a8bb0d..00000000 --- a/src/main/java/cokr/xit/fims/biz/rt/dao/RtCrackdownMgtMapper.java +++ /dev/null @@ -1,52 +0,0 @@ -package cokr.xit.fims.biz.rt.dao; - -import java.util.List; -import java.util.Map; - -import org.apache.ibatis.session.RowBounds; - -import org.egovframe.rte.psl.dataaccess.mapper.Mapper; -import cokr.xit.fims.biz.rt.RtDTO; -import cokr.xit.fims.framework.biz.cmm.CmmFileDTO; - -@Mapper -public interface RtCrackdownMgtMapper { - - //----------------------------------------------------- - // 단속 : tb_crdn - //----------------------------------------------------- - - List selectRtReglts(final Map paraMap, final RowBounds rowBounds); - RtDTO.Reglt selectRtReglt(final T t); - List selectRtRegltByVhrno(final T t); - RtDTO.Rtpyr selectRtRtpyr(final T t); - - void insertRtReglt(final RtDTO.Reglt dto); - void updateRtReglt(final RtDTO.Reglt dto); - - void deleteRtReglt(final T t); - - void insertRtErpp(final RtDTO.Erpp dto); - - - //----------------------------------------------------- - // 납부자 : tb_payer - //----------------------------------------------------- - void insertRtRtpyr(final RtDTO.Rtpyr dto); - void updateRtRtpyr(final RtDTO.Rtpyr dto); - - @Deprecated - void saveRtRtpyr(final RtDTO.Rtpyr dto); - - - //----------------------------------------------------- - // 상태변경이력 : tb_crdn_stts_hstry - //----------------------------------------------------- - - void insertRtProcessSttsChangeHist(final RtDTO.SttusChangeHist dto); - - - List selectRtRegltAttchFiles(final RtDTO.Request dto); - - -} diff --git a/src/main/java/cokr/xit/fims/biz/rt/service/RtCrackdownMgtService.java b/src/main/java/cokr/xit/fims/biz/rt/service/RtCrackdownMgtService.java deleted file mode 100644 index 23c3b5c1..00000000 --- a/src/main/java/cokr/xit/fims/biz/rt/service/RtCrackdownMgtService.java +++ /dev/null @@ -1,42 +0,0 @@ -package cokr.xit.fims.biz.rt.service; - -import java.util.List; -import java.util.Map; - -import org.apache.ibatis.session.RowBounds; - -import cokr.xit.fims.biz.rt.RtDTO; -import cokr.xit.fims.framework.biz.cmm.CmmFileDTO; -import cokr.xit.fims.framework.biz.cmm.XitLoginVO; -import cokr.xit.fims.framework.core.utils.XitCmmnUtil; - -public interface RtCrackdownMgtService { - //----------------------------------------------------- - // 단속 : tb_crdn - //----------------------------------------------------- - - List findRtReglts(final Map paraMap, final RowBounds rowBounds); - RtDTO.Reglt findRtReglt(final T t); - List findRtRegltByVhrno(final T t); - void addRtReglt(final RtDTO.Reglt dto); - void modifyRtReglt(final RtDTO.Reglt dto); - void removeRtReglt(final RtDTO.Reglt dto); - - - //----------------------------------------------------- - // 납부자 : tb_payer - //----------------------------------------------------- - - - - - List findRtRegltAttchFiles(RtDTO.Request dto); - - - - default XitLoginVO getUserInfo(){ - return XitCmmnUtil.getUserInfo(); - } - - -} diff --git a/src/main/java/cokr/xit/fims/biz/rt/service/bean/RtCrackdownMgtServiceBean.java b/src/main/java/cokr/xit/fims/biz/rt/service/bean/RtCrackdownMgtServiceBean.java deleted file mode 100644 index 758f6a16..00000000 --- a/src/main/java/cokr/xit/fims/biz/rt/service/bean/RtCrackdownMgtServiceBean.java +++ /dev/null @@ -1,83 +0,0 @@ -package cokr.xit.fims.biz.rt.service.bean; - -import java.util.List; -import java.util.Map; - -import cokr.xit.foundation.component.AbstractServiceBean; -import cokr.xit.fims.biz.rt.service.RtCrackdownMgtService; -import org.apache.ibatis.session.RowBounds; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import cokr.xit.fims.biz.rt.dao.RtCrackdownMgtMapper; -import cokr.xit.fims.biz.rt.RtDTO; -import cokr.xit.fims.biz.utils.FimsBizUtils; -import cokr.xit.fims.framework.biz.cmm.CmmFileDTO; -import lombok.RequiredArgsConstructor; - -@RequiredArgsConstructor -@Service -public class RtCrackdownMgtServiceBean extends AbstractServiceBean implements RtCrackdownMgtService { - private final RtCrackdownMgtMapper mapper; - - @Override - @Transactional(readOnly = true) - public List findRtReglts(final Map paraMap, final RowBounds rowBounds) { - return mapper.selectRtReglts(paraMap, rowBounds); - } - - @Override - @Transactional(readOnly = true) - public RtDTO.Reglt findRtReglt(final T t) { - return mapper.selectRtReglt(t); - } - - @Override - @Transactional(readOnly = true) - public List findRtRegltByVhrno(final T t) { - return mapper.selectRtRegltByVhrno(t); - } - - @Override - @Transactional - public void addRtReglt(final RtDTO.Reglt dto){ - mapper.insertRtReglt(dto); - } - @Override - @Transactional - public void modifyRtReglt(final RtDTO.Reglt dto) { - - - //단속정보 수정 - mapper.updateRtReglt(dto); - //소유자 수정 - /*1단계 차적조회를 안하고 바로 자료 전송 - 하여 rtpyr를 알수 없음.*/ - /*fimsTotalPopupMapper.modifyProcRtpyr(vo);*/ - //서손 수정 - /*fimsTotalPopupMapper.modifyProcErpp(vo);*/ - - } - - - - - @Override - @Transactional - public void removeRtReglt(final RtDTO.Reglt dto) { - - //단속정보 삭제 - mapper.deleteRtReglt(dto); - //소유자 수정 - /*fimsTotalPopupMapper.modifyProcRtpyr(vo);*/ - //서손 수정 - /*fimsTotalPopupMapper.modifyProcErpp(vo);*/ - - } - - @Override - public List findRtRegltAttchFiles(final RtDTO.Request dto) { - dto.setInfType(FimsBizUtils.getFileInfType(dto.getCrdnSeCd())); - return mapper.selectRtRegltAttchFiles(dto); - } -} diff --git a/src/main/java/cokr/xit/fims/biz/rt/web/RtCrackdownMgtController.java b/src/main/java/cokr/xit/fims/biz/rt/web/RtCrackdownMgtController.java deleted file mode 100644 index fe52ced1..00000000 --- a/src/main/java/cokr/xit/fims/biz/rt/web/RtCrackdownMgtController.java +++ /dev/null @@ -1,111 +0,0 @@ -package cokr.xit.fims.biz.rt.web; - -import java.util.Map; - -import cokr.xit.foundation.web.AbstractController; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.ModelAndView; - -import cokr.xit.fims.biz.FimsConst; -import cokr.xit.fims.biz.rt.RtDTO; -import cokr.xit.fims.biz.rt.service.RtCrackdownMgtService; -import cokr.xit.fims.framework.biz.cmm.service.CmmFileService; -import cokr.xit.fims.framework.core.constants.FrameworkConstants; - -import cokr.xit.fims.framework.support.mybatis.MybatisUtils; -import cokr.xit.fims.framework.support.util.AjaxMessageMapRenderer; -import cokr.xit.fims.framework.support.util.Checks; -import cokr.xit.fims.framework.support.util.constants.MessageKey; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -/** - * - *
    - *
  • 업무 그룹명: 단속자료 현황
    • - *
  • 설 명: 단속자료 현황을 조회한다
    • - *
  • 작성일: 2022. 09. 14. - *
- * - * @author 최정민 - * - */ -@Slf4j -@RequiredArgsConstructor -@Controller -@RequestMapping("/fims/{biz}/rt") -public class RtCrackdownMgtController extends AbstractController { - - static final String PATH = "/fims/biz/rt"; - - private final RtCrackdownMgtService service; - - private final CmmFileService fileService; - - @RequestMapping({"/list"}) - public String list() { - return "/list.html"; - } - - - - @GetMapping(name = "", value = "/findRtReglts") - public ModelAndView findRtReglts(@RequestParam final Map paraMap) { - return new ModelAndView("jsonView").addObject("result",service.findRtReglts(paraMap, MybatisUtils.getPagingInfo(paraMap))); - } - - @GetMapping(name = "", value = "/findRtReglt") - public ModelAndView findRtReglt(final RtDTO.Request dto) { - return new ModelAndView("jsonView").addObject("result",service.findRtReglt(dto)); - } - - @GetMapping(name = "", value = "/findRtRegltByVhrno") - public ModelAndView findRtRegltByVhrno(final RtDTO.Request dto) { - return new ModelAndView("jsonView").addObject("result",service.findRtRegltByVhrno(dto)); - } - - @RequestMapping(name = "", value = "/findRtRegltAndAttchFiles") - public ModelAndView findRtRegltAndAttchFiles(final RtDTO.Request dto) { - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - mav.addObject("dto", service.findRtReglt(dto)); - mav.addObject("attchFiles", service.findRtRegltAttchFiles(dto)); - return mav; - } - - @PostMapping(name = "", value="/addRtReglt") - public ModelAndView addRtReglt(RtDTO.Reglt dto){ - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - service.addRtReglt(dto); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); - return mav; - } - - @PostMapping(name = "", value="/modifyRtReglt") - public ModelAndView modifyRtReglt(RtDTO.Reglt dto){ - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - - service.modifyRtReglt(dto); - AjaxMessageMapRenderer.success(mav, MessageKey.CMM_UPDATE_SUCCESS); - - return mav; - } - - @PostMapping(name = "", value = "/removeRtReglt") - public ModelAndView removeRtReglt(RtDTO.Reglt dto){ - - ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - service.removeRtReglt(dto); - return mav; - } - - @RequestMapping(name = "", value = "/findRtRegltAttchFiles") - public ModelAndView findRtRegltAttchFiles(final RtDTO.Request dto) { - return new ModelAndView("jsonView").addObject("result",service.findRtRegltAttchFiles(dto)); - } -} diff --git a/src/main/java/cokr/xit/fims/framework/support/tag/code/CodeRadioBoxTag.java b/src/main/java/cokr/xit/fims/framework/support/tag/code/CodeRadioBoxTag.java index f6c5089c..5e8e5b18 100644 --- a/src/main/java/cokr/xit/fims/framework/support/tag/code/CodeRadioBoxTag.java +++ b/src/main/java/cokr/xit/fims/framework/support/tag/code/CodeRadioBoxTag.java @@ -18,13 +18,13 @@ import java.util.Map; public class CodeRadioBoxTag extends TagSupport { private static final long serialVersionUID = 519803737380451566L; - - private String id = ""; - private String name = ""; + + private String id = ""; + private String name = ""; private String grpId = ""; private String defaultSelect = ""; private String cls = ""; - private String alt = ""; + private String alt = ""; private String onclick = ""; private String type = ""; @@ -34,15 +34,9 @@ public class CodeRadioBoxTag extends TagSupport { try { StringBuilder sb = new StringBuilder(); - // Map paraMap = new HashMap(); - // paraMap.put("grpId", this.grpId); - // paraMap.put("code", this.code); - // paraMap.put("etc_1", this.etc_1); - // paraMap.put("etc_2", this.etc_2); - // paraMap.put("etc_3", this.etc_3); - + List> list = CacheServiceUtils.getComboCodes(grpId, type); - + int index = 0; sb.append(" map : list) { - + sb.append(""); sb.append(map.get("code_val")); sb.append("").append("\n"); - + index++; } out.print(sb.toString()); @@ -85,7 +79,7 @@ public class CodeRadioBoxTag extends TagSupport { } return SKIP_BODY; } - + private String isDefaultSelect(String defaultSelectValue) { if(StringUtils.hasText(this.defaultSelect) && this.defaultSelect.equals(defaultSelectValue)) return " checked='checked'"; diff --git a/src/main/java/cokr/xit/fims/framework/support/tag/code/CodeSelectBoxTag.java b/src/main/java/cokr/xit/fims/framework/support/tag/code/CodeSelectBoxTag.java index df7e47d5..3ba4b65d 100644 --- a/src/main/java/cokr/xit/fims/framework/support/tag/code/CodeSelectBoxTag.java +++ b/src/main/java/cokr/xit/fims/framework/support/tag/code/CodeSelectBoxTag.java @@ -22,28 +22,28 @@ import java.util.Map; public class CodeSelectBoxTag extends TagSupport { private static final long serialVersionUID = 519803737380451566L; - - private String id = ""; - private String name = ""; + + private String id = ""; + private String name = ""; private String grpId = ""; private String etc_1 = ""; private String etc_2 = ""; private String etc_3 = ""; private String title = ""; - private String defaultSelect = ""; - private boolean isEmptySelect = true; + private String defaultSelect = ""; + private boolean isEmptySelect = true; private String emptyMessageKey = MessageKey.EMPTY_MSG_COMBO; - private String sortField = ""; - private String cls = ""; - private String alt = ""; + private String sortField = ""; + private String cls = ""; + private String alt = ""; private String onchange = ""; private boolean disabled = false; private boolean display = true; // 공통코드가 아닌경우 구분 코드 private String type = ""; - + public int doStartTag() throws JspException { JspWriter out = pageContext.getOut(); @@ -65,15 +65,13 @@ public class CodeSelectBoxTag extends TagSupport { if(this.isEmptySelect){ - sb.append("").append("\n"); + } - - List> list = CacheServiceUtils.getComboCodes(grpId, type); - + + List> list = someMapper.getComboCodes(grpId, type); + for (Map map : list) { sb.append("