From 1545cb1a6a8b1302950964d053700a4a81619a2e Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Wed, 9 Aug 2023 12:57:02 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=EA=B8=88=EC=95=A1=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fims/crdn/service/bean/Crdn05Bean.java | 131 ++++++++++++++++++ .../crdn/service/bean/Crdn05ServiceBean.java | 44 +----- .../xit/fims/task/service/TaskService.java | 12 -- .../task/service/bean/BpvServiceBean.java | 62 --------- .../task/service/bean/DpvServiceBean.java | 37 ----- .../task/service/bean/EcaServiceBean.java | 34 ----- .../task/service/bean/PvsServiceBean.java | 78 ----------- .../task/service/bean/TpvServiceBean.java | 72 ---------- 8 files changed, 134 insertions(+), 336 deletions(-) delete mode 100644 src/main/java/cokr/xit/fims/task/service/TaskService.java delete mode 100644 src/main/java/cokr/xit/fims/task/service/bean/BpvServiceBean.java delete mode 100644 src/main/java/cokr/xit/fims/task/service/bean/DpvServiceBean.java delete mode 100644 src/main/java/cokr/xit/fims/task/service/bean/EcaServiceBean.java delete mode 100644 src/main/java/cokr/xit/fims/task/service/bean/PvsServiceBean.java delete mode 100644 src/main/java/cokr/xit/fims/task/service/bean/TpvServiceBean.java diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java index 9110a94a..0fedc724 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java @@ -2,9 +2,11 @@ package cokr.xit.fims.crdn.service.bean; import javax.annotation.Resource; +import org.assertj.core.util.Arrays; import org.springframework.stereotype.Component; import cokr.xit.fims.crdn.Crdn; +import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.dao.Crdn05Mapper; import cokr.xit.foundation.AbstractComponent; @@ -13,6 +15,13 @@ import cokr.xit.foundation.AbstractComponent; */ @Component("crdn05Bean") public class Crdn05Bean extends AbstractComponent { + public static String[] SAFE_TAG_AREA = {"03","06","07"}; //안전표지구역 + + public static String[] CAR_GROUP1 = {"12","14","15","21"}; //승합자동차등 + public static String[] CAR_GROUP2 = {"11","13"}; //승용자동차등 + public static String[] CAR_GROUP3 = {"31"}; //이륜자동차등 + + @Resource(name = "crdn05Mapper") private Crdn05Mapper crdn05Mapper; @@ -27,4 +36,126 @@ public class Crdn05Bean extends AbstractComponent { public boolean insertCrdn(Crdn crdn) { return crdn05Mapper.insertCrdn(crdn) == 1 ? true : false; } + + public int[] getBasicAmt(Crdn crdn) { + int[] amt = {0, 0}; + + String taskSeCd = crdn.getTaskSeCd(); + + CrdnQuery query = new CrdnQuery(); + query.setTaskSeCd(crdn.getTaskSeCd()); + query.setAplcnYmd(crdn.getCrdnYmd()); + + String ffnlgCarmdlCd = crdn.getFfnlgCarmdlCd(); + if(taskSeCd.equals("PVS") || taskSeCd.equals("BPV") || taskSeCd.equals("TPV")) { + if(ifEmpty(ffnlgCarmdlCd, () -> "").equals("")) { + return amt; + } + } + + if(taskSeCd.equals("PVS")) { + query.setAmtDcsnCdGroupId("FIM055"); + String crdnSpareaCd = crdn.getCrdnSpareaCd(); + if(Arrays.asList(SAFE_TAG_AREA).contains(crdnSpareaCd)) { + query.setAmtDcsnCd("02"); + } else { + + String crdnTm = crdn.getCrdnTm(); + boolean workTimeYn = Integer.parseInt(crdnTm) >= 80000 && Integer.parseInt(crdnTm) <= 200000; + + if(crdnSpareaCd.equals("01") && workTimeYn) { + query.setAmtDcsnCd("03"); + } else if((crdnSpareaCd.equals("02") || crdnSpareaCd.equals("05")) && workTimeYn) { + query.setAmtDcsnCd("04"); + } else { + query.setAmtDcsnCd("01"); + } + } + + query.setDtlAmtDcsnCdGroupId("FIM056"); + if(Arrays.asList(CAR_GROUP1).contains(ffnlgCarmdlCd)) { + query.setDtlAmtDcsnCd("01"); + } + if(Arrays.asList(CAR_GROUP2).contains(ffnlgCarmdlCd)) { + query.setDtlAmtDcsnCd("02"); + } + + int ffnlgAmt = crdn05Mapper.selectBasicAmt(query); + if(crdn.getOvtimeYn().equals("Y")) { + ffnlgAmt += 10000; + } + + amt[0] = ffnlgAmt; + amt[1] = (int)(ffnlgAmt * 0.8); + + } else if(taskSeCd.equals("BPV")) { + + query.setAmtDcsnCdGroupId("FIM056"); + if(Arrays.asList(CAR_GROUP1).contains(ffnlgCarmdlCd)) { + query.setAmtDcsnCd("01"); + } + if(Arrays.asList(CAR_GROUP2).contains(ffnlgCarmdlCd)) { + query.setAmtDcsnCd("02"); + } + if(Arrays.asList(CAR_GROUP3).contains(ffnlgCarmdlCd)) { + query.setAmtDcsnCd("03"); + } + + int ffnlgAmt = crdn05Mapper.selectBasicAmt(query); + amt[0] = ffnlgAmt; + amt[1] = ffnlgAmt; + + } else if(taskSeCd.equals("DPV")) { + + query.setAmtDcsnCdGroupId("FIM006"); + query.setAmtDcsnCd(crdn.getVltnCd()); + + int ffnlgAmt = crdn05Mapper.selectBasicAmt(query); + amt[0] = ffnlgAmt; + amt[1] = (int)(ffnlgAmt * 0.8); + + } else if(taskSeCd.equals("ECA")) { + + int ffnlgAmt = crdn05Mapper.selectBasicAmt(query); + amt[0] = ffnlgAmt; + amt[1] = (int)(ffnlgAmt * 0.8); + + } else if(taskSeCd.equals("TPV")) { + + query.setAmtDcsnCdGroupId("FIM057"); + + if(ffnlgCarmdlCd.equals("21")) { + query.setAmtDcsnCd("01"); + query.setDtlAmtDcsnCdGroupId("FIM059"); + + String vltnNmtm = crdn.getVltnNmtm(); + if(vltnNmtm == null || vltnNmtm.equals("") || vltnNmtm.equals("0") || vltnNmtm.equals("1")) { + query.setDtlAmtDcsnCd("01"); + } else if(vltnNmtm.equals("2")) { + query.setDtlAmtDcsnCd("02"); + } else { + query.setDtlAmtDcsnCd("03"); + } + } + + + if(ffnlgCarmdlCd.equals("13") || ffnlgCarmdlCd.equals("14")) { + query.setAmtDcsnCd("02"); + query.setDtlAmtDcsnCdGroupId("FIM058"); + //query.setDtlAmtDcsnCd(업종); // TODO : 차주 업종 + } + + int ffnlgAmt = crdn05Mapper.selectBasicAmt(query); + amt[0] = ffnlgAmt; + boolean isPenaltyAmt = (crdn.getFfnlgCarmdlCd().equals("13") || crdn.getFfnlgCarmdlCd().equals("14")); //과징금 + if(isPenaltyAmt) { + amt[1] = (ffnlgAmt); + } else { + amt[1] = (int)(ffnlgAmt * 0.8); + } + + } + + return amt; + } } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05ServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05ServiceBean.java index 2fdaec15..cee5d03c 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05ServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05ServiceBean.java @@ -18,7 +18,6 @@ import cokr.xit.fims.crdn.dao.Crdn05Mapper; import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.excl.Excl01; import cokr.xit.fims.excl.service.bean.Excl01Bean; -import cokr.xit.fims.task.service.TaskService; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -45,21 +44,6 @@ public class Crdn05ServiceBean extends AbstractServiceBean implements CrdnServic @Resource(name="crdnSttsHstryBean") private CrdnSttsHstryBean crdnSttsHstryBean; - @Resource(name = "pvsService") - private TaskService pvsService; - - @Resource(name = "bpvService") - private TaskService bpvService; - - @Resource(name = "dpvService") - private TaskService dpvService; - - @Resource(name = "ecaService") - private TaskService ecaService; - - @Resource(name = "tpvService") - private TaskService tpvService; - @Override public List getCrackdownList(CrdnQuery req) { req.setCurrentUserId(currentUser().getId()); @@ -79,31 +63,9 @@ public class Crdn05ServiceBean extends AbstractServiceBean implements CrdnServic if(ifEmpty(crdn.getAtchFileCnt(), () -> 0) == 0) { crdn.setAtchFileCnt(0); } - int[] basicAmt; - switch (crdn.getTaskSeCd()) { - case "PVS": { - basicAmt = pvsService.getBasicAmt(crdn); - break; - } - case "BPV": { - basicAmt = bpvService.getBasicAmt(crdn); - break; - } - case "DPV": { - basicAmt = dpvService.getBasicAmt(crdn); - break; - } - case "ECA": { - basicAmt = ecaService.getBasicAmt(crdn); - break; - } - case "TPV": { - basicAmt = tpvService.getBasicAmt(crdn); - break; - } - default: - throw new IllegalArgumentException("Unexpected value: " + crdn.getTaskSeCd()); - } + + int[] basicAmt = crdn05Bean.getBasicAmt(crdn); + crdn.setFfnlgAmt(basicAmt[0]); crdn.setLevyAmt(basicAmt[0]); crdn.setAdvntceLevyAmt(basicAmt[1]); diff --git a/src/main/java/cokr/xit/fims/task/service/TaskService.java b/src/main/java/cokr/xit/fims/task/service/TaskService.java deleted file mode 100644 index c6dc6891..00000000 --- a/src/main/java/cokr/xit/fims/task/service/TaskService.java +++ /dev/null @@ -1,12 +0,0 @@ -package cokr.xit.fims.task.service; - -import cokr.xit.fims.crdn.Crdn; - -public interface TaskService { - - /**기본금액을 계산한다. - * @param crdn 대장 정보 - * @return 최초과태료/과징금 금액,사전통보금액 - */ - public int[] getBasicAmt(Crdn crdn); -} diff --git a/src/main/java/cokr/xit/fims/task/service/bean/BpvServiceBean.java b/src/main/java/cokr/xit/fims/task/service/bean/BpvServiceBean.java deleted file mode 100644 index e77a4e47..00000000 --- a/src/main/java/cokr/xit/fims/task/service/bean/BpvServiceBean.java +++ /dev/null @@ -1,62 +0,0 @@ -package cokr.xit.fims.task.service.bean; - -import javax.annotation.Resource; - -import org.assertj.core.util.Arrays; -import org.springframework.stereotype.Service; - -import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.fims.crdn.dao.Crdn05Mapper; -import cokr.xit.fims.task.service.TaskService; -import cokr.xit.foundation.component.AbstractServiceBean; - -/**업무 서비스 인터페이스의 전용차로위반 업무 서비스 구현체 - * @author leebj - */ -@Service("bpvService") -public class BpvServiceBean extends AbstractServiceBean implements TaskService { - - public String[] CAR_GROUP1 = {"12","14","15","21"}; //승합자동차등 - public String[] CAR_GROUP2 = {"11","13"}; //승용자동차등 - public String[] CAR_GROUP3 = {"31"}; //이륜자동차등 - - @Resource(name = "crdn05Mapper") - private Crdn05Mapper crdn05Mapper; - - @Override - public int[] getBasicAmt(Crdn crdn) { - int[] amt = {0, 0}; - - - CrdnQuery query = new CrdnQuery(); - query.setTaskSeCd(crdn.getTaskSeCd()); - query.setAplcnYmd(crdn.getCrdnYmd()); - - String ffnlgCarmdlCd = crdn.getFfnlgCarmdlCd(); - - - if(ifEmpty(ffnlgCarmdlCd, () -> "").equals("")) { - return amt; - } - - query.setAmtDcsnCdGroupId("FIM056"); - if(Arrays.asList(CAR_GROUP1).contains(ffnlgCarmdlCd)) { - query.setAmtDcsnCd("01"); - } - if(Arrays.asList(CAR_GROUP2).contains(ffnlgCarmdlCd)) { - query.setAmtDcsnCd("02"); - } - if(Arrays.asList(CAR_GROUP3).contains(ffnlgCarmdlCd)) { - query.setAmtDcsnCd("03"); - } - - - - int ffnlgAmt = crdn05Mapper.selectBasicAmt(query); - amt[0] = ffnlgAmt; - amt[1] = ffnlgAmt; - - return amt; - } -} diff --git a/src/main/java/cokr/xit/fims/task/service/bean/DpvServiceBean.java b/src/main/java/cokr/xit/fims/task/service/bean/DpvServiceBean.java deleted file mode 100644 index ba9b8a9a..00000000 --- a/src/main/java/cokr/xit/fims/task/service/bean/DpvServiceBean.java +++ /dev/null @@ -1,37 +0,0 @@ -package cokr.xit.fims.task.service.bean; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.fims.crdn.dao.Crdn05Mapper; -import cokr.xit.fims.task.service.TaskService; -import cokr.xit.foundation.component.AbstractServiceBean; - -/**업무 서비스 인터페이스의 장애인주차구역위반 업무 구현체 - * @author leebj - */ -@Service("dpvService") -public class DpvServiceBean extends AbstractServiceBean implements TaskService { - @Resource(name = "crdn05Mapper") - private Crdn05Mapper crdn05Mapper; - - @Override - public int[] getBasicAmt(Crdn crdn) { - int[] amt = {0, 0}; - - CrdnQuery query = new CrdnQuery(); - query.setTaskSeCd(crdn.getTaskSeCd()); - query.setAplcnYmd(crdn.getCrdnYmd()); - - query.setAmtDcsnCdGroupId("FIM006"); - query.setAmtDcsnCd(crdn.getVltnCd()); - - int ffnlgAmt = crdn05Mapper.selectBasicAmt(query); - amt[0] = ffnlgAmt; - amt[1] = (int)(ffnlgAmt * 0.8); - return amt; - } -} diff --git a/src/main/java/cokr/xit/fims/task/service/bean/EcaServiceBean.java b/src/main/java/cokr/xit/fims/task/service/bean/EcaServiceBean.java deleted file mode 100644 index 60f8d98f..00000000 --- a/src/main/java/cokr/xit/fims/task/service/bean/EcaServiceBean.java +++ /dev/null @@ -1,34 +0,0 @@ -package cokr.xit.fims.task.service.bean; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.fims.crdn.dao.Crdn05Mapper; -import cokr.xit.fims.task.service.TaskService; -import cokr.xit.foundation.component.AbstractServiceBean; - -/**업무 서비스 인터페이스의 전기차주차구역위반 업무 구현체 - * @author leebj - */ -@Service("ecaService") -public class EcaServiceBean extends AbstractServiceBean implements TaskService { - @Resource(name = "crdn05Mapper") - private Crdn05Mapper crdn05Mapper; - - @Override - public int[] getBasicAmt(Crdn crdn) { - int[] amt = {0, 0}; - - CrdnQuery query = new CrdnQuery(); - query.setTaskSeCd(crdn.getTaskSeCd()); - query.setAplcnYmd(crdn.getCrdnYmd()); - - int ffnlgAmt = crdn05Mapper.selectBasicAmt(query); - amt[0] = ffnlgAmt; - amt[1] = (int)(ffnlgAmt * 0.8); - return amt; - } -} diff --git a/src/main/java/cokr/xit/fims/task/service/bean/PvsServiceBean.java b/src/main/java/cokr/xit/fims/task/service/bean/PvsServiceBean.java deleted file mode 100644 index 71eb4dfd..00000000 --- a/src/main/java/cokr/xit/fims/task/service/bean/PvsServiceBean.java +++ /dev/null @@ -1,78 +0,0 @@ -package cokr.xit.fims.task.service.bean; - -import javax.annotation.Resource; - -import org.assertj.core.util.Arrays; -import org.springframework.stereotype.Service; - -import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.fims.crdn.dao.Crdn05Mapper; -import cokr.xit.fims.task.service.TaskService; -import cokr.xit.foundation.component.AbstractServiceBean; - -/**업무 서비스 인터페이스의 주정차위반 업무 서비스 구현체 - * @author leebj - */ -@Service("pvsService") -public class PvsServiceBean extends AbstractServiceBean implements TaskService { - - public String[] SAFE_TAG_AREA = {"03","06","07"}; //안전표지구역 - - public String[] CAR_GROUP1 = {"12","14","15","21"}; //승합자동차등 - public String[] CAR_GROUP2 = {"11","13"}; //승용자동차등 - - @Resource(name = "crdn05Mapper") - private Crdn05Mapper crdn05Mapper; - - @Override - public int[] getBasicAmt(Crdn crdn) { - int[] amt = {0, 0}; - - CrdnQuery query = new CrdnQuery(); - query.setTaskSeCd(crdn.getTaskSeCd()); - query.setAplcnYmd(crdn.getCrdnYmd()); - - String ffnlgCarmdlCd = crdn.getFfnlgCarmdlCd(); - - if(ifEmpty(ffnlgCarmdlCd, () -> "").equals("")) { - return amt; - } - - query.setAmtDcsnCdGroupId("FIM055"); - String crdnSpareaCd = crdn.getCrdnSpareaCd(); - if(Arrays.asList(SAFE_TAG_AREA).contains(crdnSpareaCd)) { - query.setAmtDcsnCd("02"); - } else { - - String crdnTm = crdn.getCrdnTm(); - boolean workTimeYn = Integer.parseInt(crdnTm) >= 80000 && Integer.parseInt(crdnTm) <= 200000; - - if(crdnSpareaCd.equals("01") && workTimeYn) { - query.setAmtDcsnCd("03"); - } else if((crdnSpareaCd.equals("02") || crdnSpareaCd.equals("05")) && workTimeYn) { - query.setAmtDcsnCd("04"); - } else { - query.setAmtDcsnCd("01"); - } - } - - query.setDtlAmtDcsnCdGroupId("FIM056"); - if(Arrays.asList(CAR_GROUP1).contains(ffnlgCarmdlCd)) { - query.setDtlAmtDcsnCd("01"); - } - if(Arrays.asList(CAR_GROUP2).contains(ffnlgCarmdlCd)) { - query.setDtlAmtDcsnCd("02"); - } - - int ffnlgAmt = crdn05Mapper.selectBasicAmt(query); - if(crdn.getOvtimeYn().equals("Y")) { - ffnlgAmt += 10000; - } - - amt[0] = ffnlgAmt; - amt[1] = (int)(ffnlgAmt * 0.8); - return amt; - } - -} diff --git a/src/main/java/cokr/xit/fims/task/service/bean/TpvServiceBean.java b/src/main/java/cokr/xit/fims/task/service/bean/TpvServiceBean.java deleted file mode 100644 index da552124..00000000 --- a/src/main/java/cokr/xit/fims/task/service/bean/TpvServiceBean.java +++ /dev/null @@ -1,72 +0,0 @@ -package cokr.xit.fims.task.service.bean; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.fims.crdn.dao.Crdn05Mapper; -import cokr.xit.fims.task.service.TaskService; -import cokr.xit.foundation.component.AbstractServiceBean; - -/**업무 서비스 인터페이스의 밤샘주차 업무 서비스 구현체 - * @author leebj - */ -@Service("tpvService") -public class TpvServiceBean extends AbstractServiceBean implements TaskService { - @Resource(name = "crdn05Mapper") - private Crdn05Mapper crdn05Mapper; - - @Override - public int[] getBasicAmt(Crdn crdn) { - int[] amt = {0, 0}; - - - CrdnQuery query = new CrdnQuery(); - query.setTaskSeCd(crdn.getTaskSeCd()); - query.setAplcnYmd(crdn.getCrdnYmd()); - - String ffnlgCarmdlCd = crdn.getFfnlgCarmdlCd(); - - if(crdn.getTaskSeCd().equals("PVS") || crdn.getTaskSeCd().equals("BPV") || crdn.getTaskSeCd().equals("TPV")) { - if(ifEmpty(ffnlgCarmdlCd, () -> "").equals("")) { - return amt; - } - } - - query.setAmtDcsnCdGroupId("FIM057"); - - if(ffnlgCarmdlCd.equals("21")) { - query.setAmtDcsnCd("01"); - query.setDtlAmtDcsnCdGroupId("FIM059"); - - String vltnNmtm = crdn.getVltnNmtm(); - if(vltnNmtm == null || vltnNmtm.equals("") || vltnNmtm.equals("0") || vltnNmtm.equals("1")) { - query.setDtlAmtDcsnCd("01"); - } else if(vltnNmtm.equals("2")) { - query.setDtlAmtDcsnCd("02"); - } else { - query.setDtlAmtDcsnCd("03"); - } - } - - - if(ffnlgCarmdlCd.equals("13") || ffnlgCarmdlCd.equals("14")) { - query.setAmtDcsnCd("02"); - query.setDtlAmtDcsnCdGroupId("FIM058"); - //query.setDtlAmtDcsnCd(업종); // TODO : 차주 업종 - } - - int ffnlgAmt = crdn05Mapper.selectBasicAmt(query); - amt[0] = ffnlgAmt; - boolean isPenaltyAmt = (crdn.getFfnlgCarmdlCd().equals("13") || crdn.getFfnlgCarmdlCd().equals("14")); //과징금 - if(isPenaltyAmt) { - amt[1] = (ffnlgAmt); - } else { - amt[1] = (int)(ffnlgAmt * 0.8); - } - - return amt; - } -}