From 2b8547f7bb9dfcc221853feafd08fe74125ba452 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Wed, 13 Mar 2024 14:17:48 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EC=99=B8=EC=A3=BC=EC=9A=94=EC=B2=AD?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=B0=94=EC=BD=94=EB=93=9C=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?2.=20=EC=99=B8=EC=A3=BC=EC=9A=94=EC=B2=AD=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EB=82=B4=20=EC=82=AC=EC=A7=84=ED=8C=8C=EC=9D=BC=EB=AA=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=203.=20=EC=A3=BC=EC=84=9D=20=EC=98=A4?= =?UTF-8?q?=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/file/etc/OutsourcingFileWriter.java | 4 +++- .../java/cokr/xit/fims/cmmn/CmmnUtil.java | 20 +++++++++++++++++++ .../fims/nxrp/service/bean/NisIndivBean.java | 16 +++++++++------ 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/main/java/cokr/xit/base/file/etc/OutsourcingFileWriter.java b/src/main/java/cokr/xit/base/file/etc/OutsourcingFileWriter.java index 2be3d883..bea716ce 100644 --- a/src/main/java/cokr/xit/base/file/etc/OutsourcingFileWriter.java +++ b/src/main/java/cokr/xit/base/file/etc/OutsourcingFileWriter.java @@ -66,6 +66,8 @@ public class OutsourcingFileWriter { DataObject dataObject = dataObjectList.get(i); CmmnUtil.setOcrInfo(dataObject); + CmmnUtil.setBarcode(dataObject); + String sndngDtlId = dataObject.string("SNDNG_DTL_ID"); int crdnPhotoCnt = dataObject.number("CRDN_PHOTO_CNT").intValue(); @@ -87,7 +89,7 @@ public class OutsourcingFileWriter { } InputStream orgnFileInputStream = new FileInputStream(orgnFile); - String modifiedFileName = "P"+fileKey+CmmnUtil.indexToAlphabet(j, true, true)+"."+"JPG"; + String modifiedFileName = "P"+sndngDtlId+CmmnUtil.indexToAlphabet(j, true, true)+"."+"JPG"; String modifiedFilePath = imagesFolderPath + File.separator + modifiedFileName; diff --git a/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java b/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java index c245eb86..7c0cacfa 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java +++ b/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java @@ -508,6 +508,26 @@ public class CmmnUtil { } + public static String getBarcode(String rgSe, String sggCd, String sndngDtlId) { + String rgSe1 = ""; + if(rgSe.length() > 1) { + rgSe1 = rgSe.substring(1); + } else { + rgSe1 = rgSe; + } + + return "*"+rgSe1+sggCd+sndngDtlId+"*"; + } + + public static void setBarcode(DataObject dataObject) { + String recevDivCd = dataObject.string("RECEV_DIV_CD"); + String sggCd = dataObject.string("SGG_CD"); + String sndngDtlId = dataObject.string("SNDNG_DTL_ID"); + String barcode = CmmnUtil.getBarcode(recevDivCd, sggCd, sndngDtlId); + dataObject.put("BARCODE", barcode); + dataObject.put("BARCODE1", barcode); + } + /** 엑셀파일 공통 헤더 스타일 생성 * @param xlsx * @return XLSWriter.Styler diff --git a/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java b/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java index c1da4727..da7160ea 100644 --- a/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java +++ b/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java @@ -23,8 +23,6 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; -import cokr.xit.foundation.AbstractComponent; -import cokr.xit.foundation.data.DataObject; import cokr.xit.base.user.service.bean.UserBean; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.dao.CrdnUpdtMapper; @@ -38,6 +36,8 @@ import cokr.xit.fims.nxrp.dao.NisIndivA03Mapper; import cokr.xit.fims.sndb.SndbQuery; import cokr.xit.fims.sndb.SndngDtl; import cokr.xit.fims.sndb.dao.SndngDtlMapper; +import cokr.xit.foundation.AbstractComponent; +import cokr.xit.foundation.data.DataObject; /**과태료 대장 단속 정보 등록 정보 관리 Bean * @@ -145,7 +145,7 @@ public class NisIndivBean extends AbstractComponent { nisIndivA01.setRprsTxmCd(selectCrdnInfo.string("TXITM_CD")); // 대표세입과목코드 nisIndivA01.setOperItemCd(selectCrdnInfo.string("OPER_ITEM_CD")); // 운영항목코드 // 과태료과징금구분코드 01:과태료 02:과징금 - if (selectCrdnInfo.string("TASK_SE_CD").equals("PES")) { // 밤샘주차는 과장금(02) + if (selectCrdnInfo.string("TASK_SE_CD").equals("PES")) { // 밤샘주차는 과징금(02) nisIndivA01.setFinScrgSeCd("02"); } else { nisIndivA01.setFinScrgSeCd("01"); @@ -513,6 +513,7 @@ public class NisIndivBean extends AbstractComponent { // SSL 무시 ///////////////////////////////////////////////////////////////// public void ignoreSsl() throws Exception { HostnameVerifier hv = new HostnameVerifier() { + @Override public boolean verify(String urlHostName, SSLSession session) { return true; } @@ -532,7 +533,8 @@ public class NisIndivBean extends AbstractComponent { } static class miTM implements TrustManager,X509TrustManager { - public X509Certificate[] getAcceptedIssuers() { + @Override + public X509Certificate[] getAcceptedIssuers() { return null; } @@ -544,12 +546,14 @@ public class NisIndivBean extends AbstractComponent { return true; } - public void checkServerTrusted(X509Certificate[] certs, String authType) + @Override + public void checkServerTrusted(X509Certificate[] certs, String authType) throws CertificateException { return; } - public void checkClientTrusted(X509Certificate[] certs, String authType) + @Override + public void checkClientTrusted(X509Certificate[] certs, String authType) throws CertificateException { return; }