Browse Source

feat: dpf 폰트 수정

feature/address-coordinate
지대한 3 months ago
parent
commit
cb1b5aec89
  1. 5
      http/server/server.http
  2. 41
      pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java
  3. BIN
      pav-server/src/main/resources/templates/fonts/H2HDRM.ttf
  4. BIN
      pav-server/src/main/resources/templates/fonts/HMKSM.ttf
  5. BIN
      pav-server/src/main/resources/templates/fonts/NanumMyeongjo.ttf
  6. BIN
      pav-server/src/main/resources/templates/fonts/NanumMyeongjoBold.ttf
  7. BIN
      pav-server/src/main/resources/templates/fonts/NanumMyeongjoExtraBold.ttf
  8. BIN
      pav-server/src/main/resources/templates/fonts/malgun.ttf
  9. BIN
      pav-server/src/main/resources/templates/fonts/malgunbd.ttf
  10. BIN
      pav-server/src/main/resources/templates/fonts/휴먼명조.TTF
  11. 57
      pav-server/src/main/resources/templates/laanc/valid_document.html

5
http/server/server.http

@ -110,3 +110,8 @@ Content-Type: application/json
### dos(드론원스톱) excel download
GET {{appHost}}/api/bas/dos/plan/download/excel?searchStDt=2024-06-14&searchEndDt=2024-06-14
Authorization: {{accessToken}}
### dos(드론원스톱) pdf download
GET {{appHost}}/api/bas/dos/plan/download/pdf?searchStDt=2024-06-14&searchEndDt=2024-06-14
Authorization: {{accessToken}}

41
pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java

