소스 정리

main
mjkhan21 9 months ago
parent da89a27f4a
commit 88cc358db6

@ -52,11 +52,11 @@ public class CrdnStngServiceBean extends AbstractServiceBean implements CrdnStng
@Override @Override
public List<LayoutDescriptor> getLinkFileLayoutMetadata(String sggCd, String taskSeCd, String instCd, String deptCd) { public List<LayoutDescriptor> getLinkFileLayoutMetadata(String sggCd, String taskSeCd, String instCd, String deptCd) {
CrdnQuery query = new CrdnQuery(); CrdnQuery query = new CrdnQuery()
query.setSggCd(sggCd); .setSggCd(sggCd)
query.setTaskSeCd(taskSeCd); .setTaskSeCd(taskSeCd)
query.setInstCd(instCd); .setInstCd(instCd)
query.setDeptCd(deptCd); .setDeptCd(deptCd);
return crdnEqpmntBean.getLinkFileLayoutMetadata(query); return crdnEqpmntBean.getLinkFileLayoutMetadata(query);
} }
@ -98,37 +98,21 @@ public class CrdnStngServiceBean extends AbstractServiceBean implements CrdnStng
@Override @Override
public String createExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { public String createExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) {
boolean result = crdnStngBean.createExemptionVehicleInfo(exmptnVhcl); return crdnStngBean.createExemptionVehicleInfo(exmptnVhcl) ? "[S]" : "[F]";
if(result) {
return "[S]";
} else {
return "[F]";
}
} }
@Override @Override
public String updateExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { public String updateExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) {
boolean result = crdnStngBean.updateExemptionVehicleInfo(exmptnVhcl); return crdnStngBean.updateExemptionVehicleInfo(exmptnVhcl) ? "[S]" : "[F]";
if(result) {
return "[S]";
} else {
return "[F]";
}
} }
@Override @Override
public String removeExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { public String removeExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) {
boolean result = crdnStngBean.removeExemptionVehicleInfo(exmptnVhcl); return crdnStngBean.removeExemptionVehicleInfo(exmptnVhcl) ? "[S]" : "[F]";
if(result) {
return "[S]";
} else {
return "[F]";
}
} }
@Override @Override
public List<DataObject> getExemptionVehicleHistoryList(String exmptnVhclId) { public List<DataObject> getExemptionVehicleHistoryList(String exmptnVhclId) {
return crdnStngBean.getExemptionVehicleHistoryList(exmptnVhclId); return crdnStngBean.getExemptionVehicleHistoryList(exmptnVhclId);
} }
}
}

@ -201,12 +201,10 @@ public class ImportBean extends AbstractBean {
* @param basicInfoMap * @param basicInfoMap
*/ */
private void setVehicleInfo(List<Crdn> crdns, BiFunction<String, String, String> getCarModel) { private void setVehicleInfo(List<Crdn> crdns, BiFunction<String, String, String> getCarModel) {
Map<String, Payer> payerMap = new HashMap<String, Payer>(); Map<String, Payer> payerMap = new HashMap<String, Payer>();
//행공센 연계 여부 //행공센 연계 여부
if(ifEmpty(FimsConf.get().getPublicInfoCarYn(),() -> "Y").equals("Y")) { if(ifEmpty(FimsConf.get().getPublicInfoCarYn(),() -> "Y").equals("Y")) {
List<BasicInfoExtRequest> reqs = crdns.stream() List<BasicInfoExtRequest> reqs = crdns.stream()
.filter(crdn -> !isEmpty(crdn.getVhrno())) .filter(crdn -> !isEmpty(crdn.getVhrno()))
.map(crdn -> { .map(crdn -> {
@ -219,14 +217,13 @@ public class ImportBean extends AbstractBean {
for(BasicInfoExtRequest req : reqs) { for(BasicInfoExtRequest req : reqs) {
Payer p = payerBean.getVehicleOwner(new BasicInfoExtRequest()); Payer p = payerBean.getVehicleOwner(new BasicInfoExtRequest());
crdns.forEach(crdn -> { crdns.forEach(crdn -> {
if(req.getLevy_stdde().equals(crdn.getCrdnYmd()) if (req.getLevy_stdde().equals(crdn.getCrdnYmd())
&& req.getVhrno().equals(crdn.getVhrno()) && req.getVhrno().equals(crdn.getVhrno())
) { ) {
payerMap.put(crdn.getCrdnYmd()+","+crdn.getVhrno(), p); payerMap.put(crdn.getCrdnYmd()+","+crdn.getVhrno(), p);
} }
}); });
} }
} else { } else {
List<BasicInfoRequest> reqs = crdns.stream() List<BasicInfoRequest> reqs = crdns.stream()
.filter(crdn -> !isEmpty(crdn.getVhrno())) .filter(crdn -> !isEmpty(crdn.getVhrno()))
@ -239,7 +236,6 @@ public class ImportBean extends AbstractBean {
}).toList(); }).toList();
for(BasicInfoRequest req : reqs) { for(BasicInfoRequest req : reqs) {
Payer p = payerBean.getVehicleOwners(List.of(req)).get(0); Payer p = payerBean.getVehicleOwners(List.of(req)).get(0);
crdns.forEach(crdn -> { crdns.forEach(crdn -> {
if (req.getLevy_stdde().equals(crdn.getCrdnYmd()) if (req.getLevy_stdde().equals(crdn.getCrdnYmd())

@ -79,7 +79,6 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ
} }
importBean.createCvlcpts(petitions); importBean.createCvlcpts(petitions);
return 0; return 0;
} }

@ -124,5 +124,4 @@ public class Crdn03Controller extends ApplicationController {
return new ModelAndView("jsonView") return new ModelAndView("jsonView")
.addObject("saved", rtnMsg.contains("[S]")); .addObject("saved", rtnMsg.contains("[S]"));
} }
} }
Loading…
Cancel
Save