|
|
@ -6,6 +6,8 @@ import java.io.InputStream; |
|
|
|
import java.io.InputStreamReader; |
|
|
|
import java.io.InputStreamReader; |
|
|
|
import java.io.UnsupportedEncodingException; |
|
|
|
import java.io.UnsupportedEncodingException; |
|
|
|
import java.net.URLEncoder; |
|
|
|
import java.net.URLEncoder; |
|
|
|
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
|
|
|
|
import java.time.Instant; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
@ -18,21 +20,15 @@ import org.locationtech.jts.geom.Coordinate; |
|
|
|
import org.locationtech.proj4j.CRSFactory; |
|
|
|
import org.locationtech.proj4j.CRSFactory; |
|
|
|
import org.locationtech.proj4j.CoordinateReferenceSystem; |
|
|
|
import org.locationtech.proj4j.CoordinateReferenceSystem; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
|
|
|
import org.springframework.beans.propertyeditors.CustomDateEditor; |
|
|
|
import org.springframework.core.env.Environment; |
|
|
|
import org.springframework.core.env.Environment; |
|
|
|
import org.springframework.core.io.ClassPathResource; |
|
|
|
import org.springframework.core.io.ClassPathResource; |
|
|
|
import org.springframework.core.io.Resource; |
|
|
|
import org.springframework.core.io.Resource; |
|
|
|
import org.springframework.http.HttpStatus; |
|
|
|
import org.springframework.http.HttpStatus; |
|
|
|
import org.springframework.http.MediaType; |
|
|
|
import org.springframework.http.MediaType; |
|
|
|
import org.springframework.http.ResponseEntity; |
|
|
|
import org.springframework.http.ResponseEntity; |
|
|
|
import org.springframework.web.bind.annotation.DeleteMapping; |
|
|
|
import org.springframework.web.bind.WebDataBinder; |
|
|
|
import org.springframework.web.bind.annotation.GetMapping; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
import org.springframework.web.bind.annotation.PathVariable; |
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.PostMapping; |
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.PutMapping; |
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestBody; |
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping; |
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestParam; |
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightAprovRq; |
|
|
|
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.BasFlightPlanArcrftModel; |
|
|
@ -106,6 +102,7 @@ public class BasFlightController { |
|
|
|
public ResponseEntity<? extends BasicResponse> findPlanList(BasFlightPlanListRq rq) { |
|
|
|
public ResponseEntity<? extends BasicResponse> findPlanList(BasFlightPlanListRq rq) { |
|
|
|
ComnPagingRs<BasFlightPlanModel> result = null; |
|
|
|
ComnPagingRs<BasFlightPlanModel> result = null; |
|
|
|
// System.out.println(rq);
|
|
|
|
// System.out.println(rq);
|
|
|
|
|
|
|
|
log.error(">>> rq : {}", rq); |
|
|
|
try { |
|
|
|
try { |
|
|
|
result = basFlightService.listPlan(rq); |
|
|
|
result = basFlightService.listPlan(rq); |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
@ -142,7 +139,7 @@ public class BasFlightController { |
|
|
|
public ResponseEntity<? extends BasicResponse> createPlan(@RequestBody BasFlightPlanModel rq) { |
|
|
|
public ResponseEntity<? extends BasicResponse> createPlan(@RequestBody BasFlightPlanModel rq) { |
|
|
|
Map<String, Object> resultMap = new HashMap<String, Object>(); |
|
|
|
Map<String, Object> resultMap = new HashMap<String, Object>(); |
|
|
|
try { |
|
|
|
try { |
|
|
|
log.info(">>> rq : {}", rq); |
|
|
|
log.error(">>> rq : {}", rq); |
|
|
|
boolean result = basFlightService.createPlan(rq); |
|
|
|
boolean result = basFlightService.createPlan(rq); |
|
|
|
resultMap.put("result", result); |
|
|
|
resultMap.put("result", result); |
|
|
|
log.info(">>> resultMap : " , resultMap); |
|
|
|
log.info(">>> resultMap : " , resultMap); |
|
|
@ -397,4 +394,5 @@ public class BasFlightController { |
|
|
|
System.out.println("["+a.getX() + ", " + a.getY()+"],"); |
|
|
|
System.out.println("["+a.getX() + ", " + a.getY()+"],"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|