From 02155fd0c618473cb2593bc690fb83b81fb8e30d Mon Sep 17 00:00:00 2001 From: "714943302@qq.com" Date: Tue, 30 Oct 2018 17:59:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=BA=E5=9C=BADto?= =?UTF-8?q?=E3=80=81Convert=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/SysAirportController.java | 23 ++- .../adminapi/dto/basicdata/SysAirportDto.java | 166 ++++++++++++++++++ .../basicdata/convert/SysAirportConvert.java | 12 ++ 3 files changed, 198 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAirportDto.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAirportConvert.java diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAirportController.java b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAirportController.java index 9eba7ba..4b7b2bc 100644 --- a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAirportController.java +++ b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAirportController.java @@ -1,6 +1,9 @@ package com.gzzn.omms.adminapi.controller.basicdata; +import io.swagger.annotations.ApiOperation; + import java.util.List; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -9,6 +12,8 @@ import org.springframework.web.bind.annotation.RestController; import com.gzzn.omms.adminapi.domain.secondary.dao.basicdata.SysAirportDao; import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysAirport; import com.gzzn.omms.adminapi.dto.ResponseDto; +import com.gzzn.omms.adminapi.dto.basicdata.SysAirportDto; +import com.gzzn.omms.adminapi.dto.basicdata.convert.SysAirportConvert; /** * 机场 @@ -22,14 +27,26 @@ public class SysAirportController { */ @Autowired private SysAirportDao sysAirportDao; - + /** + * 机场Dto接口 + */ + @Autowired + private SysAirportConvert sysAirportConvert; /** * 获取所有机场数据 * @return */ + @ApiOperation(value="获取机场列表",tags="基础数据") @GetMapping(value="/basicdata/sysAirports") - public ResponseDto getSysAirport() { + public ResponseDto> getSysAirport() { List sysAirportList = (List) sysAirportDao.findAll(); - return ResponseDto.success(sysAirportList); + + //转换dto + List sysAirportListDto = sysAirportList.stream().map(x -> { + SysAirportDto dto = sysAirportConvert.sysAirportToSysAirportDto(x); + return dto; + }).collect(Collectors.toList()); + + return ResponseDto.success(sysAirportListDto); } } diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAirportDto.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAirportDto.java new file mode 100644 index 0000000..0505fcb --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAirportDto.java @@ -0,0 +1,166 @@ +package com.gzzn.omms.adminapi.dto.basicdata; + +import java.math.BigDecimal; + +public class SysAirportDto { + + private long airportId; //机场表记录ID + + private String airportCode; //机场代码 + + private String airportCodeCaa; //机场代码（CAA格式） + + private String airportCodeIata; //机场代码（IATA格式） + + private String airportCodeIcao; //机场代码（ICAO格式） + + private BigDecimal airportGroupId; //机场集团公司表记录ID + + private String airportNameChn; //机场名称（中文） + + private String airportNameEng; //机场名称（英文） + + private String briefNameChn; //简称（中文） + + private String briefNameChnCopy; //中文简称（备用） + + private String briefNameEng; //简称（英文） + + private BigDecimal cityId; //城市ID + + private String haul; //机场标识 + + private BigDecimal hostFlag; //主场标志：1-主场、 0-非主场 + + private BigDecimal internationalFlag; //国际机场/航空公司标志、1-国际机场/航空公司、0-非国际机场/航空公司 + + private BigDecimal operate; //操作标识：1-使用、0-删除标识 + + public long getAirportId() { + return this.airportId; + } + + public void setAirportId(long airportId) { + this.airportId = airportId; + } + + public String getAirportCode() { + return this.airportCode; + } + + public void setAirportCode(String airportCode) { + this.airportCode = airportCode; + } + + public String getAirportCodeCaa() { + return this.airportCodeCaa; + } + + public void setAirportCodeCaa(String airportCodeCaa) { + this.airportCodeCaa = airportCodeCaa; + } + + public String getAirportCodeIata() { + return this.airportCodeIata; + } + + public void setAirportCodeIata(String airportCodeIata) { + this.airportCodeIata = airportCodeIata; + } + + public String getAirportCodeIcao() { + return this.airportCodeIcao; + } + + public void setAirportCodeIcao(String airportCodeIcao) { + this.airportCodeIcao = airportCodeIcao; + } + + public BigDecimal getAirportGroupId() { + return this.airportGroupId; + } + + public void setAirportGroupId(BigDecimal airportGroupId) { + this.airportGroupId = airportGroupId; + } + + public String getAirportNameChn() { + return this.airportNameChn; + } + + public void setAirportNameChn(String airportNameChn) { + this.airportNameChn = airportNameChn; + } + + public String getAirportNameEng() { + return this.airportNameEng; + } + + public void setAirportNameEng(String airportNameEng) { + this.airportNameEng = airportNameEng; + } + + public String getBriefNameChn() { + return this.briefNameChn; + } + + public void setBriefNameChn(String briefNameChn) { + this.briefNameChn = briefNameChn; + } + + public String getBriefNameChnCopy() { + return this.briefNameChnCopy; + } + + public void setBriefNameChnCopy(String briefNameChnCopy) { + this.briefNameChnCopy = briefNameChnCopy; + } + + public String getBriefNameEng() { + return this.briefNameEng; + } + + public void setBriefNameEng(String briefNameEng) { + this.briefNameEng = briefNameEng; + } + + public BigDecimal getCityId() { + return this.cityId; + } + + public void setCityId(BigDecimal cityId) { + this.cityId = cityId; + } + + public String getHaul() { + return this.haul; + } + + public void setHaul(String haul) { + this.haul = haul; + } + + public BigDecimal getHostFlag() { + return this.hostFlag; + } + + public void setHostFlag(BigDecimal hostFlag) { + this.hostFlag = hostFlag; + } + + public BigDecimal getInternationalFlag() { + return this.internationalFlag; + } + + public void setInternationalFlag(BigDecimal internationalFlag) { + this.internationalFlag = internationalFlag; + } + + public BigDecimal getOperate() { + return this.operate; + } + + public void setOperate(BigDecimal operate) { + this.operate = operate; + } +} diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAirportConvert.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAirportConvert.java new file mode 100644 index 0000000..fbf38d7 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAirportConvert.java @@ -0,0 +1,12 @@ +package com.gzzn.omms.adminapi.dto.basicdata.convert; + +import org.mapstruct.Mapper; + +import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysAirport; +import com.gzzn.omms.adminapi.dto.basicdata.SysAirportDto; + +@Mapper(componentModel="spring") +public interface SysAirportConvert { + + public SysAirportDto sysAirportToSysAirportDto(SysAirport sysAirport); +}