Browse Source

create 리턴값 boolean으로 롤백

feature/auth
박재우 2 years ago
parent
commit
68c315e7a6
  1. 1
      src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java
  2. 19
      src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java

1
src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java

@ -93,6 +93,7 @@ public class BasFlightController {
log.info(">>> rq : {}", rq);
boolean result = basFlightService.createPlan(rq);
resultMap.put("result", result);
log.info(">>> resultMap : " , resultMap);
} catch (CustomException e) {
log.error("IGNORE : {}", e);

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

@ -110,7 +110,7 @@ public class BasFlightService {
}
// 비행계획서 등록
public BasFlightPlanResultMessageRq createPlan(BasFlightPlanModel rq) {
public boolean createPlan(BasFlightPlanModel rq) {
// 비행계획서 등록 시 계획일자 중복 , 비행구역 중복 체크
BasFlightPlanResultMessageRq ReturnCheck = new BasFlightPlanResultMessageRq();
GeometryFactory geometryFactory = new GeometryFactory();
@ -120,11 +120,8 @@ public class BasFlightService {
String idntfNum = arcrftModelList.get(i).getIdntfNum();
int size = fltPlanQueryRepository.arcrftCheck(rq, idntfNum).size();
if( size != 0) {
ReturnCheck.setDateCheck(false);
ReturnCheck.setFinalCheck(false);
return ReturnCheck;
}else {
ReturnCheck.setDateCheck(true);
return false;
}
}
List<Coordinate> coordList = new ArrayList<>();
@ -240,16 +237,12 @@ public class BasFlightService {
queryContains = true;
break;
}
}
}
boolean check = FlightUtils.overlaps(rqPoly, queryPoly);
boolean checks = FlightUtils.overlaps(queryPoly, rqPoly);
if(check == true || checks == true || rqContains == true || queryContains == true) {
ReturnCheck.setAreaCheck(false);
ReturnCheck.setFinalCheck(false);
return ReturnCheck;
return false;
}
ReturnCheck.setAreaCheck(true);
ReturnCheck.setFinalCheck(true);
}
//비행계획서
String userId = jwtTokenUtil.getCstmrSnoByToken().toString();
@ -304,7 +297,7 @@ public class BasFlightService {
fltPlanArcrftRepository.save(arcrftEntity);
}
}
return ReturnCheck;
return true;
}
// 비행계획서 수정

Loading…
Cancel
Save