新增城市Dto、Convert接口实现

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