From 797432b1d478137ba4053546959e7dffecce19ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Wed, 11 Oct 2023 15:13:15 +0900 Subject: [PATCH] . --- .../bas/laanc/model/BasLaancAprvListRq.java | 3 ++ .../api/bas/laanc/model/BasLaancAprvRs.java | 42 +++++++++++++++---- .../biz/api/comn/model/SwaggerPageable.java | 8 ++-- .../palnet/biz/jpa/entity/type/FltType.java | 2 +- 4 files changed, 41 insertions(+), 14 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancAprvListRq.java b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancAprvListRq.java index 20d0b7e1..d47dba64 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancAprvListRq.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancAprvListRq.java @@ -2,6 +2,7 @@ package com.palnet.biz.api.bas.laanc.model; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palnet.biz.config.convert.InstantDateStrSerializer; +import io.swagger.v3.oas.annotations.Parameter; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -25,6 +26,8 @@ import java.time.Instant; @NoArgsConstructor @AllArgsConstructor public class BasLaancAprvListRq { + + @Parameter(name = "생성일자", example = "2023-12-12") @JsonSerialize(using = InstantDateStrSerializer.class) private Instant createDate; } diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancAprvRs.java b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancAprvRs.java index 1580251b..7a071f65 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancAprvRs.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancAprvRs.java @@ -5,6 +5,8 @@ import com.palnet.biz.jpa.entity.type.ArcrftTypeCd; import com.palnet.biz.jpa.entity.type.ArcrftWghtCd; import com.palnet.biz.jpa.entity.type.FltPurpose; import com.palnet.biz.jpa.entity.type.FltType; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -31,32 +33,54 @@ import java.util.stream.Collectors; @NoArgsConstructor @AllArgsConstructor public class BasLaancAprvRs { + @Parameter(name = "비행계획서 일려번호") private Integer planSno; + @Parameter(name = "그룹 아이디", hidden = true) private String groupId; + @Parameter(name = "작성자 일련번호") private Integer cstmrSno; + @Parameter(name = "작성자 이름") private String memberName; + @Parameter(name = "작성자 이메일") private String email; + @Parameter(name = "작성자 연락처") private String hpno; + @Parameter(name = "작성자 국가번호(연락처)", hidden = true) private String clncd; + @Parameter(name = "작성자 주소", hidden = true) private String addr; + @Parameter(name = "작성자 상세주소", hidden = true) private String addrDtlCn; + @Parameter(name = "작성자 우편번호", hidden = true) private String zip; + @Parameter(name = "비행시작일시") private Instant schFltStDt; + @Parameter(name = "비행종료일시") private Instant schFltEndDt; + @Parameter(name = "비행목적") private FltPurpose fltPurpose; + @Parameter(name = "상업/비사업 구분") private FltType fltType; + @Parameter(name = "승인여부") private String aprvlYn; + @Parameter(name = "승인일자") private Instant aprvlDt; // private String delYn; + @Parameter(name = "등록자ID") private String createUserId; + @Parameter(name = "등록일시") private Instant createDt; + @Parameter(name = "수정자ID") private String updateUserId; + @Parameter(name = "수정일시") private Instant updateDt; + @Parameter(name = "서비스유형") private String serviceType; + @Parameter(name = "기업여부") private String corpRegYn; // 하나의 필드로 묶어서 처리 - // 항공기 무게(기체 중량) + @Parameter(name = "기체 무게") public String getArcrftWght() { if (arcrftList == null || arcrftList.isEmpty()) return null; List arcrftWghtCdList = arcrftList.stream().map(BasLaancArcrftModel::getArcrftWghtCd).distinct().filter(Objects::nonNull).collect(Collectors.toList()); @@ -65,7 +89,7 @@ public class BasLaancAprvRs { return ArcrftWghtType; } - // 고도 + @Parameter(name = "고도") public String getElev() { if (areaList == null || areaList.isEmpty()) return null; List elevList = areaList.stream().map(BasLaancAreaModel::getFltElev).distinct().filter(Objects::nonNull).collect(Collectors.toList()); @@ -73,13 +97,13 @@ public class BasLaancAprvRs { return elev; } - // 조종사 성명 - public String getPilotName() { - if (pilotList == null || pilotList.isEmpty()) return null; - List pilotNameList = pilotList.stream().map(BasLaancPilotModel::getMemberName).distinct().filter(Objects::nonNull).collect(Collectors.toList()); - String pilotName = String.join(",", pilotNameList); - return pilotName; - } +// @Parameter(name = "조종사 성명") +// public String getPilotName() { +// if (pilotList == null || pilotList.isEmpty()) return null; +// List pilotNameList = pilotList.stream().map(BasLaancPilotModel::getMemberName).distinct().filter(Objects::nonNull).collect(Collectors.toList()); +// String pilotName = String.join(",", pilotNameList); +// return pilotName; +// } private List areaList; private List arcrftList; diff --git a/pav-server/src/main/java/com/palnet/biz/api/comn/model/SwaggerPageable.java b/pav-server/src/main/java/com/palnet/biz/api/comn/model/SwaggerPageable.java index 6aa6148c..0c07920d 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/comn/model/SwaggerPageable.java +++ b/pav-server/src/main/java/com/palnet/biz/api/comn/model/SwaggerPageable.java @@ -1,6 +1,6 @@ package com.palnet.biz.api.comn.model; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.Parameter; import lombok.Getter; import org.springframework.lang.Nullable; @@ -18,15 +18,15 @@ import org.springframework.lang.Nullable; @Getter public class SwaggerPageable { - @ApiParam(value = "Number of records per page", example = "0") + @Parameter(description = "Number of records per page", example = "10") @Nullable private Integer size; - @ApiParam(value = "Results page you want to retrieve (0..N)", example = "0") + @Parameter(description = "Number of records per page", example = "10") @Nullable private Integer page; - @ApiParam(value = "Sorting criteria in the format: property(,asc|desc). Default sort order is ascending. Multiple sort criteria are supported.") + @Parameter(description = "Sorting criteria in the format: property(,asc|desc). Default sort order is ascending. Multiple sort criteria are supported.") @Nullable private String sort; diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/type/FltType.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/type/FltType.java index c2161f63..a776c75c 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/type/FltType.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/entity/type/FltType.java @@ -17,7 +17,7 @@ import lombok.Getter; @Getter public enum FltType { COMMERCIAL("COMMERCIAL", "상업용"), - NON_COMMERCIAL("NON_COMMERCIAL", "상업용"); + NON_COMMERCIAL("NON_COMMERCIAL", "비상업용"); private final String code; private final String value;