diff --git a/src/main/java/cokr/xit/fims/chongno/JasperController.java b/src/main/java/cokr/xit/fims/chongno/JasperController.java index 5da820b..15baf82 100644 --- a/src/main/java/cokr/xit/fims/chongno/JasperController.java +++ b/src/main/java/cokr/xit/fims/chongno/JasperController.java @@ -17,6 +17,7 @@ import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.FimsPrintOption; import cokr.xit.fims.crdn.Crdn; +import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.sndb.SndbQuery; import cokr.xit.fims.sndb.service.SndngDtlService; import cokr.xit.fims.sprt.SprtQuery; @@ -29,6 +30,8 @@ import cokr.xit.foundation.web.AbstractController; @Controller @RequestMapping("/preview") public class JasperController extends AbstractController { + @Resource(name="crdnService") + private CrdnService crdnService; /**발송 상세 서비스*/ @Resource(name="sndngDtlService") private SndngDtlService sndngDtlService; @@ -45,7 +48,14 @@ public class JasperController extends AbstractController { crdnList.forEach(row -> { row.set("CRDN_YMD_TM", DataFormat.yyyy_mm_dd(row.get("CRDN_YMD")) + " " + DataFormat.hh_mm_ss(row.get("CRDN_TM"))); }); - String[] crdnIds = crdnList.stream().map(row -> row.string("CRDN_ID")).toList().toArray(new String[crdnList.size()]); + List crdnIdList = crdnList.stream().map(row -> row.string("CRDN_ID")).toList(); + List crdns = crdnService.getCrackdowns(crdnIdList); + List upds = crdns.stream() + .filter(crdn -> { + return true; + }) + .toList(); + String[] crdnIds = crdnIdList.toArray(new String[crdnList.size()]); Map> crdnFiles = fileBean.getFilesOf(Crdn.INF_TYPE, crdnIds).stream() .collect(Collectors.groupingBy(row -> row.getInfoKey())); List inputStreams = crdnList.stream() diff --git a/src/main/resources/intf-conf/xit-lvis.conf b/src/main/resources/intf-conf/xit-lvis.conf index 1081026..f5afc98 100644 --- a/src/main/resources/intf-conf/xit-lvis.conf +++ b/src/main/resources/intf-conf/xit-lvis.conf @@ -18,9 +18,9 @@ "infoSysId": "41-358", /* 정보시스템 ID(필수) */ "infoSysIp": "101.0.115.13", /* 정보시스템 IP(필수) */ - "chargerId": "", /* 담당자 id */ + "chargerId": "202510415", /* 담당자 id */ "chargerIp": "", /* 담당자 ip 주소 */ - "chargerName": "이광진", /* 담당자명 */ + "chargerName": "박재현", /* 담당자명 */ "cvmisApiKey": "1234AAAA-A1324567-A1234567-A1234567", /* 교통안전공단 발급 키 */ "publicInfo": "lvis", /* 행정정보 공동이용 서비스 접속 설정(public-info.conf) 이름 */ @@ -29,7 +29,8 @@ { "api": "AC1_FD11_01", /* 자동차 기본사항 조회 */ "api_key": "339de72be931582c91f56043b8c6c8ff24089694462404e9824b0b5cb2bf4948", "cvmis_apikey": "BDBDABE8-9E11D064-9F1ECC61-6E50AA75", - "local": true /* , "log": true */ + "local": true, + "log": true }, { "api": "AC1_FD11_02", /* 자동차 등록원부(갑) */ "api_key": "682667ee23054d2a563ed0763c0c24afdd61f618e8abf22dfc05c8a54876bde5", diff --git a/src/main/resources/xit-fims.conf b/src/main/resources/xit-fims.conf index 783e7dc..decdbc0 100644 --- a/src/main/resources/xit-fims.conf +++ b/src/main/resources/xit-fims.conf @@ -8,5 +8,6 @@ "sggNet" : [], "publicInfoCarYn" : "N", "nxrpDemonYn" : "Y", - "violationFileDir": "files/cctv" + "violationFileDir": "files/cctv", + "txtCharset": "UTF-8" } \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index dab250f..edd6829 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -425,12 +425,10 @@ $(document).ready(function(){ }); } $P.fnVehicleUpdate = () => { - let selector = "input[name='vehicleUpload']", - upload = $(selector), - uploadSet = uploadSupport(selector); - uploadSet.onCurrentChange = item => { - let upload = item.data, - crdnIds = ctrl.dataset.getDataset() + fileInput().select(item => { + if (!item) return; + + let crdnIds = ctrl.dataset.getDataset() .filter(info => "01" == info.CRDN_STTS_CD) .map(info => info.CRDN_ID); @@ -438,23 +436,19 @@ $(document).ready(function(){ url : wctx.url("/crdn/crdn06/010/uploadVehicles.do"), data : { crdnIds: crdnIds.join(","), - upload: item.data + upload: item }, success : (resp) => { if (resp.saved) { - uploadSet.setData([]); - if(resp.alertMessage) - dialog.alert(resp.alertMessage); - else { - $P.refreshCrdnList(); - } + if(resp.rtnMsg) + dialog.alert(resp.rtnMsg); + $P.refreshCrdnList(); } else { - dialog.alert(resp.failReason); + dialog.alert(resp.rtnMsg); } } }); - } - upload.click(); + }); } $P.checkCrdnList = (element, bool) => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp index 34572aa..3f1f1ee 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp @@ -106,6 +106,10 @@ +
+ + +