diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/OrmsTerminalareaController.java b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/OrmsTerminalareaController.java index c5da955..5b9340b 100644 --- a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/OrmsTerminalareaController.java +++ b/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> getOrmsTerminalarea() { List ormsTerminalareaList = (List) ormsTerminalareaDao.findAll(); - return ResponseDto.success(ormsTerminalareaList); + + //转换dto + List ormsTerminalareaListDto = ormsTerminalareaList.stream().map(x -> { + OrmsTerminalareaDto dto = ormsTerminalareaConvert.ormsTerminalareaToOrmsTerminalDto(x); + return dto; + }).collect(Collectors.toList()); + + return ResponseDto.success(ormsTerminalareaListDto); } } diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/OrmsTerminalareaDto.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/OrmsTerminalareaDto.java new file mode 100644 index 0000000..62847c1 --- /dev/null +++ b/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; + } + +} diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/OrmsTerminalareaConvert.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/OrmsTerminalareaConvert.java new file mode 100644 index 0000000..5d35866 --- /dev/null +++ b/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); +}