diff --git a/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java b/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java index 62af2ae..2dbdfc4 100644 --- a/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java +++ b/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java @@ -7,6 +7,7 @@ import javax.annotation.Resource; import cokr.xit.base.code.CommonCode; import cokr.xit.base.code.dao.CodeMapper; +import cokr.xit.fims.Vhrno; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.excl.LevyExcl; @@ -114,6 +115,7 @@ public class ChongnoTaskProcessor extends TaskProcessor { if (capacity == 0) return excluded; + Vhrno vhrno = new Vhrno(); for (Crdn crdn: crdns) { if (excluded.containsKey(crdn)) continue; @@ -122,13 +124,32 @@ public class ChongnoTaskProcessor extends TaskProcessor { // 정원미확인 -> 초기상태 } else if (vhclCpct < capacity) // 정원미만 excluded.put(crdn, newLevyExcl(crdn, "1", "114")); - else if (vhclCpct >= capacity) // 정원초과 -> 계도(시범운영) - excluded.put(crdn, newLevyExcl(crdn, "2", "206")); + else if (vhclCpct >= capacity) { + boolean enforce = isTarget(vhrno, crdn); + if (enforce) + excluded.put(crdn, newLevyExcl(crdn, "2", "206")); // 정원초과 -> 계도(시범운영) + else + excluded.put(crdn, newLevyExcl(crdn, "1", "199")); // 부과제외(기타) + } } return excluded; } + /**차량이 승합차거나 일반 운수사업용인지 반환한다. + * @param vhrno Vhrno + * @param crdn 단속정보 + * @return 차량이 승합차거나 일반 운수사업용인지 여부 + */ + private boolean isTarget(Vhrno vhrno, Crdn crdn) { + return true; +/* + vhrno.setFullNumber(crdn.getVhrno()); + return Vhrno.VAN.equals(vhrno.getVehicleType()) + || vhrno.isCommercial(); +*/ + } + @Override public LevyExcl getLevyExcl(Crdn crdn) { LevyExcl excl = super.getLevyExcl(crdn); @@ -150,9 +171,11 @@ public class ChongnoTaskProcessor extends TaskProcessor { if (vhclCpct < capacity) // 정원미만 return newLevyExcl(crdn, "1", "114"); - if (vhclCpct >= capacity) // 정원초과 -> 계도(시범운영) - return newLevyExcl(crdn, "2", "206"); - return null; + boolean enforce = vhclCpct >= capacity && isTarget(new Vhrno(), crdn); + if (enforce) // 정원초과, 승합차, 운수사업 일반 -> 단속대상: 계도(시범운영) + return newLevyExcl(crdn, "2", "206"); + else + return newLevyExcl(crdn, "1", "199"); // 부과제외(기타) } } \ No newline at end of file