Merge branch 'master' of git@git.int.it2000.com.cn:airport-chengdu/admin-api.git

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

@@ -1,5 +1,7 @@
 package com.gzzn.omms.adminapi.controller.basicdata;
 
+import io.swagger.annotations.ApiOperation;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -13,9 +15,6 @@ import com.gzzn.omms.adminapi.dto.ResponseDto;
 import com.gzzn.omms.adminapi.dto.basicdata.CheckinGroupDto;
 import com.gzzn.omms.adminapi.dto.basicdata.convert.ICheckinGroupConvert;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
 /**
  *  值机岛
  * @author zhouxiunai
@@ -24,10 +23,14 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 public class CheckinGroupController {
 
-	
+	/**
+	 *  值机岛接口
+	 */
 	@Autowired
 	private ICheckinGroupDao checkinGroupDao;
-	
+	/**
+	 *  值机岛Dto接口
+	 */
 	@Autowired
 	private ICheckinGroupConvert checkinGroupConvert;
 	
@@ -38,16 +41,14 @@ public class CheckinGroupController {
 	@ApiOperation(value="获取值机岛列表",tags="基础数据") 
 	@GetMapping(value="/basicdata/checkinGroups")
 	public ResponseDto<List<CheckinGroupDto>> getCheckinGroup() {
-		List<CheckinGroup> ls = (List<CheckinGroup>) checkinGroupDao.findAll();
+		List<CheckinGroup> checkinGroupsList = (List<CheckinGroup>) checkinGroupDao.findAll();
 		
 		//转换dto
-		List<CheckinGroupDto> lsDto = ls.stream().map(x -> {
+		List<CheckinGroupDto> checkinGroupsListDto = checkinGroupsList.stream().map(x -> {
 			CheckinGroupDto dto = checkinGroupConvert.checkinGroupToCheckinGroupDto(x);
 			return dto;
 		}).collect(Collectors.toList());
 		
-		
+		return ResponseDto.success(checkinGroupsListDto);
-		
-		return ResponseDto.success(lsDto);
 	}
 }

src/main/java/com/gzzn/omms/adminapi/controller/basicdata/OrmsCarouselController.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.OrmsCarouselDao;
 import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.OrmsCarousel;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsCarouselDto;
+import com.gzzn.omms.adminapi.dto.basicdata.convert.OrmsCarouselConvert;
 
 /**
  * 行李转盘
@@ -20,14 +27,27 @@ public class OrmsCarouselController {
 	 */
 	@Autowired
 	private OrmsCarouselDao ormsCarouselDao;
+	/**
+	 * 行李转盘Dto接口
+	 */
+	@Autowired
+	private OrmsCarouselConvert ormsCarouselConvert;
 	
 	/**
 	 * 获取所有行李转盘数据
 	 * @return
 	 */
+	@ApiOperation(value="获取行李转盘列表",tags="基础数据") 
 	@GetMapping(value="/basicdata/ormsCarousels")
-	public ResponseDto getOrmsCarousel() {
+	public ResponseDto<List<OrmsCarouselDto>> getOrmsCarousel() {
 		List<OrmsCarousel> ormsCarouselList = (List<OrmsCarousel>) ormsCarouselDao.findAll();
-		return ResponseDto.success(ormsCarouselList);
+		
+		//转换dto
+		List<OrmsCarouselDto> ormsCarouselListDto = ormsCarouselList.stream().map(x -> {
+			OrmsCarouselDto dto = ormsCarouselConvert.ormsCarouselToOrmsCarouselDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+		
+		return ResponseDto.success(ormsCarouselListDto);
 	}
 }

src/main/java/com/gzzn/omms/adminapi/controller/basicdata/OrmsCheckindeskController.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.OrmsCheckindeskDao;
 import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.OrmsCheckindesk;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsCheckindestDto;
+import com.gzzn.omms.adminapi.dto.basicdata.convert.OrmsCheckindestConvert;
 
 /**
  * 值机柜台
@@ -22,14 +27,26 @@ public class OrmsCheckindeskController {
 	 */
 	@Autowired
 	private OrmsCheckindeskDao ormsCheckindeskDao;
-	
+	/**
+	 * 值机柜台Dto接口
+	 */
+	@Autowired
+	private OrmsCheckindestConvert OrmsCheckindeskConvert;
 	/**
 	 * 获取所有值机柜台数据
 	 * @return
 	 */
+	@ApiOperation(value="获取值机柜台列表",tags="基础数据")
 	@GetMapping(value="/basicdata/ormsCheckindesks")
-	public ResponseDto getOrmsCheckindesk() {
+	public ResponseDto<List<OrmsCheckindestDto>> getOrmsCheckindesk() {
 		List<OrmsCheckindesk> ormsCheckindeskList = (List<OrmsCheckindesk>) ormsCheckindeskDao.findAll();
-		return ResponseDto.success(ormsCheckindeskList);
+
+		//转换dto
+		List<OrmsCheckindestDto> ormsCheckindeskListDto = ormsCheckindeskList.stream().map(x -> {
+			OrmsCheckindestDto dto = OrmsCheckindeskConvert.ormsCheckindeskToOrmsCheckindestDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+		
+		return ResponseDto.success(ormsCheckindeskListDto);
 	}
 }

src/main/java/com/gzzn/omms/adminapi/controller/basicdata/OrmsChutController.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.OrmsChutDao;
 import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.OrmsChut;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsChutDto;
+import com.gzzn.omms.adminapi.dto.basicdata.convert.OrmsChutConvert;
 
 /**
  * 行李传送带
@@ -22,14 +27,26 @@ public class OrmsChutController {
 	 */
 	@Autowired
 	private OrmsChutDao ormsChutDao;
-	
+	/**
+	 * 行李传送带Dto接口 
+	 */
+	@Autowired
+	private OrmsChutConvert ormsChutConvert;
 	/**
 	 * 获取所有行李传送带数据
 	 * @return
 	 */
+	@ApiOperation(value="获取行李传送带列表",tags="基础数据") 
 	@GetMapping(value="/basicdata/ormsChuts")
-	public ResponseDto getOrmsChut() {
+	public ResponseDto<List<OrmsChutDto>> getOrmsChut() {
 		List<OrmsChut> ormsChutList = (List<OrmsChut>) ormsChutDao.findAll();
-		return ResponseDto.success(ormsChutList);
+		
+		//转换dto
+		List<OrmsChutDto> ormsChutListDto = ormsChutList.stream().map(x -> {
+			OrmsChutDto dto = ormsChutConvert.ormsChutToOrmsChutDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+		
+		return ResponseDto.success(ormsChutListDto);
 	}
 }

src/main/java/com/gzzn/omms/adminapi/controller/basicdata/OrmsGateController.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.OrmsGateDao;
 import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.OrmsGate;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsGateDto;
+import com.gzzn.omms.adminapi.dto.basicdata.convert.OrmsGateConvert;
 
 /**
  * 登机门
@@ -20,14 +27,26 @@ public class OrmsGateController {
 	 */
 	@Autowired
 	private OrmsGateDao ormsGateDao;
-	
+	/**
+	 * 登机门Dto接口
+	 */
+	@Autowired
+	private OrmsGateConvert ormsGateConvert;
 	/**
 	 * 获取所有登机门数据
 	 * @return
 	 */
+	@ApiOperation(value="获取登机门列表",tags="基础数据")
 	@GetMapping(value="/basicdata/ormsGates")
-	public ResponseDto getOrmsGate() {
+	public ResponseDto<List<OrmsGateDto>> getOrmsGate() {
 		List<OrmsGate> ormsGatelist = (List<OrmsGate>) ormsGateDao.findAll();
-		return ResponseDto.success(ormsGatelist);		
+		
+		//转换dto
+		List<OrmsGateDto> ormsGateListDto = ormsGatelist.stream().map(x -> {
+			OrmsGateDto dto = ormsGateConvert.ormsChutToOrmsChutDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+		
+		return ResponseDto.success(ormsGateListDto);		
 	}
 }

src/main/java/com/gzzn/omms/adminapi/controller/basicdata/OrmsStandController.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.OrmsStandDao;
 import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.OrmsStand;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsStandDto;
+import com.gzzn.omms.adminapi.dto.basicdata.convert.OrmsStandConvert;
 
 /**
  * 机位
@@ -23,14 +28,26 @@ public class OrmsStandController {
 	 */
 	@Autowired
 	private OrmsStandDao ormsStandDao;
-	
+	/**
+	 * 机位Dto接口
+	 */
+	@Autowired
+	private OrmsStandConvert ormsStandConvert;
 	/**
 	 * 获取所有机位数据
 	 * @return
 	 */
+	@ApiOperation(value="获取机位列表",tags="基础数据") 
 	@GetMapping(value="/basicdata/ormsStands")
-	public ResponseDto getOrmsStand() {
+	public ResponseDto<List<OrmsStandDto>> getOrmsStand() {
 		List<OrmsStand> ormsStandList = (List<OrmsStand>) ormsStandDao.findAll();
-		return ResponseDto.success(ormsStandList);
+		
+		//转换dto
+		List<OrmsStandDto> ormsStandListDto = ormsStandList.stream().map(x -> {
+			OrmsStandDto dto = ormsStandConvert.ormsStandToOrmsStandDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+		
+		return ResponseDto.success(ormsStandListDto);
 	}
 }

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

@@ -1,5 +1,8 @@
 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;
@@ -8,6 +11,8 @@ import org.springframework.web.bind.annotation.RestController;
 import com.gzzn.omms.adminapi.domain.secondary.dao.basicdata.OrmsTerminalDao;
 import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.OrmsTerminal;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsTerminalDto;
+import com.gzzn.omms.adminapi.dto.basicdata.convert.OrmsTerminalConvert;
 
 /**
  * 航站楼
@@ -23,14 +28,26 @@ public class OrmsTerminalController {
 	 */
 	@Autowired
 	private OrmsTerminalDao ormsTerminalDao;
-	
+	/**
+	 * 航站楼Dto接口
+	 */
+	@Autowired
+	private OrmsTerminalConvert ormsTerminalConvert;
 	/**
 	 * 获取所有航站楼数据
 	 * @return
 	 */
+	@ApiOperation(value="获取航站楼列表",tags="基础数据")
 	@GetMapping(value="/basicdata/ormsTerminals")
-	public ResponseDto getOrmsTerminal() {
+	public ResponseDto<List<OrmsTerminalDto>> getOrmsTerminal() {
 		List<OrmsTerminal> ormsTerminalslist = (List<OrmsTerminal>) ormsTerminalDao.findAll();
-		return ResponseDto.success(ormsTerminalslist);
+		
+		//转换dto
+		List<OrmsTerminalDto> ormsTerminalslistDto = ormsTerminalslist.stream().map(x -> {
+			OrmsTerminalDto dto = ormsTerminalConvert.ormsTerminalToOrmsTerminalDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+		
+		return ResponseDto.success(ormsTerminalslistDto);
 	}
 }

src/main/java/com/gzzn/omms/adminapi/controller/basicdata/OrmsTerminalareaController.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.OrmsTerminalareaDao;
 import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.OrmsTerminalarea;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsTerminalareaDto;
+import com.gzzn.omms.adminapi.dto.basicdata.convert.OrmsTerminalareaConvert;
 
 /**
  * 航站楼区域
@@ -20,14 +27,26 @@ public class OrmsTerminalareaController {
 	 */
 	@Autowired
 	private OrmsTerminalareaDao ormsTerminalareaDao;
-	
+	/**
+	 * 航站楼区域Dto接口
+	 */
+	@Autowired
+	private OrmsTerminalareaConvert ormsTerminalareaConvert;
 	/**
 	 * 获取所有航站楼区域数据
 	 * @return
 	 */
+	@ApiOperation(value="获取航站楼区域列表",tags="基础数据")
 	@GetMapping(value="/basicdata/ormsTerminalareas")
-	public ResponseDto getOrmsTerminalarea() {
+	public ResponseDto<List<OrmsTerminalareaDto>> getOrmsTerminalarea() {
 		List<OrmsTerminalarea> ormsTerminalareaList = (List<OrmsTerminalarea>) ormsTerminalareaDao.findAll();
-		return ResponseDto.success(ormsTerminalareaList);
+		
+		//转换dto
+		List<OrmsTerminalareaDto> ormsTerminalareaListDto = ormsTerminalareaList.stream().map(x -> {
+			OrmsTerminalareaDto dto = ormsTerminalareaConvert.ormsTerminalareaToOrmsTerminalDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+				
+		return ResponseDto.success(ormsTerminalareaListDto);
 	}
 }

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

@@ -1,5 +1,8 @@
 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;
@@ -8,6 +11,8 @@ import org.springframework.web.bind.annotation.RestController;
 import com.gzzn.omms.adminapi.domain.secondary.dao.basicdata.SysAircraftDao;
 import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysAircraft;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.SysAircraftDto;
+import com.gzzn.omms.adminapi.dto.basicdata.convert.SysAircraftConvert;
 
 /**
  * 飞机
@@ -21,14 +26,26 @@ public class SysAircraftController {
 	 */
 	@Autowired
 	private SysAircraftDao sysAircraftDao;
-	
+	/**
+	 * 飞机Dto接口
+	 */
+	@Autowired
+	private SysAircraftConvert sysAircraftConvert;
 	/**
 	 * 获取所有飞机数据
 	 * @return
 	 */
+	@ApiOperation(value="获取飞机列表",tags="基础数据")
 	@GetMapping(value="/basicdata/sysAircrafts")
-	public ResponseDto getSysAircraft() {
+	public ResponseDto<List<SysAircraftDto>> getSysAircraft() {
 		List<SysAircraft> sysAircraftList = (List<SysAircraft>) sysAircraftDao.findAll();
-		return ResponseDto.success(sysAircraftList);
+		
+		//转换dto
+		List<SysAircraftDto> sysAircraftListDto = sysAircraftList.stream().map(x -> {
+			SysAircraftDto dto = sysAircraftConvert.sysAircraftToSysAircraftDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+				
+		return ResponseDto.success(sysAircraftListDto);
 	}
 }

src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAircrafttypeController.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.SysAircrafttypeDao;
 import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysAircrafttype;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.SysAircrafttypeDto;
+import com.gzzn.omms.adminapi.dto.basicdata.convert.SysAircrafttypeConvert;
 
 /**
  * 机型
@@ -20,14 +27,26 @@ public class SysAircrafttypeController {
 	 */
 	@Autowired
 	private SysAircrafttypeDao sysAircrafttypeDao;
-	
+	/**
+	 * 机型Dto接口
+	 */
+	@Autowired
+	private SysAircrafttypeConvert sysAircrafttypeConvert;
 	/**
 	 * 获取所有机型数据
 	 * @return
 	 */
+	@ApiOperation(value="获取机型列表",tags="基础数据")
 	@GetMapping(value="/basicdata/sysAircrafttypes")
-	public ResponseDto getSysAircrafttype() {
+	public ResponseDto<List<SysAircrafttypeDto>> getSysAircrafttype() {
 		List<SysAircrafttype> sysAircrafttypeList = (List<SysAircrafttype>) sysAircrafttypeDao.findAll();
-		return ResponseDto.success(sysAircrafttypeList);
+		
+		//转换dto
+		List<SysAircrafttypeDto> sysAircrafttypeListDto = sysAircrafttypeList.stream().map(x -> {
+			SysAircrafttypeDto dto = sysAircrafttypeConvert.sysAircrafttypeToSysAircrafttypeDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+				
+		return ResponseDto.success(sysAircrafttypeListDto);
 	}
 }

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/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<List<SysAirportDto>> getSysAirport() {
 		List<SysAirport> sysAirportList = (List<SysAirport>) sysAirportDao.findAll();
-		return ResponseDto.success(sysAirportList);
+		
+		//转换dto
+		List<SysAirportDto> sysAirportListDto = sysAirportList.stream().map(x -> {
+			SysAirportDto dto = sysAirportConvert.sysAirportToSysAirportDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+		
+		return ResponseDto.success(sysAirportListDto);
 	}
 }

src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysCityController.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.SysCityDao;
 import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysCity;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.SysCityDto;
+import com.gzzn.omms.adminapi.dto.basicdata.convert.SysCityConvert;
 
 /**
  * 城市
@@ -22,14 +27,26 @@ public class SysCityController {
 	 */
 	@Autowired
 	private SysCityDao sysCityDao;
-	
+	/**
+	 * 城市Dto接口
+	 */
+	@Autowired
+	private SysCityConvert sysCityConvert;
 	/**
 	 * 获取所有城市数据
 	 * @return
 	 */
+	@ApiOperation(value="获取城市列表",tags="基础数据")
 	@GetMapping(value="/basicdata/sysCitys")
-	public ResponseDto getSysCity() {
+	public ResponseDto<List<SysCityDto>> getSysCity() {
 		List<SysCity> sysCitieList = (List<SysCity>) sysCityDao.findAll();
-		return ResponseDto.success(sysCitieList);
+		
+		//转换dto
+		List<SysCityDto> sysCitieListDto = sysCitieList.stream().map(x -> {
+			SysCityDto dto = sysCityConvert.sysCityToSysCityDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+		
+		return ResponseDto.success(sysCitieListDto);
 	}
 }

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

@@ -0,0 +1,116 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+import java.math.BigDecimal;
+
+public class OrmsCarouselDto {
+	
+	private String carouselCode; //行李提取转盘代码
+
+	private BigDecimal actionOrder;
+
+	private String bcls; //行李提取转盘等级
+
+	private String carouselName; //行李提取转盘名称
+
+	private String carouselStatus; //行李提取转盘状态（可用、在用、锁定、禁用、预分...）
+
+	private BigDecimal iconLength; //资源图标长度（单位：像素）
+
+	private BigDecimal iconWidth; //资源图标宽度（单位：像素）
+
+	private BigDecimal posX; //坐标位置的X值
+
+	private BigDecimal posY; //坐标位置的Y值
+
+	private BigDecimal standLayouted; //机位已布局标志:1-已布局 0-未布局
+
+	private String terminalAreaCode; //航站楼区域代码
+
+	public String getCarouselCode() {
+		return this.carouselCode;
+	}
+
+	public void setCarouselCode(String carouselCode) {
+		this.carouselCode = carouselCode;
+	}
+
+	public BigDecimal getActionOrder() {
+		return this.actionOrder;
+	}
+
+	public void setActionOrder(BigDecimal actionOrder) {
+		this.actionOrder = actionOrder;
+	}
+
+	public String getBcls() {
+		return this.bcls;
+	}
+
+	public void setBcls(String bcls) {
+		this.bcls = bcls;
+	}
+
+	public String getCarouselName() {
+		return this.carouselName;
+	}
+
+	public void setCarouselName(String carouselName) {
+		this.carouselName = carouselName;
+	}
+
+	public String getCarouselStatus() {
+		return this.carouselStatus;
+	}
+
+	public void setCarouselStatus(String carouselStatus) {
+		this.carouselStatus = carouselStatus;
+	}
+
+	public BigDecimal getIconLength() {
+		return this.iconLength;
+	}
+
+	public void setIconLength(BigDecimal iconLength) {
+		this.iconLength = iconLength;
+	}
+
+	public BigDecimal getIconWidth() {
+		return this.iconWidth;
+	}
+
+	public void setIconWidth(BigDecimal iconWidth) {
+		this.iconWidth = iconWidth;
+	}
+
+	public BigDecimal getPosX() {
+		return this.posX;
+	}
+
+	public void setPosX(BigDecimal posX) {
+		this.posX = posX;
+	}
+
+	public BigDecimal getPosY() {
+		return this.posY;
+	}
+
+	public void setPosY(BigDecimal posY) {
+		this.posY = posY;
+	}
+
+	public BigDecimal getStandLayouted() {
+		return this.standLayouted;
+	}
+
+	public void setStandLayouted(BigDecimal standLayouted) {
+		this.standLayouted = standLayouted;
+	}
+
+	public String getTerminalAreaCode() {
+		return this.terminalAreaCode;
+	}
+
+	public void setTerminalAreaCode(String terminalAreaCode) {
+		this.terminalAreaCode = terminalAreaCode;
+	}
+}

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

@@ -0,0 +1,106 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+import java.math.BigDecimal;
+
+public class OrmsCheckindestDto {
+	
+	private String checkindeskCode; //值机柜台代码
+
+	private String ccat; //值机柜台种类
+
+	private String checkinGroupCode; //值机岛代码
+
+	private String checkindeskName; //值机柜台名称
+
+	private String checkindeskStatus; //E-可用/D-不可用
+
+	private String chutCode; //传送转盘code
+
+	private String ctra; //是否中转值机柜台
+
+	private String nextcheckindeskCode;
+
+	private BigDecimal operate; //操作标识：1-使用、0-删除标识
+
+	private String terminalAreaCode; //航站楼区域代码
+
+	public String getCheckindeskCode() {
+		return this.checkindeskCode;
+	}
+
+	public void setCheckindeskCode(String checkindeskCode) {
+		this.checkindeskCode = checkindeskCode;
+	}
+
+	public String getCcat() {
+		return this.ccat;
+	}
+
+	public void setCcat(String ccat) {
+		this.ccat = ccat;
+	}
+
+	public String getCheckinGroupCode() {
+		return this.checkinGroupCode;
+	}
+
+	public void setCheckinGroupCode(String checkinGroupCode) {
+		this.checkinGroupCode = checkinGroupCode;
+	}
+
+	public String getCheckindeskName() {
+		return this.checkindeskName;
+	}
+
+	public void setCheckindeskName(String checkindeskName) {
+		this.checkindeskName = checkindeskName;
+	}
+
+	public String getCheckindeskStatus() {
+		return this.checkindeskStatus;
+	}
+
+	public void setCheckindeskStatus(String checkindeskStatus) {
+		this.checkindeskStatus = checkindeskStatus;
+	}
+
+	public String getChutCode() {
+		return this.chutCode;
+	}
+
+	public void setChutCode(String chutCode) {
+		this.chutCode = chutCode;
+	}
+
+	public String getCtra() {
+		return this.ctra;
+	}
+
+	public void setCtra(String ctra) {
+		this.ctra = ctra;
+	}
+
+	public String getNextcheckindeskCode() {
+		return this.nextcheckindeskCode;
+	}
+
+	public void setNextcheckindeskCode(String nextcheckindeskCode) {
+		this.nextcheckindeskCode = nextcheckindeskCode;
+	}
+
+	public BigDecimal getOperate() {
+		return this.operate;
+	}
+
+	public void setOperate(BigDecimal operate) {
+		this.operate = operate;
+	}
+
+	public String getTerminalAreaCode() {
+		return this.terminalAreaCode;
+	}
+
+	public void setTerminalAreaCode(String terminalAreaCode) {
+		this.terminalAreaCode = terminalAreaCode;
+	}
+}

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

@@ -0,0 +1,77 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+import java.math.BigDecimal;
+
+public class OrmsChutDto {
+	
+	private String chutCode; //传送转盘code
+
+	private String bcat; //传送转盘种类
+
+	private String btml; //航站楼代码
+
+	private BigDecimal chutLength; //传送转盘高度
+
+	private String chutName; //传送转盘name
+
+	private String chutStatus; //E-可用/D-不可用
+
+	private BigDecimal operate; //操作标识 1-使用    0-删除标识
+
+	public String getChutCode() {
+		return this.chutCode;
+	}
+
+	public void setChutCode(String chutCode) {
+		this.chutCode = chutCode;
+	}
+
+	public String getBcat() {
+		return this.bcat;
+	}
+
+	public void setBcat(String bcat) {
+		this.bcat = bcat;
+	}
+
+	public String getBtml() {
+		return this.btml;
+	}
+
+	public void setBtml(String btml) {
+		this.btml = btml;
+	}
+
+	public BigDecimal getChutLength() {
+		return this.chutLength;
+	}
+
+	public void setChutLength(BigDecimal chutLength) {
+		this.chutLength = chutLength;
+	}
+
+	public String getChutName() {
+		return this.chutName;
+	}
+
+	public void setChutName(String chutName) {
+		this.chutName = chutName;
+	}
+
+	public String getChutStatus() {
+		return this.chutStatus;
+	}
+
+	public void setChutStatus(String chutStatus) {
+		this.chutStatus = chutStatus;
+	}
+
+	public BigDecimal getOperate() {
+		return this.operate;
+	}
+
+	public void setOperate(BigDecimal operate) {
+		this.operate = operate;
+	}
+
+}

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

@@ -0,0 +1,156 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+import java.math.BigDecimal;
+
+public class OrmsGateDto {
+	
+	private String gateCode; //登机门代码
+
+	private BigDecimal actionOrder;//资源使用序号
+
+	private String gateCategory;//I = International/国际;D = Domestic/国内
+
+	private String gateName; //登机门名称
+
+	private BigDecimal gateStatus; //登机门状态（可用、在用、锁定、禁用、预分...）
+
+	private String gateType;//'0'-到港门，'1'-离港门，'2'-混合
+
+	private String gtml;//航站楼代码
+
+	private BigDecimal iconLength;//资源图标长度（单位：像素）
+
+	private BigDecimal iconWidth;//资源图标宽度（单位：像素）
+
+	private BigDecimal operate;
+
+	private String pierCode;//指廊代码
+
+	private BigDecimal posX;//坐标位置的X值
+
+	private BigDecimal posY;//坐标位置的Y值
+
+	private BigDecimal standLayouted;//资源已布局标志 1-已布局 0-未布局
+
+	private String terminalAreaCode;//航站楼区域代码
+
+	public String getGateCode() {
+		return this.gateCode;
+	}
+
+	public void setGateCode(String gateCode) {
+		this.gateCode = gateCode;
+	}
+
+	public BigDecimal getActionOrder() {
+		return this.actionOrder;
+	}
+
+	public void setActionOrder(BigDecimal actionOrder) {
+		this.actionOrder = actionOrder;
+	}
+
+	public String getGateCategory() {
+		return this.gateCategory;
+	}
+
+	public void setGateCategory(String gateCategory) {
+		this.gateCategory = gateCategory;
+	}
+
+	public String getGateName() {
+		return this.gateName;
+	}
+
+	public void setGateName(String gateName) {
+		this.gateName = gateName;
+	}
+
+	public BigDecimal getGateStatus() {
+		return this.gateStatus;
+	}
+
+	public void setGateStatus(BigDecimal gateStatus) {
+		this.gateStatus = gateStatus;
+	}
+
+	public String getGateType() {
+		return this.gateType;
+	}
+
+	public void setGateType(String gateType) {
+		this.gateType = gateType;
+	}
+
+	public String getGtml() {
+		return this.gtml;
+	}
+
+	public void setGtml(String gtml) {
+		this.gtml = gtml;
+	}
+
+	public BigDecimal getIconLength() {
+		return this.iconLength;
+	}
+
+	public void setIconLength(BigDecimal iconLength) {
+		this.iconLength = iconLength;
+	}
+
+	public BigDecimal getIconWidth() {
+		return this.iconWidth;
+	}
+
+	public void setIconWidth(BigDecimal iconWidth) {
+		this.iconWidth = iconWidth;
+	}
+
+	public BigDecimal getOperate() {
+		return this.operate;
+	}
+
+	public void setOperate(BigDecimal operate) {
+		this.operate = operate;
+	}
+
+	public String getPierCode() {
+		return this.pierCode;
+	}
+
+	public void setPierCode(String pierCode) {
+		this.pierCode = pierCode;
+	}
+
+	public BigDecimal getPosX() {
+		return this.posX;
+	}
+
+	public void setPosX(BigDecimal posX) {
+		this.posX = posX;
+	}
+
+	public BigDecimal getPosY() {
+		return this.posY;
+	}
+
+	public void setPosY(BigDecimal posY) {
+		this.posY = posY;
+	}
+
+	public BigDecimal getStandLayouted() {
+		return this.standLayouted;
+	}
+
+	public void setStandLayouted(BigDecimal standLayouted) {
+		this.standLayouted = standLayouted;
+	}
+
+	public String getTerminalAreaCode() {
+		return this.terminalAreaCode;
+	}
+
+	public void setTerminalAreaCode(String terminalAreaCode) {
+		this.terminalAreaCode = terminalAreaCode;
+	}
+}

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

@@ -0,0 +1,267 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+import java.math.BigDecimal;
+
+public class OrmsStandDto {
+	
+	private String standCode; //停机位号
+
+	private BigDecimal currentFlightId; //当前航班ID
+
+	private String ddgt; //该机位默认的国内登机门
+
+	private String digt; //该机位默认的国际登机门
+
+	private String fstandCode; //父停机位号
+
+	private BigDecimal iconLength; //资源图标长度（单位：像素）
+
+	private BigDecimal iconWidth; //资源图标宽度（单位：像素）
+
+	private String lstandCode;
+
+	private BigDecimal maxPermit; //该停机位可容纳的最大旅客数/最大翼展
+
+	private BigDecimal maxflightnum; //最大可停靠航班数
+
+	private BigDecimal operate;
+
+	private String pierCode; //指廊代码
+
+	private BigDecimal posX; //坐标位置的X值
+
+	private BigDecimal posY; //坐标位置的Y值
+
+	private String rstandCode;
+
+	private String satc; //该停机位可以停放的最大机型种类 
+
+	private String standAreaCode; //停机位区域代码
+
+	private BigDecimal standLayouted; //资源已布局标志：1-已布局 0-未布局
+
+	private BigDecimal standLength; //停机位长度（单位：米）
+
+	private String standName; //停机位名称
+
+	private BigDecimal standOrder; //停机位顺序号
+
+	private BigDecimal standStatus; //停机位状态（0-可用、1-在用、2-锁定、3-禁用、4-预分...）
+
+	//停机位类别可取值：bridge-靠桥机位、remote-远机位、near-近机位、night-过夜机位、specific-专机位...
+	private String standType;
+
+	private BigDecimal standWidth; //停机位宽度
+
+	private String stml; //航站楼代码
+
+	private String terminalAreaCode; //航站楼区域代码
+
+	public String getStandCode() {
+		return this.standCode;
+	}
+
+	public void setStandCode(String standCode) {
+		this.standCode = standCode;
+	}
+
+	public BigDecimal getCurrentFlightId() {
+		return this.currentFlightId;
+	}
+
+	public void setCurrentFlightId(BigDecimal currentFlightId) {
+		this.currentFlightId = currentFlightId;
+	}
+
+	public String getDdgt() {
+		return this.ddgt;
+	}
+
+	public void setDdgt(String ddgt) {
+		this.ddgt = ddgt;
+	}
+
+	public String getDigt() {
+		return this.digt;
+	}
+
+	public void setDigt(String digt) {
+		this.digt = digt;
+	}
+
+	public String getFstandCode() {
+		return this.fstandCode;
+	}
+
+	public void setFstandCode(String fstandCode) {
+		this.fstandCode = fstandCode;
+	}
+
+	public BigDecimal getIconLength() {
+		return this.iconLength;
+	}
+
+	public void setIconLength(BigDecimal iconLength) {
+		this.iconLength = iconLength;
+	}
+
+	public BigDecimal getIconWidth() {
+		return this.iconWidth;
+	}
+
+	public void setIconWidth(BigDecimal iconWidth) {
+		this.iconWidth = iconWidth;
+	}
+
+	public String getLstandCode() {
+		return this.lstandCode;
+	}
+
+	public void setLstandCode(String lstandCode) {
+		this.lstandCode = lstandCode;
+	}
+
+	public BigDecimal getMaxPermit() {
+		return this.maxPermit;
+	}
+
+	public void setMaxPermit(BigDecimal maxPermit) {
+		this.maxPermit = maxPermit;
+	}
+
+	public BigDecimal getMaxflightnum() {
+		return this.maxflightnum;
+	}
+
+	public void setMaxflightnum(BigDecimal maxflightnum) {
+		this.maxflightnum = maxflightnum;
+	}
+
+	public BigDecimal getOperate() {
+		return this.operate;
+	}
+
+	public void setOperate(BigDecimal operate) {
+		this.operate = operate;
+	}
+
+	public String getPierCode() {
+		return this.pierCode;
+	}
+
+	public void setPierCode(String pierCode) {
+		this.pierCode = pierCode;
+	}
+
+	public BigDecimal getPosX() {
+		return this.posX;
+	}
+
+	public void setPosX(BigDecimal posX) {
+		this.posX = posX;
+	}
+
+	public BigDecimal getPosY() {
+		return this.posY;
+	}
+
+	public void setPosY(BigDecimal posY) {
+		this.posY = posY;
+	}
+
+	public String getRstandCode() {
+		return this.rstandCode;
+	}
+
+	public void setRstandCode(String rstandCode) {
+		this.rstandCode = rstandCode;
+	}
+
+	public String getSatc() {
+		return this.satc;
+	}
+
+	public void setSatc(String satc) {
+		this.satc = satc;
+	}
+
+	public String getStandAreaCode() {
+		return this.standAreaCode;
+	}
+
+	public void setStandAreaCode(String standAreaCode) {
+		this.standAreaCode = standAreaCode;
+	}
+
+	public BigDecimal getStandLayouted() {
+		return this.standLayouted;
+	}
+
+	public void setStandLayouted(BigDecimal standLayouted) {
+		this.standLayouted = standLayouted;
+	}
+
+	public BigDecimal getStandLength() {
+		return this.standLength;
+	}
+
+	public void setStandLength(BigDecimal standLength) {
+		this.standLength = standLength;
+	}
+
+	public String getStandName() {
+		return this.standName;
+	}
+
+	public void setStandName(String standName) {
+		this.standName = standName;
+	}
+
+	public BigDecimal getStandOrder() {
+		return this.standOrder;
+	}
+
+	public void setStandOrder(BigDecimal standOrder) {
+		this.standOrder = standOrder;
+	}
+
+	public BigDecimal getStandStatus() {
+		return this.standStatus;
+	}
+
+	public void setStandStatus(BigDecimal standStatus) {
+		this.standStatus = standStatus;
+	}
+
+	public String getStandType() {
+		return this.standType;
+	}
+
+	public void setStandType(String standType) {
+		this.standType = standType;
+	}
+
+	public BigDecimal getStandWidth() {
+		return this.standWidth;
+	}
+
+	public void setStandWidth(BigDecimal standWidth) {
+		this.standWidth = standWidth;
+	}
+
+	public String getStml() {
+		return this.stml;
+	}
+
+	public void setStml(String stml) {
+		this.stml = stml;
+	}
+
+	public String getTerminalAreaCode() {
+		return this.terminalAreaCode;
+	}
+
+	public void setTerminalAreaCode(String terminalAreaCode) {
+		this.terminalAreaCode = terminalAreaCode;
+	}
+}

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

@@ -0,0 +1,36 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+import java.math.BigDecimal;
+
+public class OrmsTerminalDto {
+	
+	private String terminalCode;//航站楼代码
+
+	private BigDecimal operate;//操作标识 1-使用    0-删除标识
+
+	private String terminalName;//航站楼名称
+
+	public String getTerminalCode() {
+		return this.terminalCode;
+	}
+
+	public void setTerminalCode(String terminalCode) {
+		this.terminalCode = terminalCode;
+	}
+
+	public BigDecimal getOperate() {
+		return this.operate;
+	}
+
+	public void setOperate(BigDecimal operate) {
+		this.operate = operate;
+	}
+
+	public String getTerminalName() {
+		return this.terminalName;
+	}
+
+	public void setTerminalName(String terminalName) {
+		this.terminalName = terminalName;
+	}
+}

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

@@ -0,0 +1,45 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+public class OrmsTerminalareaDto {
+	
+	private String terminalAreaCode; //航站楼区域代码
+
+	private String routeType;
+
+	private String terminalAreaName; //航站楼区域名称
+
+	private String terminalCode; //航站楼代码
+
+	public String getTerminalAreaCode() {
+		return this.terminalAreaCode;
+	}
+
+	public void setTerminalAreaCode(String terminalAreaCode) {
+		this.terminalAreaCode = terminalAreaCode;
+	}
+
+	public String getRouteType() {
+		return this.routeType;
+	}
+
+	public void setRouteType(String routeType) {
+		this.routeType = routeType;
+	}
+
+	public String getTerminalAreaName() {
+		return this.terminalAreaName;
+	}
+
+	public void setTerminalAreaName(String terminalAreaName) {
+		this.terminalAreaName = terminalAreaName;
+	}
+
+	public String getTerminalCode() {
+		return this.terminalCode;
+	}
+
+	public void setTerminalCode(String terminalCode) {
+		this.terminalCode = terminalCode;
+	}
+
+}

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

@@ -0,0 +1,116 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+import java.math.BigDecimal;
+
+public class SysAircraftDto {
+	
+	private long aircraftId; //飞机号表记录ID
+
+	private String aircraftNumber; //飞机号（飞机机尾号）
+
+	private String aircraftOwnerCode; //机主航空公司代码
+
+	private String aircraftTypeCode; //机型代码
+
+	private String airlineCode; //航空公司代码
+
+	private BigDecimal maxAirbridges; //最大乘客数
+
+	private BigDecimal maxFreightWeight; //最大货物重量
+
+	private BigDecimal maxPassengers; //飞机使用廊桥的最大数目
+
+	private BigDecimal maxTakeoffWeight; //最大起飞重量
+
+	private BigDecimal operate; //操作标识 1-使用    0-删除标识
+
+	private BigDecimal owid; //所属机构ID
+
+	public long getAircraftId() {
+		return this.aircraftId;
+	}
+
+	public void setAircraftId(long aircraftId) {
+		this.aircraftId = aircraftId;
+	}
+
+	public String getAircraftNumber() {
+		return this.aircraftNumber;
+	}
+
+	public void setAircraftNumber(String aircraftNumber) {
+		this.aircraftNumber = aircraftNumber;
+	}
+
+	public String getAircraftOwnerCode() {
+		return this.aircraftOwnerCode;
+	}
+
+	public void setAircraftOwnerCode(String aircraftOwnerCode) {
+		this.aircraftOwnerCode = aircraftOwnerCode;
+	}
+
+	public String getAircraftTypeCode() {
+		return this.aircraftTypeCode;
+	}
+
+	public void setAircraftTypeCode(String aircraftTypeCode) {
+		this.aircraftTypeCode = aircraftTypeCode;
+	}
+
+	public String getAirlineCode() {
+		return this.airlineCode;
+	}
+
+	public void setAirlineCode(String airlineCode) {
+		this.airlineCode = airlineCode;
+	}
+
+	public BigDecimal getMaxAirbridges() {
+		return this.maxAirbridges;
+	}
+
+	public void setMaxAirbridges(BigDecimal maxAirbridges) {
+		this.maxAirbridges = maxAirbridges;
+	}
+
+	public BigDecimal getMaxFreightWeight() {
+		return this.maxFreightWeight;
+	}
+
+	public void setMaxFreightWeight(BigDecimal maxFreightWeight) {
+		this.maxFreightWeight = maxFreightWeight;
+	}
+
+	public BigDecimal getMaxPassengers() {
+		return this.maxPassengers;
+	}
+
+	public void setMaxPassengers(BigDecimal maxPassengers) {
+		this.maxPassengers = maxPassengers;
+	}
+
+	public BigDecimal getMaxTakeoffWeight() {
+		return this.maxTakeoffWeight;
+	}
+
+	public void setMaxTakeoffWeight(BigDecimal maxTakeoffWeight) {
+		this.maxTakeoffWeight = maxTakeoffWeight;
+	}
+
+	public BigDecimal getOperate() {
+		return this.operate;
+	}
+
+	public void setOperate(BigDecimal operate) {
+		this.operate = operate;
+	}
+
+	public BigDecimal getOwid() {
+		return this.owid;
+	}
+
+	public void setOwid(BigDecimal owid) {
+		this.owid = owid;
+	}
+}

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

@@ -0,0 +1,166 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+import java.math.BigDecimal;
+
+public class SysAircrafttypeDto {
+	
+	private String aircraftTypeCode; //机型代码
+
+	private BigDecimal aircraftHeight; //飞机机身高度
+
+	private BigDecimal aircraftLength; //飞机机身长度
+
+	private String aircraftTypeCodeCaa; //机型代码(CAA格式)
+
+	private String aircraftTypeCodeIata; //机型代码(IATA格式)
+
+	private String aircraftTypeCodeIcao; //机型代码(ICAO格式)
+
+	private String aircraftTypeName; //机型名称（机型说明）
+
+	private BigDecimal aircraftWidth; //飞机宽度（翼展宽度）
+
+	private BigDecimal aircrafttypegroupId; //机型组记录ID
+
+	private String chap; //机型分类
+
+	private BigDecimal maxAirbridges; //飞机使用廊桥的最大数目
+
+	private BigDecimal maxFreightWeight; //最大货物重量
+
+	private BigDecimal maxPassengers; //最大乘客数
+
+	private BigDecimal maxTakeoffWeight; //最大起飞重量
+
+	private BigDecimal operate; //操作标识 1-使用    0-删除标识
+
+	private BigDecimal transitstoptime; //过站经停时长（单位：分钟）
+
+	public String getAircraftTypeCode() {
+		return this.aircraftTypeCode;
+	}
+
+	public void setAircraftTypeCode(String aircraftTypeCode) {
+		this.aircraftTypeCode = aircraftTypeCode;
+	}
+
+	public BigDecimal getAircraftHeight() {
+		return this.aircraftHeight;
+	}
+
+	public void setAircraftHeight(BigDecimal aircraftHeight) {
+		this.aircraftHeight = aircraftHeight;
+	}
+
+	public BigDecimal getAircraftLength() {
+		return this.aircraftLength;
+	}
+
+	public void setAircraftLength(BigDecimal aircraftLength) {
+		this.aircraftLength = aircraftLength;
+	}
+
+	public String getAircraftTypeCodeCaa() {
+		return this.aircraftTypeCodeCaa;
+	}
+
+	public void setAircraftTypeCodeCaa(String aircraftTypeCodeCaa) {
+		this.aircraftTypeCodeCaa = aircraftTypeCodeCaa;
+	}
+
+	public String getAircraftTypeCodeIata() {
+		return this.aircraftTypeCodeIata;
+	}
+
+	public void setAircraftTypeCodeIata(String aircraftTypeCodeIata) {
+		this.aircraftTypeCodeIata = aircraftTypeCodeIata;
+	}
+
+	public String getAircraftTypeCodeIcao() {
+		return this.aircraftTypeCodeIcao;
+	}
+
+	public void setAircraftTypeCodeIcao(String aircraftTypeCodeIcao) {
+		this.aircraftTypeCodeIcao = aircraftTypeCodeIcao;
+	}
+
+	public String getAircraftTypeName() {
+		return this.aircraftTypeName;
+	}
+
+	public void setAircraftTypeName(String aircraftTypeName) {
+		this.aircraftTypeName = aircraftTypeName;
+	}
+
+	public BigDecimal getAircraftWidth() {
+		return this.aircraftWidth;
+	}
+
+	public void setAircraftWidth(BigDecimal aircraftWidth) {
+		this.aircraftWidth = aircraftWidth;
+	}
+
+	public BigDecimal getAircrafttypegroupId() {
+		return this.aircrafttypegroupId;
+	}
+
+	public void setAircrafttypegroupId(BigDecimal aircrafttypegroupId) {
+		this.aircrafttypegroupId = aircrafttypegroupId;
+	}
+
+	public String getChap() {
+		return this.chap;
+	}
+
+	public void setChap(String chap) {
+		this.chap = chap;
+	}
+
+	public BigDecimal getMaxAirbridges() {
+		return this.maxAirbridges;
+	}
+
+	public void setMaxAirbridges(BigDecimal maxAirbridges) {
+		this.maxAirbridges = maxAirbridges;
+	}
+
+	public BigDecimal getMaxFreightWeight() {
+		return this.maxFreightWeight;
+	}
+
+	public void setMaxFreightWeight(BigDecimal maxFreightWeight) {
+		this.maxFreightWeight = maxFreightWeight;
+	}
+
+	public BigDecimal getMaxPassengers() {
+		return this.maxPassengers;
+	}
+
+	public void setMaxPassengers(BigDecimal maxPassengers) {
+		this.maxPassengers = maxPassengers;
+	}
+
+	public BigDecimal getMaxTakeoffWeight() {
+		return this.maxTakeoffWeight;
+	}
+
+	public void setMaxTakeoffWeight(BigDecimal maxTakeoffWeight) {
+		this.maxTakeoffWeight = maxTakeoffWeight;
+	}
+
+	public BigDecimal getOperate() {
+		return this.operate;
+	}
+
+	public void setOperate(BigDecimal operate) {
+		this.operate = operate;
+	}
+
+	public BigDecimal getTransitstoptime() {
+		return this.transitstoptime;
+	}
+
+	public void setTransitstoptime(BigDecimal transitstoptime) {
+		this.transitstoptime = transitstoptime;
+	}
+}

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/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;
+	}
+}

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

@@ -0,0 +1,97 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+import java.math.BigDecimal;
+
+public class SysCityDto {
+	
+	private long cityId; //城市ID
+
+	private String cityCode; //城市代码
+
+	private String cityIccde; //ICCD城市代码
+
+	private String cityNameChn; //城市名称（中文）
+
+	private String cityNameEng; //城市名称（英文）
+
+	private BigDecimal countryId; //国家ID
+
+	private BigDecimal mainCityTag; //主干城市标志:1-主干城市（相应机场为主干机场）0-非主干城市（相应机场为非主干机场）
+
+	private BigDecimal operate; //操作标识 1-使用    0-删除标识
+
+	private String telCityCode;
+
+	public long getCityId() {
+		return this.cityId;
+	}
+
+	public void setCityId(long cityId) {
+		this.cityId = cityId;
+	}
+
+	public String getCityCode() {
+		return this.cityCode;
+	}
+
+	public void setCityCode(String cityCode) {
+		this.cityCode = cityCode;
+	}
+
+	public String getCityIccde() {
+		return this.cityIccde;
+	}
+
+	public void setCityIccde(String cityIccde) {
+		this.cityIccde = cityIccde;
+	}
+
+	public String getCityNameChn() {
+		return this.cityNameChn;
+	}
+
+	public void setCityNameChn(String cityNameChn) {
+		this.cityNameChn = cityNameChn;
+	}
+
+	public String getCityNameEng() {
+		return this.cityNameEng;
+	}
+
+	public void setCityNameEng(String cityNameEng) {
+		this.cityNameEng = cityNameEng;
+	}
+
+	public BigDecimal getCountryId() {
+		return this.countryId;
+	}
+
+	public void setCountryId(BigDecimal countryId) {
+		this.countryId = countryId;
+	}
+
+	public BigDecimal getMainCityTag() {
+		return this.mainCityTag;
+	}
+
+	public void setMainCityTag(BigDecimal mainCityTag) {
+		this.mainCityTag = mainCityTag;
+	}
+
+	public BigDecimal getOperate() {
+		return this.operate;
+	}
+
+	public void setOperate(BigDecimal operate) {
+		this.operate = operate;
+	}
+
+	public String getTelCityCode() {
+		return this.telCityCode;
+	}
+
+	public void setTelCityCode(String telCityCode) {
+		this.telCityCode = telCityCode;
+	}
+
+}

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/OrmsCarouselConvert.java

@@ -0,0 +1,11 @@
+package com.gzzn.omms.adminapi.dto.basicdata.convert;
+
+import org.mapstruct.Mapper;
+import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.OrmsCarousel;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsCarouselDto;
+
+@Mapper(componentModel="spring")
+public interface OrmsCarouselConvert {
+	
+   public OrmsCarouselDto ormsCarouselToOrmsCarouselDto(OrmsCarousel ormsCarousel);
+}

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/OrmsCheckindestConvert.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.OrmsCheckindesk;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsCheckindestDto;
+
+@Mapper(componentModel="spring")
+public interface OrmsCheckindestConvert {
+	
+   public OrmsCheckindestDto ormsCheckindeskToOrmsCheckindestDto(OrmsCheckindesk ormsCheckindesk);
+}

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/OrmsChutConvert.java

@@ -0,0 +1,11 @@
+package com.gzzn.omms.adminapi.dto.basicdata.convert;
+
+import org.mapstruct.Mapper;
+import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.OrmsChut;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsChutDto;
+
+@Mapper(componentModel="spring")
+public interface OrmsChutConvert {
+	
+   public OrmsChutDto ormsChutToOrmsChutDto(OrmsChut ormsChut);
+}

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/OrmsGateConvert.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.OrmsGate;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsGateDto;
+
+@Mapper(componentModel="spring")
+public interface OrmsGateConvert {
+	
+   public OrmsGateDto ormsChutToOrmsChutDto(OrmsGate ormsGate);
+}

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/OrmsStandConvert.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.OrmsStand;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsStandDto;
+
+@Mapper(componentModel="spring")
+public interface OrmsStandConvert {
+	
+   public OrmsStandDto ormsStandToOrmsStandDto(OrmsStand ormsStand);
+}

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/OrmsTerminalConvert.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.OrmsTerminal;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsTerminalDto;
+
+@Mapper(componentModel="spring")
+public interface OrmsTerminalConvert {
+	
+   public OrmsTerminalDto ormsTerminalToOrmsTerminalDto(OrmsTerminal ormsTerminal);
+}

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/OrmsTerminalareaConvert.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.OrmsTerminalarea;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsTerminalareaDto;
+
+@Mapper(componentModel="spring")
+public interface OrmsTerminalareaConvert {
+	
+   public OrmsTerminalareaDto ormsTerminalareaToOrmsTerminalDto(OrmsTerminalarea ormsTerminalarea);
+}

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAircraftConvert.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.SysAircraft;
+import com.gzzn.omms.adminapi.dto.basicdata.SysAircraftDto;
+
+@Mapper(componentModel="spring")
+public interface SysAircraftConvert {
+	
+   public SysAircraftDto sysAircraftToSysAircraftDto(SysAircraft sysAircraft);
+}

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAircrafttypeConvert.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.SysAircrafttype;
+import com.gzzn.omms.adminapi.dto.basicdata.SysAircrafttypeDto;
+
+@Mapper(componentModel="spring")
+public interface SysAircrafttypeConvert {
+	
+   public SysAircrafttypeDto sysAircrafttypeToSysAircrafttypeDto(SysAircrafttype sysAircrafttype);
+}

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);
+}

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);
+}

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysCityConvert.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.SysCity;
+import com.gzzn.omms.adminapi.dto.basicdata.SysCityDto;
+
+@Mapper(componentModel="spring")
+public interface SysCityConvert {
+	
+   public SysCityDto sysCityToSysCityDto(SysCity sysCity);
+}