新增行李转盘Dto、Convert接口实现

src/main/java/com/gzzn/omms/adminapi/controller/basicdata/OrmsCarouselController.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.OrmsCarouselDao;
 import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.OrmsCarousel;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsCarouselDto;
+import com.gzzn.omms.adminapi.dto.basicdata.convert.OrmsCarouselConvert;
 
 /**
  * 行李转盘
@@ -20,14 +27,27 @@ public class OrmsCarouselController {
 	 */
 	@Autowired
 	private OrmsCarouselDao ormsCarouselDao;
+	/**
+	 * 行李转盘Dto接口
+	 */
+	@Autowired
+	private OrmsCarouselConvert ormsCarouselConvert;
 	
 	/**
 	 * 获取所有行李转盘数据
 	 * @return
 	 */
+	@ApiOperation(value="获取行李转盘列表",tags="基础数据") 
 	@GetMapping(value="/basicdata/ormsCarousels")
-	public ResponseDto getOrmsCarousel() {
+	public ResponseDto<List<OrmsCarouselDto>> getOrmsCarousel() {
 		List<OrmsCarousel> ormsCarouselList = (List<OrmsCarousel>) ormsCarouselDao.findAll();
-		return ResponseDto.success(ormsCarouselList);
+		
+		//转换dto
+		List<OrmsCarouselDto> ormsCarouselListDto = ormsCarouselList.stream().map(x -> {
+			OrmsCarouselDto dto = ormsCarouselConvert.ormsCarouselToOrmsCarouselDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+		
+		return ResponseDto.success(ormsCarouselListDto);
 	}
 }

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/OrmsCarouselDto.java

@@ -0,0 +1,116 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+import java.math.BigDecimal;
+
+public class OrmsCarouselDto {
+	
+	private String carouselCode; //行李提取转盘代码
+
+	private BigDecimal actionOrder;
+
+	private String bcls; //行李提取转盘等级
+
+	private String carouselName; //行李提取转盘名称
+
+	private String carouselStatus; //行李提取转盘状态（可用、在用、锁定、禁用、预分...）
+
+	private BigDecimal iconLength; //资源图标长度（单位：像素）
+
+	private BigDecimal iconWidth; //资源图标宽度（单位：像素）
+
+	private BigDecimal posX; //坐标位置的X值
+
+	private BigDecimal posY; //坐标位置的Y值
+
+	private BigDecimal standLayouted; //机位已布局标志:1-已布局 0-未布局
+
+	private String terminalAreaCode; //航站楼区域代码
+
+	public String getCarouselCode() {
+		return this.carouselCode;
+	}
+
+	public void setCarouselCode(String carouselCode) {
+		this.carouselCode = carouselCode;
+	}
+
+	public BigDecimal getActionOrder() {
+		return this.actionOrder;
+	}
+
+	public void setActionOrder(BigDecimal actionOrder) {
+		this.actionOrder = actionOrder;
+	}
+
+	public String getBcls() {
+		return this.bcls;
+	}
+
+	public void setBcls(String bcls) {
+		this.bcls = bcls;
+	}
+
+	public String getCarouselName() {
+		return this.carouselName;
+	}
+
+	public void setCarouselName(String carouselName) {
+		this.carouselName = carouselName;
+	}
+
+	public String getCarouselStatus() {
+		return this.carouselStatus;
+	}
+
+	public void setCarouselStatus(String carouselStatus) {
+		this.carouselStatus = carouselStatus;
+	}
+
+	public BigDecimal getIconLength() {
+		return this.iconLength;
+	}
+
+	public void setIconLength(BigDecimal iconLength) {
+		this.iconLength = iconLength;
+	}
+
+	public BigDecimal getIconWidth() {
+		return this.iconWidth;
+	}
+
+	public void setIconWidth(BigDecimal iconWidth) {
+		this.iconWidth = iconWidth;
+	}
+
+	public BigDecimal getPosX() {
+		return this.posX;
+	}
+
+	public void setPosX(BigDecimal posX) {
+		this.posX = posX;
+	}
+
+	public BigDecimal getPosY() {
+		return this.posY;
+	}
+
+	public void setPosY(BigDecimal posY) {
+		this.posY = posY;
+	}
+
+	public BigDecimal getStandLayouted() {
+		return this.standLayouted;
+	}
+
+	public void setStandLayouted(BigDecimal standLayouted) {
+		this.standLayouted = standLayouted;
+	}
+
+	public String getTerminalAreaCode() {
+		return this.terminalAreaCode;
+	}
+
+	public void setTerminalAreaCode(String terminalAreaCode) {
+		this.terminalAreaCode = terminalAreaCode;
+	}
+}

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/OrmsCarouselConvert.java

@@ -0,0 +1,11 @@
+package com.gzzn.omms.adminapi.dto.basicdata.convert;
+
+import org.mapstruct.Mapper;
+import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.OrmsCarousel;
+import com.gzzn.omms.adminapi.dto.basicdata.OrmsCarouselDto;
+
+@Mapper(componentModel="spring")
+public interface OrmsCarouselConvert {
+	
+   public OrmsCarouselDto ormsCarouselToOrmsCarouselDto(OrmsCarousel ormsCarousel);
+}