新增航班类型基础数据

src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysFlightTypeController.java

@@ -0,0 +1,49 @@
+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.SysFlightTypeDao;
+import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysFlightType;
+import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.SysFlightTypeDto;
+import com.gzzn.omms.adminapi.dto.basicdata.convert.SysFlightTypeConvert;
+
+/**
+ * 航班类型代码
+ * @author fhc
+ * @since 2018-12-13
+ *
+ */
+@RestController
+public class SysFlightTypeController {
+	
+	@Autowired
+	private SysFlightTypeConvert sysFlightTypeConvert;
+	
+	@Autowired
+	private SysFlightTypeDao sysFlightTypeDao;
+	
+	/**
+	 * 获取所有航班类型代码
+	 * @return
+	 */
+	@ApiOperation(value="获取所有航班类型代码列表",tags="基础数据")
+	@GetMapping(value="/basicdata/sysFlightTypes")
+	public ResponseDto<List<SysFlightTypeDto>> getSysFlightTypes() {
+       List<SysFlightType> sysFlightTypes = (List<SysFlightType>) sysFlightTypeDao.findAll();
+		
+		//转换dto
+		List<SysFlightTypeDto> dtoList = sysFlightTypes.stream().map(
+			x -> sysFlightTypeConvert.SysFlightTypeToSysFlightTypeDto(x)
+		).collect(Collectors.toList());
+		
+		return ResponseDto.success(dtoList);
+	}
+}

src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysFlightTypeDao.java

@@ -0,0 +1,9 @@
+package com.gzzn.omms.adminapi.domain.secondary.dao.basicdata;
+
+import org.springframework.data.repository.CrudRepository;
+
+import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysFlightType;
+
+public interface SysFlightTypeDao  extends CrudRepository<SysFlightType, String> {
+
+}

src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysFlightStatus.java

@@ -1,6 +1,7 @@
 package com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata;
 
 import java.io.Serializable;
+
 import javax.persistence.*;
 
 
@@ -15,12 +16,18 @@ public class SysFlightStatus implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
+	@SequenceGenerator(name="STTC_GENERATOR", sequenceName="STTC")
+	@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="STTC_GENERATOR")
+	@Column(name="STTC")
 	private String sttc;//航班状态代码
 
+	@Column(name="ABNS")
 	private String abns;//航班状态描述
 
+	@Column(name="STDC")
 	private String stdc;//航班状态中文描述
 
+	@Column(name="STTD")
 	private String sttd;//这个状态是否为异常状态 Y-是一个异常状态 N-不是一个异常状态
 
 	public SysFlightStatus() {

src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysFlightType.java

@@ -0,0 +1,179 @@
+package com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+
+/**
+ * The persistent class for the SYS_FLIGHT_STATUS database table.
+ * 航班类型代码
+ */
+@Entity
+@Table(name="SYS_FLIGHT_TYPE")
+@NamedQuery(name="SysFlightType.findAll", query="SELECT s FROM SysFlightType s")
+public class SysFlightType implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@SequenceGenerator(name="FLIGHT_TYPE_CODE_GENERATOR", sequenceName="FLIGHT_TYPE_CODE")
+	@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="FLIGHT_TYPE_CODE_GENERATOR")
+	@Column(name="FLIGHT_TYPE_CODE")
+	private String flightTypeCode;//航班类型代码
+
+	@Column(name="FLIGHT_TYPE_CAA_CODE")
+	private String flightTypeCaaCode;//航班类型CAA代码
+	
+	@Column(name="FLIGHT_TYPE_NAME")
+	private String flightTypeName;//航班类型描述
+	
+	@Column(name="C_TAG")
+	private String cTag;//是否商务航班
+
+	@Column(name="VIP_TAG")
+	private String vipTag;//是否VIP航班
+	
+	@Column(name="FLIGHT_TYPE_NAME_CN")
+	private String flightTypeNameCn;//航班类型中文描述
+	
+	@Column(name="OPERATE")
+	private Byte operate;//操作标识 1-使用    0-删除标识
+
+	public String getFlightTypeCode() {
+		return flightTypeCode;
+	}
+
+	public void setFlightTypeCode(String flightTypeCode) {
+		this.flightTypeCode = flightTypeCode;
+	}
+
+	public String getFlightTypeCaaCode() {
+		return flightTypeCaaCode;
+	}
+
+	public void setFlightTypeCaaCode(String flightTypeCaaCode) {
+		this.flightTypeCaaCode = flightTypeCaaCode;
+	}
+
+	public String getFlightTypeName() {
+		return flightTypeName;
+	}
+
+	public void setFlightTypeName(String flightTypeName) {
+		this.flightTypeName = flightTypeName;
+	}
+
+	public String getcTag() {
+		return cTag;
+	}
+
+	public void setcTag(String cTag) {
+		this.cTag = cTag;
+	}
+
+	public String getVipTag() {
+		return vipTag;
+	}
+
+	public void setVipTag(String vipTag) {
+		this.vipTag = vipTag;
+	}
+
+	public String getFlightTypeNameCn() {
+		return flightTypeNameCn;
+	}
+
+	public void setFlightTypeNameCn(String flightTypeNameCn) {
+		this.flightTypeNameCn = flightTypeNameCn;
+	}
+
+	public Byte getOperate() {
+		return operate;
+	}
+
+	public void setOperate(Byte operate) {
+		this.operate = operate;
+	}
+	
+	public SysFlightType() {
+
+	}
+
+	@Override
+	public String toString() {
+		return "SysFlightType [flightTypeCode=" + flightTypeCode
+				+ ", flightTypeCaaCode=" + flightTypeCaaCode
+				+ ", flightTypeName=" + flightTypeName + ", cTag=" + cTag
+				+ ", vipTag=" + vipTag + ", flightTypeNameCn="
+				+ flightTypeNameCn + ", operate=" + operate + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((cTag == null) ? 0 : cTag.hashCode());
+		result = prime
+				* result
+				+ ((flightTypeCaaCode == null) ? 0 : flightTypeCaaCode
+						.hashCode());
+		result = prime * result
+				+ ((flightTypeCode == null) ? 0 : flightTypeCode.hashCode());
+		result = prime * result
+				+ ((flightTypeName == null) ? 0 : flightTypeName.hashCode());
+		result = prime
+				* result
+				+ ((flightTypeNameCn == null) ? 0 : flightTypeNameCn.hashCode());
+		result = prime * result + ((operate == null) ? 0 : operate.hashCode());
+		result = prime * result + ((vipTag == null) ? 0 : vipTag.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		SysFlightType other = (SysFlightType) obj;
+		if (cTag == null) {
+			if (other.cTag != null)
+				return false;
+		} else if (!cTag.equals(other.cTag))
+			return false;
+		if (flightTypeCaaCode == null) {
+			if (other.flightTypeCaaCode != null)
+				return false;
+		} else if (!flightTypeCaaCode.equals(other.flightTypeCaaCode))
+			return false;
+		if (flightTypeCode == null) {
+			if (other.flightTypeCode != null)
+				return false;
+		} else if (!flightTypeCode.equals(other.flightTypeCode))
+			return false;
+		if (flightTypeName == null) {
+			if (other.flightTypeName != null)
+				return false;
+		} else if (!flightTypeName.equals(other.flightTypeName))
+			return false;
+		if (flightTypeNameCn == null) {
+			if (other.flightTypeNameCn != null)
+				return false;
+		} else if (!flightTypeNameCn.equals(other.flightTypeNameCn))
+			return false;
+		if (operate == null) {
+			if (other.operate != null)
+				return false;
+		} else if (!operate.equals(other.operate))
+			return false;
+		if (vipTag == null) {
+			if (other.vipTag != null)
+				return false;
+		} else if (!vipTag.equals(other.vipTag))
+			return false;
+		return true;
+	}
+	
+}

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

