pav
/
pav-server
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[LDRA] 113S : 코드의 비 표준 문자 - 모든 내용에 한글이 들어가면 안된다.

feature/ldra
leehagjoon(이학준) 1 year ago
parent
d52548e6d1
commit
fb4d218b81
16 changed files with 149 additions and 212 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 41
      src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java
  2. 25
      src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java
  3. 2
      src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java
  4. 17
      src/main/java/com/palnet/biz/api/acnt/jwt/controller/JwtAuthenticationController.java
  5. 6
      src/main/java/com/palnet/biz/api/acnt/terms/controller/AcntTermsController.java
  6. 16
      src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java
  7. 21
      src/main/java/com/palnet/biz/api/anls/smlt/controller/AnlsSmltController.java
  8. 35
      src/main/java/com/palnet/biz/api/bas/dron/controller/BasDronController.java
  9. 52
      src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java
  10. 9
      src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupAprvController.java
  11. 40
      src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java
  12. 12
      src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupJoinController.java
  13. 12
      src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java
  14. 48
      src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java
  15. 23
      src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java
  16. 2
      src/main/java/com/palnet/biz/config/SwaggerConfig.java

41
src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java
Unescape View File

@ -3,6 +3,7 @@ package com.palnet.biz.api.acnt.crtfyhp.controller;
import java.util.HashMap;
import java.util.Map;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@ -34,7 +35,7 @@ import lombok.extern.log4j.Log4j2;
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/api/acnt/crtfyhp", produces = {MediaType.APPLICATION_JSON_VALUE})
@Tag(name = "휴대폰 인증 관리", description = "회원 휴대폰 인증 관련 API")
@Api(tags = {"Mobile Phone Authentication API"} , value = "AcntCrtfyhpController")
public class AcntCrtfyhpController {
@Autowired
@ -45,8 +46,7 @@ public class AcntCrtfyhpController {
@GetMapping(value = "/register/send")
@Tag(name = "휴대폰 인증 관리", description = "회원 휴대폰 인증 관련 API")
@ApiImplicitParam(name = "hnpo",value = "휴대폰번호", dataTypeClass = String.class)
@ApiImplicitParam(name = "hnpo",value = "hnpo", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> send(String hpno) {
@ -87,10 +87,9 @@ public class AcntCrtfyhpController {
@GetMapping(value = "/register/confirm")
@Tag(name = "휴대폰 인증 관리", description = "회원 휴대폰 인증 관련 API")
@ApiImplicitParams({
@ApiImplicitParam(name = "hpno",value = "휴대폰번호", dataTypeClass = String.class),
@ApiImplicitParam(name = "crtfyNo",value = "인증일련번호", dataTypeClass = String.class)
@ApiImplicitParam(name = "hpno",value = "hpno", dataTypeClass = String.class),
@ApiImplicitParam(name = "crtfyNo",value = "crtfyNo", dataTypeClass = String.class)
})
public ResponseEntity<? extends BasicResponse> confirm(String hpno , String crtfyNo) {
@ -122,11 +121,10 @@ public class AcntCrtfyhpController {
//아이디 찾기 시 인증번호 발송 로직
@GetMapping(value = "/find/sendForId")
@ApiOperation(value = "아이디 찾기 시 인증번호 발송")
@Tag(name = "휴대폰 인증 관리", description = "회원 휴대폰 인증 관련 API")
@ApiOperation(value = "Find Id and Send crftyNo")
@ApiImplicitParams({
@ApiImplicitParam(name = "memberName", value = "회원 이름", dataTypeClass = String.class),
@ApiImplicitParam(name = "hpno", value = "휴대폰 번호", dataTypeClass = String.class)
@ApiImplicitParam(name = "memberName", value = "memberName", dataTypeClass = String.class),
@ApiImplicitParam(name = "hpno", value = "hpno", dataTypeClass = String.class)
})
public ResponseEntity<? extends BasicResponse> sendForId(String memberName, String hpno) {
Map<String, Object> resultMap = new HashMap<String, Object>();
@ -154,11 +152,10 @@ public class AcntCrtfyhpController {
//아이디 찾기
@GetMapping(value = "/find/findUserId")
@ApiOperation(value = "회원 아이디 찾기")
@Tag(name = "휴대폰 인증 관리", description = "회원 휴대폰 인증 관련 API")
@ApiOperation(value = "Find Member Id")
@ApiImplicitParams({
@ApiImplicitParam(name = "memberName",value = "회원이름", dataTypeClass = String.class),
@ApiImplicitParam(name = "hpno",value = "휴대폰번호", dataTypeClass = String.class)
@ApiImplicitParam(name = "memberName",value = "memberName", dataTypeClass = String.class),
@ApiImplicitParam(name = "hpno",value = "hpno", dataTypeClass = String.class)
})
public ResponseEntity<? extends BasicResponse> findUserId(String memberName, String hpno) {
Map<String, Object> resultMap = new HashMap<String, Object>();
@ -188,11 +185,10 @@ public class AcntCrtfyhpController {
//비밀번호 찾기 시 인증번호 발송 로직
@GetMapping(value = "/find/sendForPw")
@ApiOperation(value = "비밀번호 찾기 시 인증번호 발송")
@Tag(name = "휴대폰 인증 관리", description = "회원 휴대폰 인증 관련 API")
@ApiOperation(value = "Find PW and Send crtfyNo")
@ApiImplicitParams({
@ApiImplicitParam(name = "userId",value = "사용자ID", dataTypeClass = String.class),
@ApiImplicitParam(name = "hpno",value = "휴대폰번호", dataTypeClass = String.class)
@ApiImplicitParam(name = "userId",value = "userId", dataTypeClass = String.class),
@ApiImplicitParam(name = "hpno",value = "hpno", dataTypeClass = String.class)
})
public ResponseEntity<? extends BasicResponse> sendForPw(String userId, String hpno) {
Map<String, Object> resultMap = new HashMap<String, Object>();
@ -221,12 +217,11 @@ public class AcntCrtfyhpController {
@GetMapping(value = "/find/updatePw")
@ApiOperation(value = "비밀번호 찾기 및 업데이트")
@Tag(name = "휴대폰 인증 관리", description = "회원 휴대폰 인증 관련 API")
@ApiOperation(value = "Find PW and UPDATE PW")
@ApiImplicitParams({
@ApiImplicitParam(name = "userID",value = "사용자ID", dataTypeClass = String.class),
@ApiImplicitParam(name = "hpno",value = "휴대폰번호", dataTypeClass = String.class),
@ApiImplicitParam(name = "newPw",value = "새로운 비밀번호", dataTypeClass = String.class)
@ApiImplicitParam(name = "userID",value = "userID", dataTypeClass = String.class),
@ApiImplicitParam(name = "hpno",value = "hpno", dataTypeClass = String.class),
@ApiImplicitParam(name = "newPw",value = "newPw", dataTypeClass = String.class)
})
public ResponseEntity<? extends BasicResponse> updatePw(String userId, String hpno, String newPw) throws Exception {
Map<String, Object> resultMap = new HashMap<String, Object>();

25
src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java
Unescape View File

@ -11,6 +11,7 @@ import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrEmModel;
import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel;
import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrPwModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Parameter;
@ -50,15 +51,14 @@ import lombok.extern.log4j.Log4j2;
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/api/acnt/cstmr", produces = {MediaType.APPLICATION_JSON_VALUE})
@Tag(name = "회원관리", description = "회원 관련 API")
@Api(tags = {"Member Management API"}, value = "AcntCstmrController")
public class AcntCstmrController {
@Autowired
private final AcntCstmrService service;
@PostMapping(value = "/register")
@ApiOperation(value = "회원 가입")
@Tag(name = "회원관리", description = "회원 관련 API")
@ApiOperation(value = "Join User")
public ResponseEntity<? extends BasicResponse> register(@RequestBody AcntCstmrRqModel rq) {
AcntCstmrRsModel result;
@ -79,9 +79,8 @@ public class AcntCstmrController {
}
@GetMapping(value = "/profile/{cstmrSno}")
@ApiOperation(value = "회원 정보")
@Tag(name = "회원관리", description = "회원 관련 API")
@ApiImplicitParam(name = "cstmrSno",value = "고객일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "User Info")
@ApiImplicitParam(name = "cstmrSno",value = "cstmrSno", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> mypage(@PathVariable Integer cstmrSno){
List<AnctCstmerRlModel> result = null;
@ -100,8 +99,7 @@ public class AcntCstmrController {
}
@PostMapping(value = "/profile/pswdupdate")
@ApiOperation(value = "회원 패스워드 변경")
@Tag(name = "회원관리", description = "회원 관련 API")
@ApiOperation(value = "Password Update")
public ResponseEntity<? extends BasicResponse> passwordupdate(@RequestBody AcntCstmrPwModel rq){
Map<String, Object> resultMap = new HashMap<String, Object>();
try {
@ -123,8 +121,7 @@ public class AcntCstmrController {
}
@PostMapping(value = "/profile/pwcheck")
@ApiOperation(value = "회원 기존 패스워드 확인")
@Tag(name = "회원관리", description = "회원 관련 API")
@ApiOperation(value = "Member Check Existing PW")
public ResponseEntity<? extends BasicResponse> extendpsw(@RequestBody Map<String,String> userPswdMap){
Map<String, Object> resultMap = new HashMap<String, Object>();
try {
@ -146,8 +143,7 @@ public class AcntCstmrController {
}
@PutMapping(value = "/profile/update")
@ApiOperation(value = "회원 정보 변경 (이메일,핸드폰)")
@Tag(name = "회원관리", description = "회원 관련 API")
@ApiOperation(value = "Member Info update EMAIL,HPNO")
public ResponseEntity<? extends BasicResponse> updateEmail(@RequestBody AcntCstmrEmModel rq){
Map<String, Object> resultMap = new HashMap<String, Object>();
try {
@ -171,9 +167,8 @@ public class AcntCstmrController {
}
@PostMapping(value = "/profile/delete/{cstmrSno}")
@ApiOperation(value = "회원 탈퇴")
@Tag(name = "회원관리", description = "회원 관련 API")
@ApiImplicitParam(name = "cstmrSno",value = "고객일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "Member Delete")
@ApiImplicitParam(name = "cstmrSno",value = "cstmrSno", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> userDelete(@PathVariable Integer cstmrSno){
Map<String, Object> resultMap = new HashMap<String, Object>();
try {

2
src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java
Unescape View File

@ -244,7 +244,7 @@ public class AcntCstmrService {
// 4. RQ의 암호화한 패스워드와 DB에서 조회한 유저의 패스워드랑 비교
if(!userPswd.equals(userEntity.getUserPswd())) {
log.info("USERPSWD 비밀번호 : {}, DB 비밀번호 : {}", userPswd, userEntity.getUserPswd());
log.info("USERPSWD PW : {}, DB PW : {}", userPswd, userEntity.getUserPswd());
// 4.e 일치하지 않으면 예외처리 (패스워드 불일치)
throw new CustomException(ErrorCode.FAIL); // 임시,, 수정해야함

17
src/main/java/com/palnet/biz/api/acnt/jwt/controller/JwtAuthenticationController.java
Unescape View File

@ -3,6 +3,7 @@ package com.palnet.biz.api.acnt.jwt.controller;
import java.util.HashMap;
import java.util.Map;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@ -44,7 +45,7 @@ import lombok.extern.log4j.Log4j2;
@RequiredArgsConstructor
@Log4j2
@RequestMapping(value = "/api/acnt/jwt", produces = {MediaType.APPLICATION_JSON_VALUE})
@Tag(name = "JWT 토큰 이용", description = "JWT 토큰 관련 API")
@Api(tags = {"JWT API"},value = "JwtAuthenticationController")
public class JwtAuthenticationController {
@Autowired
@ -58,8 +59,7 @@ public class JwtAuthenticationController {
private JwtService service;
@PostMapping(value = "/login")
@ApiOperation(value = "로그인")
@Tag(name = "JWT 토큰 이용", description = "JWT 토큰 관련 API")
@ApiOperation(value = "login")
public ResponseEntity<? extends BasicResponse> createAuthenticationToken(@RequestBody JwtRqModel authenticationRequest) throws Exception {
Map<String , Object> resultMap = service.loginProcess(authenticationRequest);
@ -82,9 +82,8 @@ public class JwtAuthenticationController {
}
@GetMapping(value = "/profile/{cstmrSno}")
@ApiOperation(value = "로그인한 회원의 정보")
@Tag(name = "JWT 토큰 이용", description = "JWT 토큰 관련 API")
@ApiImplicitParam(name = "cstmrSno",value = "고객일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "login user Info")
@ApiImplicitParam(name = "cstmrSno",value = "cstmrSno", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> proflie(@PathVariable Integer cstmrSno) throws Exception{
JwtProfileRsModel result = service.profile(cstmrSno);
@ -97,7 +96,6 @@ public class JwtAuthenticationController {
@PostMapping(value = "/refresh")
@Tag(name = "JWT 토큰 이용", description = "JWT 토큰 관련 API")
// public ResponseEntity<? extends BasicResponse> refresh(@RequestParam("cstmrSno") int cstmrSno , @RequestParam("refreshToken") String refreshToken) throws Exception{
public ResponseEntity<? extends BasicResponse> refresh(@RequestBody Map body) throws Exception{
@ -125,9 +123,8 @@ public class JwtAuthenticationController {
}
@GetMapping(value = "/logout/{cstmrSno}")
@ApiOperation(value = "로그아웃 한 회원의 정보")
@Tag(name = "JWT 토큰 이용", description = "JWT 토큰 관련 API")
@ApiImplicitParam(name = "cstmrSno",value = "고객일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "logout user Info")
@ApiImplicitParam(name = "cstmrSno",value = "cstmrSno", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> logout(@PathVariable Integer cstmrSno) throws Exception{
// if(cstmrSno == null || !(body.get("cstmrSno") instanceof Integer)) {

6
src/main/java/com/palnet/biz/api/acnt/terms/controller/AcntTermsController.java
Unescape View File

@ -2,6 +2,7 @@ package com.palnet.biz.api.acnt.terms.controller;
import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
@ -37,7 +38,7 @@ import lombok.extern.log4j.Log4j2;
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/api/acnt/terms", produces = {MediaType.APPLICATION_JSON_VALUE})
@Tag(name = "약관 기본", description = "약관 관련 API")
@Api(value = "AcntTermsController", tags = {"Terms Basic API"})
public class AcntTermsController {
@Autowired
@ -46,8 +47,7 @@ public class AcntTermsController {
@GetMapping(value = "/list")
@Tag(name = "약관 기본", description = "약관 관련 API")
@ApiOperation(value = "약관 기본 정보")
@ApiOperation(value = "Terms Info")
public ResponseEntity<? extends BasicResponse> list(AcntTermsRqModel rq) {
List<AcntTermsRsModel> result = null;

16
src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java
Unescape View File

@ -3,6 +3,7 @@ package com.palnet.biz.api.anls.hstry.controller;
import java.util.List;
import com.palnet.biz.api.comn.model.ComnPagingRs;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -34,7 +35,7 @@ import lombok.extern.log4j.Log4j2;
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/api/anls/hstry", produces = {MediaType.APPLICATION_JSON_VALUE})
@Tag(name = "비행 이력 현황", description = "비행 이력 현황 관련 API")
@Api(value = "AnlsHstryController",tags = {"Flight History Status API"})
public class AnlsHstryController {
@Autowired
@ -42,8 +43,7 @@ public class AnlsHstryController {
@GetMapping(value = "/list")
@ApiOperation(value = "비행 현황 목록 출력")
@Tag(name = "비행 이력 현황", description = "비행 이력 현황 관련 API")
@ApiOperation(value = "Flight Status List")
public ResponseEntity<? extends BasicResponse> list(AnlsHstryGroupModel rq) {
List<AnlsHstryModel> rs = null;
ComnPagingRs<AnlsHstryModel> response;
@ -68,9 +68,8 @@ public class AnlsHstryController {
}
@GetMapping(value = "/detail/{id}")
@ApiOperation(value = "비행 현황 상세")
@Tag(name = "비행 이력 현황", description = "비행 이력 현황 관련 API")
@ApiImplicitParam(name = "id",value = "관제ID", dataTypeClass = String.class)
@ApiOperation(value = "Flight Status Detail")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> detail(@PathVariable String id) {
AnlsHstryModel result = null;
@ -89,9 +88,8 @@ public class AnlsHstryController {
@GetMapping(value = "/log/{id}")
@ApiOperation(value = "비행 이력 데이터")
@Tag(name = "비행 이력 현황", description = "비행 이력 현황 관련 API")
@ApiImplicitParam(name = "id",value = "관제ID", dataTypeClass = String.class)
@ApiOperation(value = "Flight History Log")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> log(@PathVariable String id) {
List<AnlsHstryDetailModel> result = null;
try {

21
src/main/java/com/palnet/biz/api/anls/smlt/controller/AnlsSmltController.java
Unescape View File

@ -2,6 +2,7 @@ package com.palnet.biz.api.anls.smlt.controller;
import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@ -35,7 +36,7 @@ import lombok.extern.log4j.Log4j2;
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/api/anls/smlt", produces = {MediaType.APPLICATION_JSON_VALUE})
@Tag(name = "비행 시뮬레이션", description = "비행 이력 시뮬레이션 관련 API")
@Api(value = "AnlsSmltController",tags = {"Flight History Simulation API"})
public class AnlsSmltController {
@Autowired
@ -47,8 +48,7 @@ public class AnlsSmltController {
* @return
*/
@GetMapping(value = "/list")
@ApiOperation(value = "비행 현황 목록")
@Tag(name = "비행 시뮬레이션", description = "비행 이력 시뮬레이션 관련 API")
@ApiOperation(value = "Flight status List")
public ResponseEntity<? extends BasicResponse> list(AnlsHstryRqModel rq) {
ComnPagingRs<AnlsHstryModel> result = null;
@ -82,9 +82,8 @@ public class AnlsSmltController {
* @return
*/
@GetMapping(value = "/hist/{id}")
@ApiOperation(value = "비행 이력 데이터 조회")
@Tag(name = "비행 시뮬레이션", description = "비행 이력 시뮬레이션 관련 API")
@ApiImplicitParam(name = "id",value = "관제ID", dataTypeClass = String.class)
@ApiOperation(value = "Flight History")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> histList(@PathVariable String id) {
List<AnlsHstryDetailModel> result = null;
@ -109,9 +108,8 @@ public class AnlsSmltController {
* @return
*/
@GetMapping(value = "/stcs/{id}")
@ApiOperation(value = "통계 데이터 조회")
@Tag(name = "비행 시뮬레이션", description = "비행 이력 시뮬레이션 관련 API")
@ApiImplicitParam(name = "id",value = "관제ID", dataTypeClass = String.class)
@ApiOperation(value = "Query Statistical data")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> stcsList(@PathVariable String id) {
List<AnlsSmltStcsModel> result = null;
@ -136,9 +134,8 @@ public class AnlsSmltController {
* @return
*/
@GetMapping(value = "/detail/{id}")
@ApiOperation(value = "비행 상세정보 조회")
@Tag(name = "비행 시뮬레이션", description = "비행 이력 시뮬레이션 관련 API")
@ApiImplicitParam(name = "id",value = "관제ID", dataTypeClass = String.class)
@ApiOperation(value = "Flight Detail")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> detail(@PathVariable String id) {
AnlsSmltDetailModel result = null;

35
src/main/java/com/palnet/biz/api/bas/dron/controller/BasDronController.java
Unescape View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@ -40,7 +41,7 @@ import lombok.extern.log4j.Log4j2;
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/api/bas/dron", produces = {MediaType.APPLICATION_JSON_VALUE})
@Tag(name = "드론 컨트롤러", description = "드론 관련 API")
@Api(value = "BasDronController",tags = {"Drone Information API"})
public class BasDronController {
@Autowired
@ -53,8 +54,7 @@ public class BasDronController {
* @return
*/
@GetMapping(value = "/list")
@ApiOperation(value = "드론 목록 조회")
@Tag(name = "드론 컨트롤러", description = "드론 관련 API")
@ApiOperation(value = "Drone List")
public ResponseEntity<? extends BasicResponse> list(BasDronRqModel rq) {
ComnPagingRs<BasDronModel> result = null;
@ -85,9 +85,8 @@ public class BasDronController {
* @return
*/
@GetMapping(value = "/idntf/list/{id}")
@ApiOperation(value = "식별정보 조회")
@Tag(name = "드론 컨트롤러", description = "드론 관련 API")
@ApiImplicitParam(name = "id",value = "기체일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "Idntf List")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> mylist(@PathVariable Integer id) {
List<BasIdntfModel> result = null;
@ -118,9 +117,8 @@ public class BasDronController {
* @return
*/
@GetMapping(value = "/detail/{id}")
@ApiOperation(value = "드론 상세 조회")
@Tag(name = "드론 컨트롤러", description = "드론 관련 API")
@ApiImplicitParam(name = "id",value = "기체일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "Drone Detail")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> detail(@PathVariable Integer id) {
BasDronModel result = null;
@ -150,8 +148,7 @@ public class BasDronController {
* @return
*/
@PostMapping(value = "/create")
@ApiOperation(value = "드론정보 생성")
@Tag(name = "드론 컨트롤러", description = "드론 관련 API")
@ApiOperation(value = "Create Drone Info")
public ResponseEntity<? extends BasicResponse> create(@RequestBody BasDronModel rq) {
Map<String , Object> resultMap = new HashMap<String,Object>();
@ -180,8 +177,7 @@ public class BasDronController {
* @return
*/
@PostMapping(value = "/idntf/create")
@ApiOperation(value = "식별장치 생성")
@Tag(name = "드론 컨트롤러", description = "드론 관련 API")
@ApiOperation(value = "Create Idntf")
public ResponseEntity<? extends BasicResponse> createIdntf(@RequestBody BasIdntfRqModel rq) {
Map<String , Object> resultMap = new HashMap<String,Object>();
@ -212,8 +208,7 @@ public class BasDronController {
* @return
*/
@PutMapping(value = "/update")
@ApiOperation(value = "드론정보 수정")
@Tag(name = "드론 컨트롤러", description = "드론 관련 API")
@ApiOperation(value = "Update Drone Info")
public ResponseEntity<? extends BasicResponse> update(@RequestBody BasDronModel rq) {
Map<String , Object> resultMap = new HashMap<String,Object>();
@ -244,9 +239,8 @@ public class BasDronController {
* @return
*/
@DeleteMapping(value = "/delete/{id}")
@ApiOperation(value = "드론정보 삭제")
@Tag(name = "드론 컨트롤러", description = "드론 관련 API")
@ApiImplicitParam(name = "id",value = "기체일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "Delete Drone Info")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> delete(@PathVariable Integer id) {
Map<String , Object> resultMap = new HashMap<String,Object>();
@ -278,9 +272,8 @@ public class BasDronController {
* @return
*/
@DeleteMapping(value = "/idntf/delete/{id}")
@ApiOperation(value = "식별장치 삭제")
@Tag(name = "드론 컨트롤러", description = "드론 관련 API")
@ApiImplicitParam(name = "id",value = "식별번호", dataTypeClass = String.class)
@ApiOperation(value = "Delete Idntf")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> deleteIdntf(@PathVariable String id) {
Map<String , Object> resultMap = new HashMap<String,Object>();

52
src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java
Unescape View File

@ -11,6 +11,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import io.swagger.annotations.Api;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
@ -59,7 +60,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
@RequestMapping(value = "/api/bas/flight", produces = {MediaType.APPLICATION_JSON_VALUE})
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
@Api(value = "BasFlightController",tags = {"Flight Plan API"})
public class BasFlightController {
private final BasFlightService basFlightService;
@ -76,7 +77,6 @@ public class BasFlightController {
}
@GetMapping("/area")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
public ResponseEntity<Object> findAirSpace() throws IOException, ParseException {
// 1. file read
Resource resource = new ClassPathResource("air/airgeo.json");
@ -101,8 +101,7 @@ public class BasFlightController {
// 비행계획서 조회
@GetMapping(value = "/plan/list")
@ApiOperation(value = "비행계획서 조회")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
@ApiOperation(value = "Flight Plan List")
public ResponseEntity<? extends BasicResponse> findPlanList(BasFlightPlanListRq rq) {
ComnPagingRs<BasFlightPlanModel> result = null;
// System.out.println(rq);
@ -119,9 +118,8 @@ public class BasFlightController {
// 비행계획서 상세 조회
@GetMapping(value = "/plan/detail/{planSno}")
@ApiOperation(value = "비행계획서 상세 조회")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
@ApiImplicitParam(name = "planSno",value = "비행계획서일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "Flight Plan Detail")
@ApiImplicitParam(name = "planSno",value = "planSno", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> detailPlan(@PathVariable("planSno") Integer planSno) {
BasFlightPlanModel result = null;
try {
@ -137,8 +135,7 @@ public class BasFlightController {
// 비행계획서 등록
@PostMapping(value = "/plan/create")
@ApiOperation(value = "비행계획서 등록")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
@ApiOperation(value = "Create Flight Plan")
public ResponseEntity<? extends BasicResponse> createPlan(@RequestBody BasFlightPlanModel rq) {
Map<String, Object> resultMap = new HashMap<String, Object>();
try {
@ -164,8 +161,7 @@ public class BasFlightController {
// 비행계획서 수정
@PutMapping(value = "/plan/update")
@ApiOperation(value = "비행계획서 수정")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
@ApiOperation(value = "Update Flight Plan")
public ResponseEntity<? extends BasicResponse> updatePlan(@RequestBody BasFlightPlanModel rq) {
Map<String, Object> resultMap = new HashMap<String, Object>();
try {
@ -189,9 +185,8 @@ public class BasFlightController {
// 비행계획서 삭제
@DeleteMapping(value = "/plan/delete/{planSno}")
@ApiOperation(value = "비행계획서 삭제")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
@ApiImplicitParam(name = "planSno",value = "비행계획서일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "Delete Flight Plan")
@ApiImplicitParam(name = "planSno",value = "planSno", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> deletePlan(@PathVariable("planSno") Integer planSno) {
Map<String, Object> resultMap = new HashMap<String, Object>();
try {
@ -214,9 +209,8 @@ public class BasFlightController {
// 그룹 조종사 조회
@GetMapping(value = "/plan/pilot/{groupId}")
@ApiOperation(value = "그룹의 조종사 조회")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
@ApiImplicitParam(name = "groupId",value = "그룹ID", dataTypeClass = String.class)
@ApiOperation(value = "Group Pilot List")
@ApiImplicitParam(name = "groupId",value = "groupId", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> findPilot(@PathVariable("groupId") String groupId) {
List<BasFlightPlanPilotModel> result = null;
try {
@ -233,9 +227,8 @@ public class BasFlightController {
}
// 그룹 기체 조회
@GetMapping(value = "/plan/arcrft/{groupId}")
@ApiOperation(value = "그룹의 기체 조회")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
@ApiImplicitParam(name = "groupId",value = "그룹ID", dataTypeClass = String.class)
@ApiOperation(value = "Group Arcrft")
@ApiImplicitParam(name = "groupId",value = "groupId", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> findArcrft(@PathVariable("groupId") String groupId) {
List<BasFlightPlanArcrftModel> result = null;
try {
@ -252,8 +245,7 @@ public class BasFlightController {
// 비행 구역 버퍼 존 생성
@PostMapping("/plan/area/buffer")
@ApiOperation(value = "비행 구역 버퍼 존 생성")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
@ApiOperation(value = "Flight area buffer Create")
public ResponseEntity<? extends BasicResponse> findBuffer(@RequestBody List<BasFlightPlanAreaModel> rq) {
List<BasFlightPlanAreaModel> rs = null;
try {
@ -268,8 +260,7 @@ public class BasFlightController {
}
@GetMapping("/plan/api/weather")
@ApiOperation(value = "비행계획서 날씨")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
@ApiOperation(value = "Flight Plan Weather")
public ResponseEntity<? extends BasicResponse> restApiGetWeather(BasFlightWeatherModel rq){
JSONObject jsonObject = null;
@ -286,8 +277,7 @@ public class BasFlightController {
}
// 비행계획서 리스트(승인)
@GetMapping(value = "/aprv/list")
@ApiOperation(value = "비행계획서 리스트(승인)")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
@ApiOperation(value = "Flight Plan Aprv List")
public ResponseEntity<? extends BasicResponse> findAprvList(BasFlightPlanListRq rq) {
ComnPagingRs<BasFlightPlanModel> result = null;
try {
@ -302,8 +292,7 @@ public class BasFlightController {
}
// 비행계획서 승인/미승인
@PutMapping(value = "/aprv/proc")
@ApiOperation(value = "비행 계획서 승인/미승인")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
@ApiOperation(value = "Flight Plan aprv/proc")
public ResponseEntity<? extends BasicResponse> updateAprvProc(@RequestBody BasFlightAprovRq rq) {
Map<String, Object> resultMap = new HashMap<String, Object>();
try {
@ -326,7 +315,6 @@ public class BasFlightController {
}
@PostMapping("/airspace/contains")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
public ResponseEntity<? extends BasicResponse> checkAirspaceContains(@RequestBody List<BasFlightPlanAreaModel> rq) {
Map<String, Object> resultMap = new HashMap<String, Object>();
try {
@ -345,14 +333,13 @@ public class BasFlightController {
//지역 검색
@GetMapping("/plan/area/search")
@ApiOperation(value = "지역 검색")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
@ApiOperation(value = "Search area")
public ResponseEntity<? extends BasicResponse> searchArea(String query) throws ParseException {
String text = null;
try {
text = URLEncoder.encode(query, "UTF-8");
} catch (UnsupportedEncodingException e) {
throw new RuntimeException("검색어 인코딩 실패", e);
throw new RuntimeException("Search Encoding Fail", e);
}
String apiURL = env.getProperty("api.naver.search-url") + "?query=" + text + "&display=5";
@ -368,7 +355,6 @@ public class BasFlightController {
}
@GetMapping("/schedule")
@Tag(name = "비행계획서", description = "비행계획서 관련 API")
public ResponseEntity<? extends BasicResponse> findSchedule(@RequestParam("searchDate") String searchDate) {
List<BasFlightScheduleRs> response;

9
src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupAprvController.java
Unescape View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@ -33,7 +34,7 @@ import lombok.extern.log4j.Log4j2;
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/api/bas/group/aprv", produces = {MediaType.APPLICATION_JSON_VALUE})
@Tag(name = "그룹 승인 컨트롤러", description = "그룹 가입 승인 관련 API")
@Api(value = "BasGroupAprvController", tags = {"Group Approval API"})
public class BasGroupAprvController {
@Autowired
@ -45,8 +46,7 @@ public class BasGroupAprvController {
* @return
*/
@GetMapping(value = "/list")
@ApiOperation(value = "승인요청 조회")
@Tag(name = "그룹 승인 컨트롤러", description = "그룹 가입 승인 관련 API")
@ApiOperation(value = "Aprov List")
public ResponseEntity<? extends BasicResponse> list(BasGroupAprvRqModel rq) {
ComnPagingRs<BasGroupAprvModel> result = null;
// log.debug(">>>>" + rq.toString());
@ -76,8 +76,7 @@ public class BasGroupAprvController {
* @return
*/
@PutMapping(value = "/update")
@ApiOperation(value = "승인처리 / 승인취소 처리")
@Tag(name = "그룹 승인 컨트롤러", description = "그룹 가입 승인 관련 API")
@ApiOperation(value = "Update Aprov / cancellAprov")
public ResponseEntity<? extends BasicResponse> update(@RequestBody BasGroupAprvModel rq) {
Map<String , Object> resultMap = new HashMap<String,Object>();

40
src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java
Unescape View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -38,15 +39,14 @@ import lombok.extern.log4j.Log4j2;
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/api/bas/group", produces = {MediaType.APPLICATION_JSON_VALUE})
@Tag(name = "그룹 컨트롤러", description = "그룹 관련 API")
@Api(value = "BasGroupController", tags = {"Group API"})
public class BasGroupController {
@Autowired
private final BasGroupService service;
@GetMapping(value = "/createid")
@ApiOperation(value = "그룹코드 생성")
@Tag(name = "그룹 컨트롤러", description = "그룹 관련 API")
@ApiOperation(value = "Create Group ID")
public ResponseEntity<? extends BasicResponse> createid() {
Map<String , Object> resultMap = new HashMap<String,Object>();
@ -71,9 +71,8 @@ public class BasGroupController {
* @return
*/
@GetMapping(value = "/mylist")
@ApiOperation(value = "나의 그룹 목록 조회")
@Tag(name = "그룹 컨트롤러", description = "그룹 관련 API")
@ApiImplicitParam(name = "cstmrSno",value = "고객일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "My Group List")
@ApiImplicitParam(name = "cstmrSno",value = "cstmrSno", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> mylist(Integer cstmrSno) {
List<BasGroupModel> result = null;
@ -105,9 +104,8 @@ public class BasGroupController {
* @return
*/
@GetMapping(value = "/joinlist")
@ApiOperation(value = "나의 그룹 - 참여 그룹 목록 조회")
@Tag(name = "그룹 컨트롤러", description = "그룹 관련 API")
@ApiImplicitParam(name = "cstmrSno",value = "고객일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "My Group - Join Groups List")
@ApiImplicitParam(name = "cstmrSno",value = "cstmrSno", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> joinList(Integer cstmrSno) {
List<BasGroupJoinModel> result = null;
@ -138,9 +136,8 @@ public class BasGroupController {
* @return
*/
@GetMapping(value = "/grouplist")
@ApiOperation(value = "그룹 목록 조회")
@Tag(name = "그룹 컨트롤러", description = "그룹 관련 API")
@ApiImplicitParam(name = "cstmrSno",value = "고객일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "Group List")
@ApiImplicitParam(name = "cstmrSno",value = "cstmrSno", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> grouplist(Integer cstmrSno) {
List<BasGroupJoinModel> result = null;
@ -171,8 +168,7 @@ public class BasGroupController {
* @return
*/
@GetMapping(value = "/list")
@ApiOperation(value = "전체 그룹 목록 조회")
@Tag(name = "그룹 컨트롤러", description = "그룹 관련 API")
@ApiOperation(value = "All Group List")
public ResponseEntity<? extends BasicResponse> list(BasGroupRqModel rq) {
List<BasGroupModel> result = null;
@ -196,9 +192,8 @@ public class BasGroupController {
* @return
*/
@GetMapping(value = "/detail/{id}")
@ApiOperation(value = "그룹 상세 조회")
@Tag(name = "그룹 컨트롤러", description = "그룹 관련 API")
@ApiImplicitParam(name = "id",value = "그룹ID", dataTypeClass = String.class)
@ApiOperation(value = "Group Detail")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> detail(@PathVariable String id) {
BasGroupModel result = null;
@ -222,8 +217,7 @@ public class BasGroupController {
* @throws Exception
*/
@PostMapping(value = "/create")
@ApiOperation(value = "그룹 생성")
@Tag(name = "그룹 컨트롤러", description = "그룹 관련 API")
@ApiOperation(value = "Create Group")
public ResponseEntity<? extends BasicResponse> create(@RequestBody BasGroupModel rq) throws Exception {
Map<String , Object> resultMap = new HashMap<String,Object>();
@ -249,8 +243,7 @@ public class BasGroupController {
* @throws Exception
*/
@PutMapping(value = "/update")
@ApiOperation(value = "그룹 수정")
@Tag(name = "그룹 컨트롤러", description = "그룹 관련 API")
@ApiOperation(value = "Update Group")
public ResponseEntity<? extends BasicResponse> update(@RequestBody BasGroupModel rq) throws Exception {
Map<String , Object> resultMap = new HashMap<String,Object>();
@ -282,9 +275,8 @@ public class BasGroupController {
* @return
*/
@DeleteMapping(value = "/delete/{id}")
@ApiOperation(value = "그룹 삭제")
@Tag(name = "그룹 컨트롤러", description = "그룹 관련 API")
@ApiImplicitParam(name = "id",value = "그룹ID", dataTypeClass = String.class)
@ApiOperation(value = "Delete Group")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> delete(@PathVariable String id) {
Map<String , Object> resultMap = new HashMap<String,Object>();

12
src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupJoinController.java
Unescape View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
@ -33,7 +34,7 @@ import lombok.extern.log4j.Log4j2;
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/api/bas/group/join", produces = {MediaType.APPLICATION_JSON_VALUE})
@Tag(name = "그룹 참여 컨트롤러", description = "그룹 참여 관련 API")
@Api(value = "BasGroupJoinController", tags = {"Join Group API"})
public class BasGroupJoinController {
@Autowired
@ -41,8 +42,7 @@ public class BasGroupJoinController {
@GetMapping(value = "/list")
@ApiOperation(value = "참여한 그룹 목록 조회")
@Tag(name = "그룹 참여 컨트롤러", description = "그룹 참여 관련 API")
@ApiOperation(value = "Join Group List")
public ResponseEntity<? extends BasicResponse> list(BasGroupJoinRqModel rq) {
List<BasGroupJoinModel> result = null;
@ -67,8 +67,7 @@ public class BasGroupJoinController {
@PostMapping(value = "/create")
@ApiOperation(value = "그룹 가입 요청")
@Tag(name = "그룹 참여 컨트롤러", description = "그룹 참여 관련 API")
@ApiOperation(value = "Group Request to Join")
public ResponseEntity<? extends BasicResponse> create(@RequestBody BasGroupJoinModel rq) {
Map<String , Object> resultMap = new HashMap<String,Object>();
@ -88,8 +87,7 @@ public class BasGroupJoinController {
}
@PutMapping(value = "/update")
@ApiOperation(value = "그룹 가입 승인/미승인")
@Tag(name = "그룹 참여 컨트롤러", description = "그룹 참여 관련 API")
@ApiOperation(value = "Group Join Aprov/NoAprov")
public ResponseEntity<? extends BasicResponse> update(@RequestBody BasGroupJoinModel rq) {
Map<String , Object> resultMap = new HashMap<String,Object>();

12
src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java
Unescape View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@ -34,7 +35,7 @@ import lombok.extern.log4j.Log4j2;
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/api/bas/group/user", produces = {MediaType.APPLICATION_JSON_VALUE})
@Tag(name = "그룹 사용자 컨트롤러", description = "그룹 사용자 관련 API")
@Api(value = "BasGroupUserController", tags = {"User Group API"})
public class BasGroupUserController {
@Autowired
@ -42,8 +43,7 @@ public class BasGroupUserController {
@GetMapping(value = "/list")
@ApiOperation(value = "그룹 사용자 조회")
@Tag(name = "그룹 사용자 컨트롤러", description = "그룹 사용자 관련 API")
@ApiOperation(value = "Group User List")
public ResponseEntity<? extends BasicResponse> list(BasGroupUserListModel rq) {
ComnPagingRs<BasGroupUserModel> result = null;
@ -68,8 +68,7 @@ public class BasGroupUserController {
@PutMapping(value = "/update")
@ApiOperation(value = "그룹 사용자 권한 수정")
@Tag(name = "그룹 사용자 컨트롤러", description = "그룹 사용자 관련 API")
@ApiOperation(value = "Group User Auth Update")
public ResponseEntity<? extends BasicResponse> update(@RequestBody BasGroupUserModel rq) {
Map<String , Object> resultMap = new HashMap<String,Object>();
@ -89,8 +88,7 @@ public class BasGroupUserController {
}
@PutMapping(value = "/delegate")
@ApiOperation(value = "MASTER 권한 위임")
@Tag(name = "그룹 사용자 컨트롤러", description = "그룹 사용자 관련 API")
@ApiOperation(value = "MASTER Auth Delegate")
public ResponseEntity<? extends BasicResponse> delegate(@RequestBody List<BasGroupUserModel> rq) {
Map<String, Object> resultMap = new HashMap<String, Object>();

48
src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java
Unescape View File

@ -13,6 +13,7 @@ import java.util.*;
import com.palnet.biz.api.ctr.cntrl.model.*;
import com.palnet.biz.scheduler.ctr.model.CtrTrnsLctnModel;
import com.palnet.biz.scheduler.ctr.service.CtrTrnsLctnService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -37,7 +38,7 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
@RestController
@RequestMapping(value = "/api/ctr/cntrl", produces = {MediaType.APPLICATION_JSON_VALUE})
@Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API")
@Api(value = "CtrCntrlController", tags = {"Drone Control System API"})
public class CtrCntrlController {
private final CtrCntrlService service;
@ -53,9 +54,8 @@ public class CtrCntrlController {
* @return
*/
@GetMapping(value = "/history/{id}")
@ApiOperation(value = "TODO 드론 관제 이력 목록 (Socket 분리 전)")
@Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API")
@ApiImplicitParam(name = "id",value = "관제ID", dataTypeClass = String.class)
@ApiOperation(value = "TODO Drone Control Histroy")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> historyList(@PathVariable String id) {
List<GPHistoryModel> result = null;
@ -78,9 +78,8 @@ public class CtrCntrlController {
* @return
*/
@GetMapping(value = "/detail/{id}")
@ApiOperation(value = "TODO 드론 관제 상세 정보")
@Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API")
@ApiImplicitParam(name = "id",value = "관제ID", dataTypeClass = String.class)
@ApiOperation(value = "TODO Drone Control Detail")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> detail(@PathVariable String id) {
CtrCntrlDtlModel result = null;
@ -103,9 +102,8 @@ public class CtrCntrlController {
* @return
*/
@GetMapping(value = "/history/list/{id}")
@ApiOperation(value = "TODO 드론 관제 '실시간' 이력 목록")
@Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API")
@ApiImplicitParam(name = "id",value = "관제ID", dataTypeClass = String.class)
@ApiOperation(value = "TODO Drone Control 'Real-Time' History List")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> history(@PathVariable String id) {
List<GPHistoryModel> history;
@ -120,8 +118,7 @@ public class CtrCntrlController {
}
@GetMapping("/api/weather")
@ApiOperation(value = "드론 관제 날씨")
@Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API")
@ApiOperation(value = "Drone Control Weather")
public ResponseEntity<? extends BasicResponse> restApiGetWeather(CtrCntrlWeatherModel rq) throws IOException, ParseException {
JSONObject jsonObject = null;
try {
@ -140,9 +137,8 @@ public class CtrCntrlController {
* @return
*/
@GetMapping("/group")
@ApiOperation(value = "TODO 비행 관제 사용자 권한 정보")
@Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API")
@ApiImplicitParam(name = "cstmrSno",value = "고객일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "TODO Flight Control User Auth Info")
@ApiImplicitParam(name = "cstmrSno",value = "cstmrSno", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> findGroupAuthInfo(int cstmrSno) {
List<CtrCntrlGroupArcrftModel> list;
@ -164,9 +160,8 @@ public class CtrCntrlController {
* @return
*/
@GetMapping("/flight_plan/{idntfNum}")
@ApiOperation(value = "TODO 비행 관제 사용자 비행 계획서 정보")
@Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API")
@ApiImplicitParam(name = "idtfNum",value = "식별번호", dataTypeClass = String.class)
@ApiOperation(value = "TODO Flight Control User Plan Info")
@ApiImplicitParam(name = "idtfNum",value = "idtfNum", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> findFlightPlan(@PathVariable("idntfNum") String idntfNum) {
List<BasFlightPlanModel> list;
@ -188,9 +183,8 @@ public class CtrCntrlController {
* @return
*/
@GetMapping(value = "/warn/detail/{id}")
@ApiOperation(value = "TODO 드론 운행 시작 후 알람 목록")
@Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API")
@ApiImplicitParam(name = "id",value = "관제ID", dataTypeClass = String.class)
@ApiOperation(value = "TODO Drone Fly Start and Alarm List")
@ApiImplicitParam(name = "id",value = "id", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> warnDetail(@PathVariable String id){
List<CtrCntrlWarnLogModel> warnLog;
@ -211,8 +205,7 @@ public class CtrCntrlController {
* @return
*/
@PostMapping(value = "/arcrft/warn/list")
@ApiOperation(value = "TODO 기체 별 최신 비정상 로그 및 비정상 로그 전체 개수")
@Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API")
@ApiOperation(value = "TODO Arcrft Warn List")
public ResponseEntity<? extends BasicResponse> arcrftWarnList(@RequestBody CtrCntrlArcrftWarnRqModel rq){
// public ResponseEntity<? extends BasicResponse> arcrftWarnList(@RequestParam("id") String id){
List<CtrCntrlArcrftWarnModel> arcrftWarnList;
@ -235,8 +228,7 @@ public class CtrCntrlController {
* @return
*/
@PostMapping("/contains")
@ApiOperation(value = "TODO 비행 관제 구역 비정상 상황 체크")
@Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API")
@ApiOperation(value = "TODO Flight Control area Anomaly Check")
public ResponseEntity<? extends BasicResponse> checkPlanContains(@RequestBody CtrCntrlPlanContainsRq rq) {
CtrCntrlPlanContainsRs rs;
@ -258,8 +250,7 @@ public class CtrCntrlController {
* @return
*/
@GetMapping("/id/{id}")
@ApiOperation(value = "TODO 실시간 Control ID 발급")
@Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API")
@ApiOperation(value = "TODO RealTime Control Id Issue")
public ResponseEntity<? extends BasicResponse> getId(@PathVariable String id) {
Map<String, String> result;
try {
@ -281,8 +272,7 @@ public class CtrCntrlController {
* @return
*/
@GetMapping("/warn/{id}/{lat}/{lon}")
@ApiOperation(value = "TODO 비행 관제 기체의 비정상 상황 확인")
@Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API")
@ApiOperation(value = "TODO Flight Control Aircraft Warring Check")
public ResponseEntity<? extends BasicResponse> checkWarring(@PathVariable String id,
@PathVariable Double lat,
@PathVariable Double lon) {

23
src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java
Unescape View File

@ -3,6 +3,7 @@ package com.palnet.biz.api.main.dash.controller;
import java.util.List;
import java.util.Map;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -37,7 +38,7 @@ import lombok.extern.log4j.Log4j2;
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/api/main/dash", produces = {MediaType.APPLICATION_JSON_VALUE})
@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")
@Api(value = "MainDashController", tags = {"Main page API"})
public class MainDashController {
@Autowired
@ -48,9 +49,8 @@ public class MainDashController {
* @return
*/
@GetMapping(value = "/stcs/day")
@ApiOperation(value = "일 별 비행횟수 통계")
@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")
@ApiImplicitParam(name = "yyyymm",value = "날짜", dataTypeClass = String.class)
@ApiOperation(value = "Daily Flight Count Statistics")
@ApiImplicitParam(name = "yyyymm",value = "day", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> stcsDay(String yyyymm) {
List<MainDashStcsModel> result = null;
@ -83,9 +83,8 @@ public class MainDashController {
* @return
*/
@GetMapping(value = "/stcs/area")
@ApiOperation(value = "TOP5 지역 별 비행횟수 통계")
@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")
@ApiImplicitParam(name = "yyyymm",value = "날짜", dataTypeClass = String.class)
@ApiOperation(value = "TOP5 Flight Count Stat")
@ApiImplicitParam(name = "yyyymm",value = "day", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> stcsArea(String yyyymm) {
List<MainDashStcsModel> result = null;
@ -115,9 +114,8 @@ public class MainDashController {
* @return
*/
@GetMapping(value = "/group/list")
@ApiOperation(value = "본인이 생성한 그룹 정보")
@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")
@ApiImplicitParam(name = "cstmrSno",value = "고객일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "Group Info have User Created")
@ApiImplicitParam(name = "cstmrSno",value = "cstmrSno", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> groupList(Integer cstmrSno) {
List<Map> result = null;
@ -142,9 +140,8 @@ public class MainDashController {
@GetMapping(value = "/arcrft/list")
@ApiOperation(value = "기체 정보 리스트")
@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")
@ApiImplicitParam(name = "cstmrSno",value = "고객일련번호", dataTypeClass = Integer.class)
@ApiOperation(value = "Arcrft List")
@ApiImplicitParam(name = "cstmrSno",value = "cstmrSno", dataTypeClass = Integer.class)
public ResponseEntity<? extends BasicResponse> arcrftList(Integer cstmrSno) {
List<MainDashListModel> result = null;

2
src/main/java/com/palnet/biz/config/SwaggerConfig.java
Unescape View File

@ -3,6 +3,7 @@ package com.palnet.biz.config;
import io.swagger.v3.oas.models.parameters.Parameter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
@ -23,6 +24,7 @@ import java.util.List;
@Configuration
//@EnableSwagger2
@EnableWebMvc
public class SwaggerConfig {

Write Preview
Loading…
Cancel
Save