|
|
@ -11,8 +11,11 @@ import java.net.URLEncoder; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
import java.util.Optional; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.*; |
|
|
|
import com.palnet.biz.api.bas.flight.model.*; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.json.simple.JSONObject; |
|
|
|
import org.json.simple.JSONObject; |
|
|
@ -30,11 +33,13 @@ import com.palnet.biz.api.acnt.jwt.model.JwtGroupModel; |
|
|
|
import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; |
|
|
|
import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; |
|
|
|
import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; |
|
|
|
import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; |
|
|
|
import com.palnet.biz.api.comn.model.ComnPagingRs; |
|
|
|
import com.palnet.biz.api.comn.model.ComnPagingRs; |
|
|
|
|
|
|
|
import com.palnet.biz.jpa.entity.ComFileBas; |
|
|
|
import com.palnet.biz.jpa.entity.FltPlanArcrft; |
|
|
|
import com.palnet.biz.jpa.entity.FltPlanArcrft; |
|
|
|
import com.palnet.biz.jpa.entity.FltPlanArea; |
|
|
|
import com.palnet.biz.jpa.entity.FltPlanArea; |
|
|
|
import com.palnet.biz.jpa.entity.FltPlanAreaCoord; |
|
|
|
import com.palnet.biz.jpa.entity.FltPlanAreaCoord; |
|
|
|
import com.palnet.biz.jpa.entity.FltPlanBas; |
|
|
|
import com.palnet.biz.jpa.entity.FltPlanBas; |
|
|
|
import com.palnet.biz.jpa.entity.FltPlanPilot; |
|
|
|
import com.palnet.biz.jpa.entity.FltPlanPilot; |
|
|
|
|
|
|
|
import com.palnet.biz.jpa.repository.com.ComFileBasRepository; |
|
|
|
import com.palnet.biz.jpa.repository.flt.FltPlanArcrftRepository; |
|
|
|
import com.palnet.biz.jpa.repository.flt.FltPlanArcrftRepository; |
|
|
|
import com.palnet.biz.jpa.repository.flt.FltPlanAreaCoordRepository; |
|
|
|
import com.palnet.biz.jpa.repository.flt.FltPlanAreaCoordRepository; |
|
|
|
import com.palnet.biz.jpa.repository.flt.FltPlanAreaRepository; |
|
|
|
import com.palnet.biz.jpa.repository.flt.FltPlanAreaRepository; |
|
|
@ -67,6 +72,7 @@ public class BasFlightService { |
|
|
|
private final FltPlanPilotRepository fltPlanPilotRepository; |
|
|
|
private final FltPlanPilotRepository fltPlanPilotRepository; |
|
|
|
private final FltPlanQueryRepository fltPlanQueryRepository; |
|
|
|
private final FltPlanQueryRepository fltPlanQueryRepository; |
|
|
|
private final PtyGroupQueryRepository ptyPlanQueryRepository; |
|
|
|
private final PtyGroupQueryRepository ptyPlanQueryRepository; |
|
|
|
|
|
|
|
private final ComFileBasRepository comFileBasRepository; |
|
|
|
private final JwtTokenUtil jwtTokenUtil; |
|
|
|
private final JwtTokenUtil jwtTokenUtil; |
|
|
|
private final AreaUtils areaUtils; |
|
|
|
private final AreaUtils areaUtils; |
|
|
|
|
|
|
|
|
|
|
@ -78,7 +84,8 @@ public class BasFlightService { |
|
|
|
FltPlanQueryRepository fltPlanQueryRepository, |
|
|
|
FltPlanQueryRepository fltPlanQueryRepository, |
|
|
|
PtyGroupQueryRepository ptyPlanQueryRepository, |
|
|
|
PtyGroupQueryRepository ptyPlanQueryRepository, |
|
|
|
JwtTokenUtil jwtTokenUtil, |
|
|
|
JwtTokenUtil jwtTokenUtil, |
|
|
|
AreaUtils areaUtils) { |
|
|
|
AreaUtils areaUtils, |
|
|
|
|
|
|
|
ComFileBasRepository comFileBasRepository) { |
|
|
|
this.fltPlanBasRepository = fltPlanBasRepository; |
|
|
|
this.fltPlanBasRepository = fltPlanBasRepository; |
|
|
|
this.fltPlanArcrftRepository = fltPlanArcrftRepository; |
|
|
|
this.fltPlanArcrftRepository = fltPlanArcrftRepository; |
|
|
|
this.fltPlanAreaRepository = fltPlanAreaRepository; |
|
|
|
this.fltPlanAreaRepository = fltPlanAreaRepository; |
|
|
@ -88,6 +95,7 @@ public class BasFlightService { |
|
|
|
this.ptyPlanQueryRepository = ptyPlanQueryRepository; |
|
|
|
this.ptyPlanQueryRepository = ptyPlanQueryRepository; |
|
|
|
this.jwtTokenUtil = jwtTokenUtil; |
|
|
|
this.jwtTokenUtil = jwtTokenUtil; |
|
|
|
this.areaUtils = areaUtils; |
|
|
|
this.areaUtils = areaUtils; |
|
|
|
|
|
|
|
this.comFileBasRepository = comFileBasRepository; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 비행계획서 조회
|
|
|
|
// 비행계획서 조회
|
|
|
@ -747,4 +755,12 @@ public class BasFlightService { |
|
|
|
|
|
|
|
|
|
|
|
return jsonObject; |
|
|
|
return jsonObject; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void fileDownload(int fileSno, HttpServletResponse response) throws CustomException{ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ComFileBas comFileBas = comFileBasRepository.findById(fileSno).orElse(null); |
|
|
|
|
|
|
|
if(comFileBas == null) throw new CustomException(ErrorCode.DATA_NOTFIND); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|