新增航空公司Dto、Convert接口实现

src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAirlineController.java

@@ -1,12 +1,19 @@
 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;
 import org.springframework.web.bind.annotation.RestController;
+
 import com.gzzn.omms.adminapi.domain.secondary.dao.basicdata.SysAirlineDao;
 import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysAirline;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.SysAirlineDto;
+import com.gzzn.omms.adminapi.dto.basicdata.convert.SysAirlineConvert;
 
 /**
  * 航空公司
@@ -20,14 +27,26 @@ public class SysAirlineController {
 	 */
 	@Autowired
 	private SysAirlineDao sysAirlineDao;
-	
+	/**
+	 * 航空公司Dto接口
+	 */
+	@Autowired
+	private SysAirlineConvert sysAirlineConvert;
 	/**
 	 * 获取所有航空公司数据
 	 * @return
 	 */
+	@ApiOperation(value="获取航空公司列表",tags="基础数据")
 	@GetMapping(value="/basicdata/sysAirlines")
-	public ResponseDto getSysAirline() {
+	public ResponseDto<List<SysAirlineDto>> getSysAirline() {
 		List<SysAirline> sysAirlineList = (List<SysAirline>) sysAirlineDao.findAll();
-		return ResponseDto.success(sysAirlineList);
+		
+		//转换dto
+		List<SysAirlineDto> sysAirlineListDto = sysAirlineList.stream().map(x -> {
+			SysAirlineDto dto = sysAirlineConvert.sysAirlineToSysAirlineDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+				
+		return ResponseDto.success(sysAirlineListDto);
 	}
 }

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAirlineDto.java

@@ -0,0 +1,187 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+import java.math.BigDecimal;
+
+public class SysAirlineDto {
+	
+	private long airlineId; //航空公司ID
+
+	private String airlineCode; //航空公司代码
+
+	private String airlineCodeCaa; //航空公司代码（CAA格式）
+
+	private String airlineCodeIata; //航空公司代码（IATA格式）
+
+	private String airlineCodeIcao; //航空公司代码（ICAO格式）
+
+	private BigDecimal airlineGroupId; //航空集团公司表记录ID
+
+	private String airlineName; //航空公司名称
+
+	private String airlineNameEng; //航空公司名称（英文）
+
+	private String briefNameChn; //简称（中文）
+
+	private String briefNameEng; //简称（英文）
+
+	private String code; //子公司code
+
+	private BigDecimal countryId; //国家ID
+
+	private BigDecimal hostFlag; //主场标志:1-主场、 0-非主场
+
+	private BigDecimal internationalFlag; //国际机场/航空公司标志:1-国际机场/航空公司 0-非国际机场/航空公司
+
+	private String namc; //子公司中文名
+
+	private String name; //子公司英文名
+
+	private BigDecimal operate; //操作标识 1-使用    0-删除标识
+
+	private BigDecimal parentAirlineId; //上级航空公司ID（本航空公司所属航空集团公司）
+
+	public long getAirlineId() {
+		return this.airlineId;
+	}
+
+	public void setAirlineId(long airlineId) {
+		this.airlineId = airlineId;
+	}
+
+	public String getAirlineCode() {
+		return this.airlineCode;
+	}
+
+	public void setAirlineCode(String airlineCode) {
+		this.airlineCode = airlineCode;
+	}
+
+	public String getAirlineCodeCaa() {
+		return this.airlineCodeCaa;
+	}
+
+	public void setAirlineCodeCaa(String airlineCodeCaa) {
+		this.airlineCodeCaa = airlineCodeCaa;
+	}
+
+	public String getAirlineCodeIata() {
+		return this.airlineCodeIata;
+	}
+
+	public void setAirlineCodeIata(String airlineCodeIata) {
+		this.airlineCodeIata = airlineCodeIata;
+	}
+
+	public String getAirlineCodeIcao() {
+		return this.airlineCodeIcao;
+	}
+
+	public void setAirlineCodeIcao(String airlineCodeIcao) {
+		this.airlineCodeIcao = airlineCodeIcao;
+	}
+
+	public BigDecimal getAirlineGroupId() {
+		return this.airlineGroupId;
+	}
+
+	public void setAirlineGroupId(BigDecimal airlineGroupId) {
+		this.airlineGroupId = airlineGroupId;
+	}
+
+	public String getAirlineName() {
+		return this.airlineName;
+	}
+
+	public void setAirlineName(String airlineName) {
+		this.airlineName = airlineName;
+	}
+
+	public String getAirlineNameEng() {
+		return this.airlineNameEng;
+	}
+
+	public void setAirlineNameEng(String airlineNameEng) {
+		this.airlineNameEng = airlineNameEng;
+	}
+
+	public String getBriefNameChn() {
+		return this.briefNameChn;
+	}
+
+	public void setBriefNameChn(String briefNameChn) {
+		this.briefNameChn = briefNameChn;
+	}
+
+	public String getBriefNameEng() {
+		return this.briefNameEng;
+	}
+
+	public void setBriefNameEng(String briefNameEng) {
+		this.briefNameEng = briefNameEng;
+	}
+
+	public String getCode() {
+		return this.code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public BigDecimal getCountryId() {
+		return this.countryId;
+	}
+
+	public void setCountryId(BigDecimal countryId) {
+		this.countryId = countryId;
+	}
+
+	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 String getNamc() {
+		return this.namc;
+	}
+
+	public void setNamc(String namc) {
+		this.namc = namc;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public BigDecimal getOperate() {
+		return this.operate;
+	}
+
+	public void setOperate(BigDecimal operate) {
+		this.operate = operate;
+	}
+
+	public BigDecimal getParentAirlineId() {
+		return this.parentAirlineId;
+	}
+
+	public void setParentAirlineId(BigDecimal parentAirlineId) {
+		this.parentAirlineId = parentAirlineId;
+	}
+
+}

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAirlineConvert.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.SysAirline;
+import com.gzzn.omms.adminapi.dto.basicdata.SysAirlineDto;
+
+@Mapper(componentModel="spring")
+public interface SysAirlineConvert {
+	
+   public SysAirlineDto sysAirlineToSysAirlineDto(SysAirline sysAirline);
+}