|
|
@ -8,8 +8,6 @@ import com.itextpdf.kernel.pdf.PdfWriter; |
|
|
|
import com.itextpdf.layout.font.FontProvider; |
|
|
|
import com.itextpdf.layout.font.FontProvider; |
|
|
|
import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; |
|
|
|
import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; |
|
|
|
import com.palnet.biz.api.bas.dos.model.*; |
|
|
|
import com.palnet.biz.api.bas.dos.model.*; |
|
|
|
import com.palnet.biz.api.comn.coordinate.model.BoundaryModel; |
|
|
|
|
|
|
|
import com.palnet.biz.api.comn.coordinate.model.SearchDepartmentBoundaryRS; |
|
|
|
|
|
|
|
import com.palnet.biz.api.comn.coordinate.service.ComnCoordinateService; |
|
|
|
import com.palnet.biz.api.comn.coordinate.service.ComnCoordinateService; |
|
|
|
import com.palnet.biz.api.comn.file.model.ValidPdfModel; |
|
|
|
import com.palnet.biz.api.comn.file.model.ValidPdfModel; |
|
|
|
import com.palnet.biz.api.external.model.ApprovalCd; |
|
|
|
import com.palnet.biz.api.external.model.ApprovalCd; |
|
|
@ -22,7 +20,10 @@ import com.palnet.biz.jpa.entity.type.ReviewedType; |
|
|
|
import com.palnet.biz.jpa.repository.dos.*; |
|
|
|
import com.palnet.biz.jpa.repository.dos.*; |
|
|
|
import com.palnet.comn.code.ErrorCode; |
|
|
|
import com.palnet.comn.code.ErrorCode; |
|
|
|
import com.palnet.comn.exception.CustomException; |
|
|
|
import com.palnet.comn.exception.CustomException; |
|
|
|
import com.palnet.comn.utils.*; |
|
|
|
import com.palnet.comn.utils.AirspaceUtils; |
|
|
|
|
|
|
|
import com.palnet.comn.utils.AreaUtils; |
|
|
|
|
|
|
|
import com.palnet.comn.utils.HttpUtils; |
|
|
|
|
|
|
|
import com.palnet.comn.utils.PdfUtils; |
|
|
|
import kr.dogfoot.hwpxlib.object.HWPXFile; |
|
|
|
import kr.dogfoot.hwpxlib.object.HWPXFile; |
|
|
|
import kr.dogfoot.hwpxlib.object.content.section_xml.SectionXMLFile; |
|
|
|
import kr.dogfoot.hwpxlib.object.content.section_xml.SectionXMLFile; |
|
|
|
import kr.dogfoot.hwpxlib.object.content.section_xml.paragraph.Run; |
|
|
|
import kr.dogfoot.hwpxlib.object.content.section_xml.paragraph.Run; |
|
|
@ -43,7 +44,6 @@ import org.locationtech.jts.geom.Coordinate; |
|
|
|
import org.locationtech.jts.geom.Geometry; |
|
|
|
import org.locationtech.jts.geom.Geometry; |
|
|
|
import org.locationtech.jts.geom.GeometryFactory; |
|
|
|
import org.locationtech.jts.geom.GeometryFactory; |
|
|
|
import org.locationtech.jts.geom.Point; |
|
|
|
import org.locationtech.jts.geom.Point; |
|
|
|
import org.springframework.cache.annotation.Cacheable; |
|
|
|
|
|
|
|
import org.springframework.core.io.ClassPathResource; |
|
|
|
import org.springframework.core.io.ClassPathResource; |
|
|
|
import org.springframework.http.MediaType; |
|
|
|
import org.springframework.http.MediaType; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
@ -134,15 +134,15 @@ public class BasDosService { |
|
|
|
for (DosFltPlanArea area : areaList) { |
|
|
|
for (DosFltPlanArea area : areaList) { |
|
|
|
if (area.getPlanSno().equals(planSno)) { |
|
|
|
if (area.getPlanSno().equals(planSno)) { |
|
|
|
Optional<DosFltPlanResult> first = resultList.stream().filter(result -> result.getPlanAreaSno().equals(area.getPlanAreaSno())).findFirst(); |
|
|
|
Optional<DosFltPlanResult> first = resultList.stream().filter(result -> result.getPlanAreaSno().equals(area.getPlanAreaSno())).findFirst(); |
|
|
|
String approvalCd = ""; |
|
|
|
ApprovalCd approvalCd = null; |
|
|
|
Double fltElevMax = null; |
|
|
|
Double fltElevMax = null; |
|
|
|
if (first.isPresent()) { |
|
|
|
if (first.isPresent()) { |
|
|
|
DosFltPlanResult dosFltPlanResult = first.get(); |
|
|
|
DosFltPlanResult dosFltPlanResult = first.get(); |
|
|
|
approvalCd = dosFltPlanResult.getApprovalCd(); |
|
|
|
approvalCd = ApprovalCd.fromCode(dosFltPlanResult.getApprovalCd()); |
|
|
|
fltElevMax = dosFltPlanResult.getFltElevMax(); |
|
|
|
fltElevMax = dosFltPlanResult.getFltElevMax(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (rq.getApprovalCd() != null && !rq.getApprovalCd().equals(approvalCd)) { |
|
|
|
if (rq.getApprovalCd() != null && approvalCd != null && !rq.getApprovalCd().equals(approvalCd.getCode())) { |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -219,9 +219,18 @@ public class BasDosService { |
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
String addr3 = addrRest.toString(); |
|
|
|
String addr3 = addrRest.toString(); |
|
|
|
String limitZone = area.getLimitZone(); |
|
|
|
String limitZone = area.getLimitZone(); |
|
|
|
LimitZoneType limitZoneType = LimitZoneType.fromCode(limitZone); |
|
|
|
LimitZoneType limitZoneType = LimitZoneType.fromCode(limitZone); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ReviewedType reviewedType = area.getReviewedType() != null ? area.getReviewedType() : ReviewedType.WAIT; |
|
|
|
|
|
|
|
if(approvalCd == ApprovalCd.UNTARGETED_AREA) { |
|
|
|
|
|
|
|
reviewedType = ReviewedType.UNNECESSARY; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BasDosPlanAreaRs areaRs = BasDosPlanAreaRs.builder() |
|
|
|
BasDosPlanAreaRs areaRs = BasDosPlanAreaRs.builder() |
|
|
|
.planAreaSno(area.getPlanAreaSno()) |
|
|
|
.planAreaSno(area.getPlanAreaSno()) |
|
|
|
.planSno(area.getPlanSno()) |
|
|
|
.planSno(area.getPlanSno()) |
|
|
@ -238,12 +247,12 @@ public class BasDosService { |
|
|
|
.addr1(addr1) |
|
|
|
.addr1(addr1) |
|
|
|
.addr2(addr2) |
|
|
|
.addr2(addr2) |
|
|
|
.addr3(addr3) |
|
|
|
.addr3(addr3) |
|
|
|
.approvalCd(approvalCd) |
|
|
|
.approvalCd(approvalCd.getCode()) |
|
|
|
.fltElevMax(fltElevMax) |
|
|
|
.fltElevMax(fltElevMax) |
|
|
|
.dtl(area.getDtl()) |
|
|
|
.dtl(area.getDtl()) |
|
|
|
.era(area.getEra()) |
|
|
|
.era(area.getEra()) |
|
|
|
.rm(area.getRm()) |
|
|
|
.rm(area.getRm()) |
|
|
|
.reviewedType(area.getReviewedType() != null ? area.getReviewedType() : ReviewedType.WAIT) |
|
|
|
.reviewedType(reviewedType) |
|
|
|
.reqRadius(area.getReqRadius()) |
|
|
|
.reqRadius(area.getReqRadius()) |
|
|
|
.allowRadius(area.getAllowRadius()) |
|
|
|
.allowRadius(area.getAllowRadius()) |
|
|
|
.limitZoneCd(area.getLimitZone()) |
|
|
|
.limitZoneCd(area.getLimitZone()) |
|
|
|