@ -468,6 +468,34 @@ public class BasDosService {
List<ValidPdfModel.ValidFlighgModel> validFlightList = new ArrayList<>();
for(BasDosPlanRs basDosPlanRs : rs){
for(BasDosPlanAreaRs area : basDosPlanRs.getAreaList()){
ValidPdfModel.ValidFlighgModel node = new ValidPdfModel.ValidFlighgModel();
node.setApplyNm(basDosPlanRs.getApplyNm());
node.setAddr1(area.getAddr1());
node.setAddr2(area.getAddr2());
node.setAddr3(area.getAddr3());
node.setFltElev(area.getFltElev());
node.setFltElevMax(area.getFltElevMax());
node.setRm(area.getRm());
validFlightList.add(node);
}
}
for(BasDosPlanRs basDosPlanRs : rs){
for(BasDosPlanAreaRs area : basDosPlanRs.getAreaList()){
ValidPdfModel.ValidFlighgModel node = new ValidPdfModel.ValidFlighgModel();
node.setApplyNm(basDosPlanRs.getApplyNm());
node.setAddr1(area.getAddr1());
node.setAddr2(area.getAddr2());
node.setAddr3(area.getAddr3());
node.setFltElev(area.getFltElev());
node.setFltElevMax(area.getFltElevMax());
node.setRm(area.getRm());
validFlightList.add(node);
}
}
for(BasDosPlanRs basDosPlanRs : rs){
for(BasDosPlanAreaRs area : basDosPlanRs.getAreaList()){
ValidPdfModel.ValidFlighgModel node = new ValidPdfModel.ValidFlighgModel();
@ -502,9 +530,16 @@ public class BasDosService {
ConverterProperties converterProperties = new ConverterProperties();
FontProvider fontProvider = new FontProvider();
fontProvider.addFont("templates/fonts/gulim003.ttf", PdfEncodings.IDENTITY_H);
fontProvider.addFont("templates/fonts/gulim004.ttf", PdfEncodings.IDENTITY_H);
fontProvider.addFont("templates/fonts/H2GTRE.ttf", PdfEncodings.IDENTITY_H);
// 맑은고딕
fontProvider.addFont("templates/fonts/malgun.ttf", PdfEncodings.IDENTITY_H);
fontProvider.addFont("templates/fonts/malgunbd.ttf", PdfEncodings.IDENTITY_H);
// HY헤드라인M
fontProvider.addFont("templates/fonts/H2HDRM.ttf", PdfEncodings.IDENTITY_H);
// 휴면명조
fontProvider.addFont("templates/fonts/NanumMyeongjo.ttf", PdfEncodings.IDENTITY_H);
fontProvider.addFont("templates/fonts/NanumMyeongjoBold.ttf", PdfEncodings.IDENTITY_H);
fontProvider.addFont("templates/fonts/NanumMyeongjoExtraBold.ttf", PdfEncodings.IDENTITY_H);
String defaultFontFamily = fontProvider.getDefaultFontFamily();
log.debug(">>> defaultFontFamily : {}", defaultFontFamily);
converterProperties.setFontProvider(fontProvider);

BIN
pav-server/src/main/resources/templates/fonts/H2HDRM.ttf

Binary file not shown.

BIN
pav-server/src/main/resources/templates/fonts/HMKSM.ttf

Binary file not shown.

BIN
pav-server/src/main/resources/templates/fonts/NanumMyeongjo.ttf

Binary file not shown.

BIN
pav-server/src/main/resources/templates/fonts/NanumMyeongjoBold.ttf

Binary file not shown.

BIN
pav-server/src/main/resources/templates/fonts/NanumMyeongjoExtraBold.ttf

Binary file not shown.

BIN
pav-server/src/main/resources/templates/fonts/malgun.ttf

Binary file not shown.

BIN
pav-server/src/main/resources/templates/fonts/malgunbd.ttf

Binary file not shown.

BIN
pav-server/src/main/resources/templates/fonts/휴먼명조.TTF

Binary file not shown.

57
pav-server/src/main/resources/templates/laanc/valid_document.html

@ -4,46 +4,57 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<style>
body {
font-family: 'malgun gothic'
}
table th.header{
border:1px solid #777;background:#e0eed1;padding:4px;text-align:center;vertical-align:middle;font-size:15px;height:40px;font-weight: bold;
}
table td.body{
border:1px solid #777;background:#fff;padding:4px;text-align:center;vertical-align:middle;font-size:14px;height:45px;
}
</style>
</head>
<body>
<div style="width:100%;max-width:780px;margin:20px auto;">
<div style="text-align:center;">
<h2 style="margin:20px auto;font-size:20px;border-top:3px solid #0045d4;border-bottom:3px solid #0045d4;
background:#ebf6f7;padding:8px 0;">
<div style="margin:20px 0 0 0;font-size:20px;border-top:3px solid #0045d4;border-bottom:3px solid #0045d4;
background:#ebf6f7;padding:8px 0;font-family: 'hyheadline-medium'">
관제권 내 초경량비행장치 비행승인 관련 검토 결과
</h2>
</div>
</div>
<div style="text-align:right">
<span>[[${todayDate}]]([[${todayWeek}]]) 관제통신과</span>
<span style="font-family: 'nanummyeongjo';">`[[${todayDate}]]([[${todayWeek}]]), 관제통신과</span>
</div>
<div>
<h4 style="font-size:17px;margin-top:0;">비행승인 관련 검토 결과 <span style="font-size:15px">(검토 구역 : 23개소)</span></h4>
<div style="font-size:17px;margin:20px 0 10px 0;font-family: 'nanummyeongjo'; font-weight: bold">비행승인 관련 검토 결과 <span style="font-size:15px; font-family: 'nanummyeongjo'; font-weight: normal;">(검토 구역 : 23개소)</span></div>
</div>
<div>
<table style="width:100%;border-collapse: collapse">
<thead>
<!-- <thead>-->
<tr>
<th style="border:1px solid #777;background:#e0eed1;padding:4px;text-align:center;vertical-align:middle;font-size:15px;height:50px">순번</th>
<th style="border:1px solid #777;background:#e0eed1;padding:4px;text-align:center;vertical-align:middle;font-size:15px;height:50px">민원인</th>
<th style="border:1px solid #777;background:#e0eed1;padding:4px;text-align:center;vertical-align:middle;font-size:15px;height:50px">행정구역1</th>
<th style="border:1px solid #777;background:#e0eed1;padding:4px;text-align:center;vertical-align:middle;font-size:15px;height:50px">행정구역2</th>
<th style="border:1px solid #777;background:#e0eed1;padding:4px;text-align:center;vertical-align:middle;font-size:15px;height:50px">상세주소</th>
<th style="border:1px solid #777;background:#e0eed1;padding:4px;text-align:center;vertical-align:middle;font-size:15px;height:50px">반경<br>(m)</th>
<th style="border:1px solid #777;background:#e0eed1;padding:4px;text-align:center;vertical-align:middle;font-size:15px;height:50px">최고비행<br>해발고도(m)</th>
<th style="border:1px solid #777;background:#e0eed1;padding:4px;text-align:center;vertical-align:middle;font-size:15px;height:50px">비고</th>
<th class="header">순번</th>
<th class="header">민원인</th>
<th class="header">행정구역1</th>
<th class="header">행정구역2</th>
<th class="header">상세주소</th>
<th class="header">반경<br>(m)</th>
<th class="header">최고비행<br>해발고도(m)</th>
<th class="header">비고</th>
</tr>
</thead>
<!-- </thead>-->
<tbody>
<th:block th:each="data:${validFlightList}">
<tr>
<td style="border:1px solid #777;background:#fff;padding:4px;text-align:center;vertical-align:middle;font-size:14px;height:50px"><span th:text="${dataStat.count}"></span></td>
<td style="border:1px solid #777;background:#fff;padding:4px;text-align:center;vertical-align:middle;font-size:14px;height:50px"><span th:text="${data.applyNm}"></span></td>
<td style="border:1px solid #777;background:#fff;padding:4px;text-align:center;vertical-align:middle;font-size:14px;height:50px"><span th:text="${data.addr1}"></span></td>
<td style="border:1px solid #777;background:#fff;padding:4px;text-align:center;vertical-align:middle;font-size:14px;height:50px"><span th:text="${data.addr2}"></span></td>
<td style="border:1px solid #777;background:#fff;padding:4px;text-align:center;vertical-align:middle;font-size:14px;height:50px"><span th:text="${data.addr3}"></span></td>
<td style="border:1px solid #777;background:#fff;padding:4px;text-align:center;vertical-align:middle;font-size:14px;height:50px"><span th:text="${data.fltElev}"></span></td>
<td style="border:1px solid #777;background:#fff;padding:4px;text-align:center;vertical-align:middle;font-size:14px;height:50px"><span th:text="${data.fltElevMax}"></span></td>
<td style="border:1px solid #777;background:#fff;padding:4px;text-align:center;vertical-align:middle;font-size:14px;height:50px"><span th:text="${data.rm}"></span></td>
<td class="body"><span th:text="${dataStat.count}"></span></td>
<td class="body"><span th:text="${data.applyNm}"></span></td>
<td class="body"><span th:text="${data.addr1}"></span></td>
<td class="body"><span th:text="${data.addr2}"></span></td>
<td class="body"><span th:text="${data.addr3}"></span></td>
<td class="body"><span th:text="${data.fltElev}"></span></td>
<td class="body"><span th:text="${data.fltElevMax}"></span></td>
<td class="body"><span th:text="${data.rm}"></span></td>
</tr>
</th:block>
</tbody>

Loading…
Cancel
Save