Browse Source

비행계획서 - 수정시에도 필터 동일하게 적용 , syso 제거

feature/auth
박재우 2 years ago
parent
commit
2363218fbe
  1. 4
      src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java
  2. 11
      src/main/java/com/palnet/comn/utils/AreaUtils.java

4
src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java

@ -272,6 +272,10 @@ public class BasFlightService {
// 비행계획서 수정 // 비행계획서 수정
public boolean updatePlan(BasFlightPlanModel rq) { public boolean updatePlan(BasFlightPlanModel rq) {
// 비행계획서 유효성 검사.
this.planValid(rq);
if (rq != null && rq.getPlanSno() != null) { if (rq != null && rq.getPlanSno() != null) {
String userId = jwtTokenUtil.getCstmrSnoByToken().toString(); String userId = jwtTokenUtil.getCstmrSnoByToken().toString();
Integer planSno = rq.getPlanSno(); Integer planSno = rq.getPlanSno();

11
src/main/java/com/palnet/comn/utils/AreaUtils.java

@ -103,17 +103,10 @@ public class AreaUtils {
public boolean overlaps(List<Coordinate> targetCoordList, List<Coordinate> effectiveCoordList) { public boolean overlaps(List<Coordinate> targetCoordList, List<Coordinate> effectiveCoordList) {
targetCoordList.add(targetCoordList.get(0)); targetCoordList.add(targetCoordList.get(0));
Polygon targetPolygon = geometryFactory.createPolygon(targetCoordList.toArray(new Coordinate[] {})); Polygon targetPolygon = geometryFactory.createPolygon(targetCoordList.toArray(new Coordinate[] {}));
Coordinate[] coords = targetPolygon.getCoordinates();
for(Coordinate coord : coords) {
System.out.println(coord.x + "," + coord.y);
}
effectiveCoordList.add(effectiveCoordList.get(0)); effectiveCoordList.add(effectiveCoordList.get(0));
Polygon effectivePolygon = geometryFactory.createPolygon(effectiveCoordList.toArray(new Coordinate[] {})); Polygon effectivePolygon = geometryFactory.createPolygon(effectiveCoordList.toArray(new Coordinate[] {}));
System.out.println("ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ");
Coordinate[] coords2 = effectivePolygon.getCoordinates();
for(Coordinate coord : coords2) {
System.out.println(coord.x + "," + coord.y);
}
return targetPolygon.overlaps(effectivePolygon); return targetPolygon.overlaps(effectivePolygon);
} }

Loading…
Cancel
Save