|
|
@ -240,11 +240,11 @@ public class BasDosService { |
|
|
|
if (optional.isPresent()) { |
|
|
|
if (optional.isPresent()) { |
|
|
|
DosFltPlanArea area = optional.get(); |
|
|
|
DosFltPlanArea area = optional.get(); |
|
|
|
|
|
|
|
|
|
|
|
if (planRq.getFltElev() != null) area.setFltElev(planRq.getFltElev()); |
|
|
|
area.setFltElev(planRq.getFltElev()); |
|
|
|
if (planRq.getBufferZone() != null) area.setBufferZone(planRq.getBufferZone()); |
|
|
|
area.setBufferZone(planRq.getBufferZone()); |
|
|
|
if (StringUtils.hasText(planRq.getDtl())) area.setDtl(planRq.getDtl()); |
|
|
|
area.setDtl(planRq.getDtl()); |
|
|
|
if (StringUtils.hasText(planRq.getEra())) area.setEra(planRq.getEra()); |
|
|
|
area.setEra(planRq.getEra()); |
|
|
|
if (StringUtils.hasText(planRq.getRm())) area.setRm(planRq.getRm()); |
|
|
|
area.setRm(planRq.getRm()); |
|
|
|
|
|
|
|
|
|
|
|
area = dosFltPlanAreaRepository.save(area); |
|
|
|
area = dosFltPlanAreaRepository.save(area); |
|
|
|
|
|
|
|
|
|
|
@ -460,15 +460,15 @@ public class BasDosService { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void createPDF(List<BasDosPlanRs> rs){ |
|
|
|
public void createPDF(List<BasDosPlanRs> rs) { |
|
|
|
|
|
|
|
|
|
|
|
String todayDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yy.M.d")); |
|
|
|
String todayDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yy.M.d")); |
|
|
|
String todayWeek = LocalDate.now().getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.KOREAN).replace("요일", ""); |
|
|
|
String todayWeek = LocalDate.now().getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.KOREAN).replace("요일", ""); |
|
|
|
|
|
|
|
|
|
|
|
List<ValidPdfModel.ValidFlighgModel> validFlightList = new ArrayList<>(); |
|
|
|
List<ValidPdfModel.ValidFlighgModel> validFlightList = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
|
|
for(BasDosPlanRs basDosPlanRs : rs){ |
|
|
|
for (BasDosPlanRs basDosPlanRs : rs) { |
|
|
|
for(BasDosPlanAreaRs area : basDosPlanRs.getAreaList()){ |
|
|
|
for (BasDosPlanAreaRs area : basDosPlanRs.getAreaList()) { |
|
|
|
ValidPdfModel.ValidFlighgModel node = new ValidPdfModel.ValidFlighgModel(); |
|
|
|
ValidPdfModel.ValidFlighgModel node = new ValidPdfModel.ValidFlighgModel(); |
|
|
|
node.setApplyNm(basDosPlanRs.getApplyNm()); |
|
|
|
node.setApplyNm(basDosPlanRs.getApplyNm()); |
|
|
|
node.setAddr1(area.getAddr1()); |
|
|
|
node.setAddr1(area.getAddr1()); |
|
|
@ -518,7 +518,7 @@ public class BasDosService { |
|
|
|
converterProperties.setFontProvider(fontProvider); |
|
|
|
converterProperties.setFontProvider(fontProvider); |
|
|
|
|
|
|
|
|
|
|
|
HtmlConverter.convertToPdf(html, pdfDoc, converterProperties); |
|
|
|
HtmlConverter.convertToPdf(html, pdfDoc, converterProperties); |
|
|
|
}catch (IOException e){ |
|
|
|
} catch (IOException e) { |
|
|
|
log.error("", e); |
|
|
|
log.error("", e); |
|
|
|
throw new CustomException(ErrorCode.FILE_CREATE_FAIL); |
|
|
|
throw new CustomException(ErrorCode.FILE_CREATE_FAIL); |
|
|
|
} |
|
|
|
} |
|
|
|