From 60b00185e864c066670f5cf1e6766d820daad55b Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Tue, 30 Oct 2018 17:56:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=88=AA=E7=AB=99=E6=A5=BCDt?=
 =?UTF-8?q?o=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/OrmsTerminalController.java     | 23 ++++++++++--
 .../dto/basicdata/OrmsTerminalDto.java        | 36 +++++++++++++++++++
 .../convert/OrmsTerminalConvert.java          | 12 +++++++
 3 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/OrmsTerminalDto.java
 create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/OrmsTerminalConvert.java

diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/OrmsTerminalController.java b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/OrmsTerminalController.java
index 001f588..d71dc8f 100644
--- a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/OrmsTerminalController.java
+++ b/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);
 	}
 }
diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/OrmsTerminalDto.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/OrmsTerminalDto.java
new file mode 100644
index 0000000..c130cb0
--- /dev/null
+++ b/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;
+	}
+}
diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/OrmsTerminalConvert.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/OrmsTerminalConvert.java
new file mode 100644
index 0000000..1d0f554
--- /dev/null
+++ b/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);
+}