From db2d80dac471137235371dc6368c804f78ec8ee8 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Tue, 30 Oct 2018 17:56:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=88=AA=E7=AB=99=E6=A5=BC?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9FDto=E3=80=81Convert=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/OrmsTerminalareaController.java | 25 +++++++++--
 .../dto/basicdata/OrmsTerminalareaDto.java    | 45 +++++++++++++++++++
 .../convert/OrmsTerminalareaConvert.java      | 12 +++++
 3 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/OrmsTerminalareaDto.java
 create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/OrmsTerminalareaConvert.java

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