From 7a09773dc87c2e0089374abf6762ff68efb3911a Mon Sep 17 00:00:00 2001 From: zhouxiunai <154707516@qq.com> Date: Sat, 11 May 2019 16:36:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A3=E5=BA=A6=E8=AE=A1=E5=88=92=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=AE=8C=E6=95=B4=E8=88=AA=E7=BA=BF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/schedule/FimsFlightschdSeason.java | 19 ++++ .../schedule/FimsMidairportsSeason.java | 87 +++++++++++++++++++ .../basicdata/FimsFlightschdSeasonDto.java | 15 ++++ .../FlightSchdSeasonControllerTest.java | 40 +++++++++ 4 files changed, 161 insertions(+) create mode 100644 src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/schedule/FimsMidairportsSeason.java create mode 100644 src/test/java/com/gzzn/omms/adminapi/controller/schedule/FlightSchdSeasonControllerTest.java diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/schedule/FimsFlightschdSeason.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/schedule/FimsFlightschdSeason.java index 57b98e4..f428d41 100644 --- a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/schedule/FimsFlightschdSeason.java +++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/schedule/FimsFlightschdSeason.java @@ -3,10 +3,16 @@ package com.gzzn.omms.adminapi.domain.secondary.entity.schedule; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.HashSet; +import java.util.Set; + import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; @@ -93,6 +99,11 @@ public class FimsFlightschdSeason implements Serializable { @Column(name="SUB_AIRLINE_ID") private BigDecimal subAirlineId; //二级承运航空公司ID + //航班经停站列表 + @OneToMany(fetch=FetchType.EAGER) + @JoinColumn(name = "SEASONFLIGHT_ID") + private Set fimsMidairportsSeasons = new HashSet<>(); + public FimsFlightschdSeason() { } @@ -272,4 +283,12 @@ public class FimsFlightschdSeason implements Serializable { this.subAirlineId = subAirlineId; } + public Set getFimsMidairportsSeasons() { + return fimsMidairportsSeasons; + } + + public void setFimsMidairportsSeasons(Set fimsMidairportsSeasons) { + this.fimsMidairportsSeasons = fimsMidairportsSeasons; + } + } \ No newline at end of file diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/schedule/FimsMidairportsSeason.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/schedule/FimsMidairportsSeason.java new file mode 100644 index 0000000..9602d63 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/schedule/FimsMidairportsSeason.java @@ -0,0 +1,87 @@ +package com.gzzn.omms.adminapi.domain.secondary.entity.schedule; + +import java.math.BigDecimal; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +/** + * 航班计划中航班经停站列表（季度）。用于形成完整航线 + * @author zhouxiunai + * + */ +@Entity +@Table(name="FIMS_MIDAIRPORTS_SEASON") +public class FimsMidairportsSeason { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="MIDAIRPORTS_REC_ID") + private long midairportsRecId; + + @Column(name="AIRPORT_ID") + private BigDecimal airportId; + + @Column(name="ARRIVAL_TIME") + private String arrivalTime; + + @Column(name="DEPARTURE_TIME") + private String departureTime; + + private BigDecimal orderno; + + @Column(name="SEASONFLIGHT_ID") + private BigDecimal seasonflightId; + + + + public long getMidairportsRecId() { + return this.midairportsRecId; + } + + public void setMidairportsRecId(long midairportsRecId) { + this.midairportsRecId = midairportsRecId; + } + + public BigDecimal getAirportId() { + return this.airportId; + } + + public void setAirportId(BigDecimal airportId) { + this.airportId = airportId; + } + + public String getArrivalTime() { + return this.arrivalTime; + } + + public void setArrivalTime(String arrivalTime) { + this.arrivalTime = arrivalTime; + } + + public String getDepartureTime() { + return this.departureTime; + } + + public void setDepartureTime(String departureTime) { + this.departureTime = departureTime; + } + + public BigDecimal getOrderno() { + return this.orderno; + } + + public void setOrderno(BigDecimal orderno) { + this.orderno = orderno; + } + + public BigDecimal getSeasonflightId() { + return this.seasonflightId; + } + + public void setSeasonflightId(BigDecimal seasonflightId) { + this.seasonflightId = seasonflightId; + } +} diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/FimsFlightschdSeasonDto.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/FimsFlightschdSeasonDto.java index a27c386..03d449b 100644 --- a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/FimsFlightschdSeasonDto.java +++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/FimsFlightschdSeasonDto.java @@ -5,6 +5,10 @@ import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.Date; +import java.util.HashSet; +import java.util.Set; + +import com.gzzn.omms.adminapi.domain.secondary.entity.schedule.FimsMidairportsSeason; @ApiModel(value="航班季度计划Dto",description="航班季度计划") public class FimsFlightschdSeasonDto { @@ -75,6 +79,9 @@ public class FimsFlightschdSeasonDto { @ApiModelProperty(value="二级承运航空公司ID",example="") private BigDecimal subAirlineId; + //航班经停站列表 + private Set fimsMidairportsSeasons = new HashSet<>(); + public FimsFlightschdSeasonDto() { } @@ -254,4 +261,12 @@ public class FimsFlightschdSeasonDto { this.subAirlineId = subAirlineId; } + public Set getFimsMidairportsSeasons() { + return fimsMidairportsSeasons; + } + + public void setFimsMidairportsSeasons(Set fimsMidairportsSeasons) { + this.fimsMidairportsSeasons = fimsMidairportsSeasons; + } + } \ No newline at end of file diff --git a/src/test/java/com/gzzn/omms/adminapi/controller/schedule/FlightSchdSeasonControllerTest.java b/src/test/java/com/gzzn/omms/adminapi/controller/schedule/FlightSchdSeasonControllerTest.java new file mode 100644 index 0000000..7ddc99c --- /dev/null +++ b/src/test/java/com/gzzn/omms/adminapi/controller/schedule/FlightSchdSeasonControllerTest.java @@ -0,0 +1,40 @@ +package com.gzzn.omms.adminapi.controller.schedule; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.MediaType; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; + +@RunWith(SpringRunner.class) +@SpringBootTest +@AutoConfigureMockMvc +public class FlightSchdSeasonControllerTest { + @Autowired + MockMvc mockmvc; + + /** + * 测试航班季度获取功能 + * @throws Exception + */ + @Test + public void testGetFlightSchdSeasons() throws Exception + { + mockmvc.perform( + get("/schedule/flightSchdSeasons") + .param("startDate", "2018") + .accept(MediaType.APPLICATION_JSON_UTF8) + ) + .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) + .andExpect(status().isOk()) + .andDo(print()); + } +}