|
|
@ -117,7 +117,7 @@ public class EcNatlNewspaperService implements IEcNatlNewspaperService {
|
|
|
|
//-------------------------------------------------------------
|
|
|
|
//-------------------------------------------------------------
|
|
|
|
//시민 신고 마스터 데이타 생성
|
|
|
|
//시민 신고 마스터 데이타 생성
|
|
|
|
//-------------------------------------------------------------
|
|
|
|
//-------------------------------------------------------------
|
|
|
|
CtznStmtDTO ctznStmtDTO = setCtznSttemntDTOFromRcvXml(xmlDto);
|
|
|
|
CtznStmtDTO.Mst ctznStmtDTO = setCtznSttemntDTOFromRcvXml(xmlDto);
|
|
|
|
ctznSttemntMapper.insertEcCtznSttemnt(ctznStmtDTO);
|
|
|
|
ctznSttemntMapper.insertEcCtznSttemnt(ctznStmtDTO);
|
|
|
|
|
|
|
|
|
|
|
|
//-------------------------------------------------------------
|
|
|
|
//-------------------------------------------------------------
|
|
|
@ -126,7 +126,7 @@ public class EcNatlNewspaperService implements IEcNatlNewspaperService {
|
|
|
|
index.set(0);
|
|
|
|
index.set(0);
|
|
|
|
CmmFileDTO.FileMst fstMstDTO = null;
|
|
|
|
CmmFileDTO.FileMst fstMstDTO = null;
|
|
|
|
CmmFileDTO.FileDtl pngDtlDTO = null;
|
|
|
|
CmmFileDTO.FileDtl pngDtlDTO = null;
|
|
|
|
for(CtznStmtDTO.CtznStmtDtl dtl : ctznStmtDTO.getStmtDtlDTOs()){
|
|
|
|
for(CtznStmtDTO.Dtl dtl : ctznStmtDTO.getStmtDtlDTOs()){
|
|
|
|
// 시민 신고 상세 데이타 생성
|
|
|
|
// 시민 신고 상세 데이타 생성
|
|
|
|
dtl.setCtznSttemntDetailProcessSttus(FimsConst.CtznStmtDtlStsCode.ACCEPTANCE.getCode());
|
|
|
|
dtl.setCtznSttemntDetailProcessSttus(FimsConst.CtznStmtDtlStsCode.ACCEPTANCE.getCode());
|
|
|
|
ctznSttemntMapper.insertEcCtznSttemntDetail(dtl);
|
|
|
|
ctznSttemntMapper.insertEcCtznSttemntDetail(dtl);
|
|
|
@ -215,9 +215,9 @@ public class EcNatlNewspaperService implements IEcNatlNewspaperService {
|
|
|
|
* @return
|
|
|
|
* @return
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
//-------------------------------------------------------------------------------------------------------------
|
|
|
|
//-------------------------------------------------------------------------------------------------------------
|
|
|
|
private CtznStmtDTO setCtznSttemntDTOFromRcvXml(NatlNewspaperRcvXmlDTO xmlDto){
|
|
|
|
private CtznStmtDTO.Mst setCtznSttemntDTOFromRcvXml(NatlNewspaperRcvXmlDTO xmlDto){
|
|
|
|
CtznStmtDTO dto = new CtznStmtDTO();
|
|
|
|
CtznStmtDTO.Mst dto = new CtznStmtDTO.Mst();
|
|
|
|
List<CtznStmtDTO.CtznStmtDtl> dtlList = new ArrayList<>();
|
|
|
|
List<CtznStmtDTO.Dtl> dtlList = new ArrayList<>();
|
|
|
|
String reasonStr = xmlDto.getPetiReasonL();
|
|
|
|
String reasonStr = xmlDto.getPetiReasonL();
|
|
|
|
|
|
|
|
|
|
|
|
dto.setInterfaceSeqN(xmlDto.getInterfaceSeqN());
|
|
|
|
dto.setInterfaceSeqN(xmlDto.getInterfaceSeqN());
|
|
|
@ -262,7 +262,7 @@ public class EcNatlNewspaperService implements IEcNatlNewspaperService {
|
|
|
|
.replaceAll("[: /]", "")
|
|
|
|
.replaceAll("[: /]", "")
|
|
|
|
.split(",");
|
|
|
|
.split(",");
|
|
|
|
|
|
|
|
|
|
|
|
CtznStmtDTO.CtznStmtDtl dtlDto = new CtznStmtDTO.CtznStmtDtl();
|
|
|
|
CtznStmtDTO.Dtl dtlDto = new CtznStmtDTO.Dtl();
|
|
|
|
//단속일시
|
|
|
|
//단속일시
|
|
|
|
dtlDto.setRegltDeTime(arrSrc[0]);
|
|
|
|
dtlDto.setRegltDeTime(arrSrc[0]);
|
|
|
|
|
|
|
|
|
|
|
@ -291,7 +291,7 @@ public class EcNatlNewspaperService implements IEcNatlNewspaperService {
|
|
|
|
dto.getDupDataList().add(dupDto);
|
|
|
|
dto.getDupDataList().add(dupDto);
|
|
|
|
|
|
|
|
|
|
|
|
for (int idx = 1; idx < dtlList.size(); idx++) {
|
|
|
|
for (int idx = 1; idx < dtlList.size(); idx++) {
|
|
|
|
CtznStmtDTO.CtznStmtDtl tgt = dtlList.get(idx);
|
|
|
|
CtznStmtDTO.Dtl tgt = dtlList.get(idx);
|
|
|
|
int finalIdx = idx;
|
|
|
|
int finalIdx = idx;
|
|
|
|
AtomicBoolean isDup = new AtomicBoolean(false);
|
|
|
|
AtomicBoolean isDup = new AtomicBoolean(false);
|
|
|
|
dto.getDupDataList().forEach(dupData -> {
|
|
|
|
dto.getDupDataList().forEach(dupData -> {
|
|
|
@ -311,7 +311,7 @@ public class EcNatlNewspaperService implements IEcNatlNewspaperService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 단속일시 desc로 정렬 - 동일 차량인 경우 단속일시가 늦은것 남기기위해)
|
|
|
|
// 단속일시 desc로 정렬 - 동일 차량인 경우 단속일시가 늦은것 남기기위해)
|
|
|
|
dtlList = dtlList.stream()
|
|
|
|
dtlList = dtlList.stream()
|
|
|
|
.sorted(Comparator.comparing(CtznStmtDTO.CtznStmtDtl::getRegltDeTime).reversed()).collect(
|
|
|
|
.sorted(Comparator.comparing(CtznStmtDTO.Dtl::getRegltDeTime).reversed()).collect(
|
|
|
|
Collectors.toList());
|
|
|
|
Collectors.toList());
|
|
|
|
// 중복제거(동일 차량 번호중 단속일시가 가장 늦은것 pick)
|
|
|
|
// 중복제거(동일 차량 번호중 단속일시가 가장 늦은것 pick)
|
|
|
|
// 차량번호가 없는 경우가 존재하여 체크로직 추가
|
|
|
|
// 차량번호가 없는 경우가 존재하여 체크로직 추가
|
|
|
@ -388,7 +388,7 @@ public class EcNatlNewspaperService implements IEcNatlNewspaperService {
|
|
|
|
private void saveAllAppendFiles(
|
|
|
|
private void saveAllAppendFiles(
|
|
|
|
NatlNewspaperRcvXmlDTO xmlDto,
|
|
|
|
NatlNewspaperRcvXmlDTO xmlDto,
|
|
|
|
NatlNewspaperRcvXmlDTO.ApndFileInfo appendFileDto,
|
|
|
|
NatlNewspaperRcvXmlDTO.ApndFileInfo appendFileDto,
|
|
|
|
CtznStmtDTO.CtznStmtDtl sttemntDetailDTO,
|
|
|
|
CtznStmtDTO.Dtl sttemntDetailDTO,
|
|
|
|
int fileCnt) {
|
|
|
|
int fileCnt) {
|
|
|
|
|
|
|
|
|
|
|
|
List<MultipartFile> mfList = new ArrayList<>();
|
|
|
|
List<MultipartFile> mfList = new ArrayList<>();
|
|
|
@ -417,7 +417,7 @@ public class EcNatlNewspaperService implements IEcNatlNewspaperService {
|
|
|
|
@SuppressWarnings("DuplicatedCode")
|
|
|
|
@SuppressWarnings("DuplicatedCode")
|
|
|
|
private CmmFileDTO.FileMst saveAppendFiles(
|
|
|
|
private CmmFileDTO.FileMst saveAppendFiles(
|
|
|
|
NatlNewspaperRcvXmlDTO.ApndFileInfo apndFileDTO,
|
|
|
|
NatlNewspaperRcvXmlDTO.ApndFileInfo apndFileDTO,
|
|
|
|
CtznStmtDTO.CtznStmtDtl stmtDtlDTO,
|
|
|
|
CtznStmtDTO.Dtl stmtDtlDTO,
|
|
|
|
int index,
|
|
|
|
int index,
|
|
|
|
int fileCnt) {
|
|
|
|
int fileCnt) {
|
|
|
|
|
|
|
|
|
|
|
@ -463,7 +463,7 @@ public class EcNatlNewspaperService implements IEcNatlNewspaperService {
|
|
|
|
@SuppressWarnings({"DuplicatedCode", "UnusedReturnValue"})
|
|
|
|
@SuppressWarnings({"DuplicatedCode", "UnusedReturnValue"})
|
|
|
|
private CmmFileDTO.FileMst saveFstOverAppendFiles(
|
|
|
|
private CmmFileDTO.FileMst saveFstOverAppendFiles(
|
|
|
|
final NatlNewspaperRcvXmlDTO.ApndFileInfo apndFileDTO,
|
|
|
|
final NatlNewspaperRcvXmlDTO.ApndFileInfo apndFileDTO,
|
|
|
|
final CtznStmtDTO.CtznStmtDtl stmtDtlDTO,
|
|
|
|
final CtznStmtDTO.Dtl stmtDtlDTO,
|
|
|
|
final CmmFileDTO.FileDtl pngFileDtlDto,
|
|
|
|
final CmmFileDTO.FileDtl pngFileDtlDto,
|
|
|
|
int index) {
|
|
|
|
int index) {
|
|
|
|
|
|
|
|
|
|
|
@ -498,7 +498,7 @@ public class EcNatlNewspaperService implements IEcNatlNewspaperService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private CmmFileDTO.FileMst getFileMst(CtznStmtDTO.CtznStmtDtl sttemntDetailDTO) {
|
|
|
|
private CmmFileDTO.FileMst getFileMst(CtznStmtDTO.Dtl sttemntDetailDTO) {
|
|
|
|
CmmFileDTO.FileMst fileMstDTO = new CmmFileDTO.FileMst();
|
|
|
|
CmmFileDTO.FileMst fileMstDTO = new CmmFileDTO.FileMst();
|
|
|
|
fileMstDTO.setJobSeCode(FimsConst.FileJobSeCode.NATL_NEWS_PAPER_RCV.getCode());
|
|
|
|
fileMstDTO.setJobSeCode(FimsConst.FileJobSeCode.NATL_NEWS_PAPER_RCV.getCode());
|
|
|
|
fileMstDTO.setFileJobId(sttemntDetailDTO.getInterfaceSeqN()+ sttemntDetailDTO.getCtznSttemntDetailSn());
|
|
|
|
fileMstDTO.setFileJobId(sttemntDetailDTO.getInterfaceSeqN()+ sttemntDetailDTO.getCtznSttemntDetailSn());
|
|
|
|