|
|
@ -1,27 +1,23 @@ |
|
|
|
package com.palnet.biz.api.bas.flight.controller; |
|
|
|
package com.palnet.biz.api.bas.flight.controller; |
|
|
|
|
|
|
|
|
|
|
|
import java.io.*; |
|
|
|
import java.io.BufferedReader; |
|
|
|
import java.net.HttpURLConnection; |
|
|
|
import java.io.IOException; |
|
|
|
import java.net.URL; |
|
|
|
import java.io.InputStream; |
|
|
|
|
|
|
|
import java.io.InputStreamReader; |
|
|
|
|
|
|
|
import java.io.UnsupportedEncodingException; |
|
|
|
import java.net.URLEncoder; |
|
|
|
import java.net.URLEncoder; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightAprovRq; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanArcrftModel; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanListRq; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanModel; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanPilotModel; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightScheduleRs; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightWeatherModel; |
|
|
|
|
|
|
|
import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlWeatherModel; |
|
|
|
|
|
|
|
import com.palnet.biz.scheduler.ctr.model.CtrTrnsLctnModel; |
|
|
|
|
|
|
|
import com.palnet.biz.scheduler.ctr.service.CtrTrnsLctnService; |
|
|
|
|
|
|
|
import org.json.simple.JSONObject; |
|
|
|
import org.json.simple.JSONObject; |
|
|
|
import org.json.simple.parser.JSONParser; |
|
|
|
import org.json.simple.parser.JSONParser; |
|
|
|
import org.json.simple.parser.ParseException; |
|
|
|
import org.json.simple.parser.ParseException; |
|
|
|
|
|
|
|
import org.locationtech.jts.geom.Coordinate; |
|
|
|
|
|
|
|
import org.locationtech.proj4j.BasicCoordinateTransform; |
|
|
|
|
|
|
|
import org.locationtech.proj4j.CRSFactory; |
|
|
|
|
|
|
|
import org.locationtech.proj4j.CoordinateReferenceSystem; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.core.env.Environment; |
|
|
|
import org.springframework.core.env.Environment; |
|
|
|
import org.springframework.core.io.ClassPathResource; |
|
|
|
import org.springframework.core.io.ClassPathResource; |
|
|
@ -39,12 +35,22 @@ import org.springframework.web.bind.annotation.RequestMapping; |
|
|
|
import org.springframework.web.bind.annotation.RequestParam; |
|
|
|
import org.springframework.web.bind.annotation.RequestParam; |
|
|
|
import org.springframework.web.bind.annotation.RestController; |
|
|
|
import org.springframework.web.bind.annotation.RestController; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightAprovRq; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanArcrftModel; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanListRq; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanModel; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanPilotModel; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightScheduleRs; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightWeatherModel; |
|
|
|
import com.palnet.biz.api.bas.flight.service.BasFlightService; |
|
|
|
import com.palnet.biz.api.bas.flight.service.BasFlightService; |
|
|
|
import com.palnet.biz.api.comn.model.ComnPagingRs; |
|
|
|
import com.palnet.biz.api.comn.model.ComnPagingRs; |
|
|
|
import com.palnet.biz.api.comn.response.BasicResponse; |
|
|
|
import com.palnet.biz.api.comn.response.BasicResponse; |
|
|
|
import com.palnet.biz.api.comn.response.ErrorResponse; |
|
|
|
import com.palnet.biz.api.comn.response.ErrorResponse; |
|
|
|
import com.palnet.biz.api.comn.response.SuccessResponse; |
|
|
|
import com.palnet.biz.api.comn.response.SuccessResponse; |
|
|
|
|
|
|
|
import com.palnet.biz.scheduler.ctr.service.CtrTrnsLctnService; |
|
|
|
import com.palnet.comn.exception.CustomException; |
|
|
|
import com.palnet.comn.exception.CustomException; |
|
|
|
|
|
|
|
import com.palnet.comn.utils.AreaUtils; |
|
|
|
|
|
|
|
|
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
@ -60,12 +66,14 @@ public class BasFlightController { |
|
|
|
private final BasFlightService basFlightService; |
|
|
|
private final BasFlightService basFlightService; |
|
|
|
private final Environment env; |
|
|
|
private final Environment env; |
|
|
|
private final CtrTrnsLctnService ctrTrnsLctnService; |
|
|
|
private final CtrTrnsLctnService ctrTrnsLctnService; |
|
|
|
|
|
|
|
private final AreaUtils utils; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
@Autowired |
|
|
|
public BasFlightController(BasFlightService basFlightService, Environment env, CtrTrnsLctnService ctrTrnsLctnService) { |
|
|
|
public BasFlightController(BasFlightService basFlightService, Environment env, CtrTrnsLctnService ctrTrnsLctnService, AreaUtils AreaUtils) { |
|
|
|
this.basFlightService = basFlightService; |
|
|
|
this.basFlightService = basFlightService; |
|
|
|
this.env = env; |
|
|
|
this.env = env; |
|
|
|
this.ctrTrnsLctnService = ctrTrnsLctnService; |
|
|
|
this.ctrTrnsLctnService = ctrTrnsLctnService; |
|
|
|
|
|
|
|
this.utils = AreaUtils; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/area") |
|
|
|
@GetMapping("/area") |
|
|
@ -378,4 +386,19 @@ public class BasFlightController { |
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<List>(response)); |
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<List>(response)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//test
|
|
|
|
|
|
|
|
@GetMapping("/test") |
|
|
|
|
|
|
|
public void createCircleTest(@RequestParam double getX, @RequestParam double getY, @RequestParam double buffer) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Coordinate circleCoord = new Coordinate(getX, getY); |
|
|
|
|
|
|
|
List<Coordinate> transCoord = new ArrayList<Coordinate>(); |
|
|
|
|
|
|
|
transCoord.add(circleCoord); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
transCoord = utils.transform(transCoord, "EPSG:4326", "EPSG:5181"); |
|
|
|
|
|
|
|
List<Coordinate> coordList = utils.createCircle(transCoord.get(0), buffer); |
|
|
|
|
|
|
|
coordList = utils.transform(coordList, "EPSG:5181", "EPSG:4326"); |
|
|
|
|
|
|
|
for(Coordinate a : coordList) { |
|
|
|
|
|
|
|
System.out.println(a.getX() + ", " + a.getY()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|