From 7625cd588af14d9082ba3a365a56a75145dd76f7 Mon Sep 17 00:00:00 2001 From: "714943302@qq.com" Date: Tue, 30 Oct 2018 17:59:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9F=8E=E5=B8=82Dto?= =?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/SysCityController.java | 23 ++++- .../adminapi/dto/basicdata/SysCityDto.java | 97 +++++++++++++++++++ .../dto/basicdata/convert/SysCityConvert.java | 12 +++ 3 files changed, 129 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysCityDto.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysCityConvert.java diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysCityController.java b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysCityController.java index 78d5610..f31072d 100644 --- a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysCityController.java +++ b/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> getSysCity() { List sysCitieList = (List) sysCityDao.findAll(); - return ResponseDto.success(sysCitieList); + + //转换dto + List sysCitieListDto = sysCitieList.stream().map(x -> { + SysCityDto dto = sysCityConvert.sysCityToSysCityDto(x); + return dto; + }).collect(Collectors.toList()); + + return ResponseDto.success(sysCitieListDto); } } diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysCityDto.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysCityDto.java new file mode 100644 index 0000000..dbb396c --- /dev/null +++ b/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; + } + +} diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysCityConvert.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysCityConvert.java new file mode 100644 index 0000000..0303a6c --- /dev/null +++ b/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); +}