@@ -0,0 +1,91 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**
+ * 
+ * 航班类型代码Dto
+ */
+@ApiModel(value="航班类型代码Dto",description="航班类型代码基础数据")
+public class SysFlightTypeDto {
+
+	@ApiModelProperty(value="航班类型代码",example="]")
+	private String flightTypeCode;//航班类型代码
+
+	@ApiModelProperty(value="航班类型CAA代码",example="Y/A")
+	private String flightTypeCaaCode;//航班类型CAA代码
+	
+	@ApiModelProperty(value="航班类型描述",example="养调")
+	private String flightTypeName;//航班类型描述
+	
+	@ApiModelProperty(value="是否商务航班",example="N")
+	private String cTag;//是否商务航班
+
+	@ApiModelProperty(value="是否VIP航班",example="")
+	private String vipTag;//是否VIP航班
+	
+	@ApiModelProperty(value="航班类型代码",example="养调")
+	private String flightTypeNameCn;//航班类型中文描述
+	
+	@ApiModelProperty(value="操作标识 1-使用    0-删除标识",example="1")
+	private Byte operate;//操作标识 1-使用    0-删除标识
+
+	public String getFlightTypeCode() {
+		return flightTypeCode;
+	}
+
+	public void setFlightTypeCode(String flightTypeCode) {
+		this.flightTypeCode = flightTypeCode;
+	}
+
+	public String getFlightTypeCaaCode() {
+		return flightTypeCaaCode;
+	}
+
+	public void setFlightTypeCaaCode(String flightTypeCaaCode) {
+		this.flightTypeCaaCode = flightTypeCaaCode;
+	}
+
+	public String getFlightTypeName() {
+		return flightTypeName;
+	}
+
+	public void setFlightTypeName(String flightTypeName) {
+		this.flightTypeName = flightTypeName;
+	}
+
+	public String getcTag() {
+		return cTag;
+	}
+
+	public void setcTag(String cTag) {
+		this.cTag = cTag;
+	}
+
+	public String getVipTag() {
+		return vipTag;
+	}
+
+	public void setVipTag(String vipTag) {
+		this.vipTag = vipTag;
+	}
+
+	public String getFlightTypeNameCn() {
+		return flightTypeNameCn;
+	}
+
+	public void setFlightTypeNameCn(String flightTypeNameCn) {
+		this.flightTypeNameCn = flightTypeNameCn;
+	}
+
+	public Byte getOperate() {
+		return operate;
+	}
+
+	public void setOperate(Byte operate) {
+		this.operate = operate;
+	}
+
+}

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysFlightTypeConvert.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.SysFlightType;
+import com.gzzn.omms.adminapi.dto.basicdata.SysFlightTypeDto;
+
+@Mapper(componentModel="spring")
+public interface SysFlightTypeConvert {
+public SysFlightType SysFlightTypeDtoToSysFlightType(SysFlightTypeDto sysFlightTypeDto);
+public SysFlightTypeDto SysFlightTypeToSysFlightTypeDto(SysFlightType sysFlightType);
+}