qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[1470] 배치도·계통도 및 구조도의 화질 개선 cell 이미지 추가

Browse Source
This commit is contained in:
ysCha 2026-03-11 17:59:49 +09:00
parent c38af81ad5
commit 28d050533e
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
View File

@ -1603,7 +1603,7 @@ public class EstimateService {
// 도면 이미지 셋팅 // 도면 이미지 셋팅
String baseDrawingImgName = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo(); String baseDrawingImgName = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo();
// 풀사이즈 이미지 (P1, P2 시트용) // 셀범위용 이미지 (기존 이미지명 유지: _1.png, _2.png)
URL url = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1.png"); URL url = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1.png");
byte[] drawingImg1 = loadDrawingImage(url); byte[] drawingImg1 = loadDrawingImage(url);
if (drawingImg1 != null) { if (drawingImg1 != null) {
@ -1618,22 +1618,22 @@ public class EstimateService {
} }
log.debug("url2 ::: {}", url2); log.debug("url2 ::: {}", url2);
// 셀범위용 이미지 (割付図・系統図, 架台図 시트용) // 풀사이즈 이미지 (P1, P2 시트용: _1_full.png, _2_full.png)
URL urlCell1 = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1_cell.png"); URL urlFull1 = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1_full.png");
byte[] drawingImg1Cell = loadDrawingImage(urlCell1); byte[] drawingImg1Full = loadDrawingImage(urlFull1);
if (drawingImg1Cell != null) { if (drawingImg1Full != null) {
estimateResponse.setDrawingImg1Cell(drawingImg1Cell); estimateResponse.setDrawingImg1Full(drawingImg1Full);
} else { } else {
// cell 이미지가 없으면 풀사이즈로 폴백 // full 이미지가 없으면 기존 이미지로 폴백
estimateResponse.setDrawingImg1Cell(drawingImg1); estimateResponse.setDrawingImg1Full(drawingImg1);
} }
URL urlCell2 = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_2_cell.png"); URL urlFull2 = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_2_full.png");
byte[] drawingImg2Cell = loadDrawingImage(urlCell2); byte[] drawingImg2Full = loadDrawingImage(urlFull2);
if (drawingImg2Cell != null) { if (drawingImg2Full != null) {
estimateResponse.setDrawingImg2Cell(drawingImg2Cell); estimateResponse.setDrawingImg2Full(drawingImg2Full);
} else { } else {
estimateResponse.setDrawingImg2Cell(drawingImg2); estimateResponse.setDrawingImg2Full(drawingImg2);
} }

12
src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java
View File

@ -221,17 +221,17 @@ public class EstimateResponse {
@Schema(description = "염해지역 아이템사용 여부") @Schema(description = "염해지역 아이템사용 여부")
private String saltAreaFlg; private String saltAreaFlg;
@Schema(description = "도면이미지1 (풀사이즈)") @Schema(description = "도면이미지1 (셀범위용, 기존)")
private byte[] drawingImg1; private byte[] drawingImg1;
@Schema(description = "도면이미지2 (풀사이즈)") @Schema(description = "도면이미지2 (셀범위용, 기존)")
private byte[] drawingImg2; private byte[] drawingImg2;
@Schema(description = "도면이미지1 (셀범위용)") @Schema(description = "도면이미지1 (풀사이즈, 여백없음)")
private byte[] drawingImg1Cell; private byte[] drawingImg1Full;
@Schema(description = "도면이미지2 (셀범위용)") @Schema(description = "도면이미지2 (풀사이즈, 여백없음)")
private byte[] drawingImg2Cell; private byte[] drawingImg2Full;
// 판매점 정보 // 판매점 정보
@Schema(description = "고객 판매점명") @Schema(description = "고객 판매점명")

BIN
src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx
View File

Binary file not shown.