From 7312f76dbe884f81dd4855dc0753ec38197a0b95 Mon Sep 17 00:00:00 2001 From: fanghongchao <601470458@qq.com> Date: Wed, 5 Dec 2018 12:40:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=9C=BA=E5=9C=BA?= =?UTF-8?q?=E9=9B=86=E5=9B=A2=20=20=E5=9B=BD=E5=AE=B6=20=E6=9C=BA=E5=9E=8B?= =?UTF-8?q?=E7=BB=84=20=E8=88=AA=E7=A9=BA=E9=9B=86=E5=9B=A2=20=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysAircrafttypeGroupController.java | 53 ++++++ .../basicdata/SysAirlineGroupController.java | 52 ++++++ .../basicdata/SysAirportGroupController.java | 52 ++++++ .../basicdata/SysCountryController.java | 54 ++++++ .../basicdata/SysAircrafttypeGroupDao.java | 9 + .../dao/basicdata/SysAirlineGroupDao.java | 9 + .../dao/basicdata/SysAirportGroupDao.java | 9 + .../dao/basicdata/SysCountryDao.java | 9 + .../baiscdata/SysAircrafttypeGroup.java | 60 ++++++ .../entity/baiscdata/SysAirlineGroup.java | 172 ++++++++++++++++++ .../entity/baiscdata/SysAirportGroup.java | 107 +++++++++++ .../entity/baiscdata/SysCountry.java | 142 +++++++++++++++ .../basicdata/SysAircrafttypeGroupDto.java | 43 +++++ .../dto/basicdata/SysAirlineGroupDto.java | 77 ++++++++ .../dto/basicdata/SysAirportGroupDto.java | 42 +++++ .../adminapi/dto/basicdata/SysCountryDto.java | 65 +++++++ .../convert/SysAircrafttypeGroupConvert.java | 12 ++ .../convert/SysAirlineGroupConvert.java | 12 ++ .../convert/SysAirportGroupConvert.java | 12 ++ .../basicdata/convert/SysCountryConvert.java | 12 ++ src/main/resources/application.yml | 7 +- 21 files changed, 1009 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAircrafttypeGroupController.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAirlineGroupController.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAirportGroupController.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysCountryController.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysAircrafttypeGroupDao.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysAirlineGroupDao.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysAirportGroupDao.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysCountryDao.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysAircrafttypeGroup.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysAirlineGroup.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysAirportGroup.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysCountry.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAircrafttypeGroupDto.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAirlineGroupDto.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAirportGroupDto.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysCountryDto.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAircrafttypeGroupConvert.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAirlineGroupConvert.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAirportGroupConvert.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysCountryConvert.java diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAircrafttypeGroupController.java b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAircrafttypeGroupController.java new file mode 100644 index 0000000..f2a9394 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAircrafttypeGroupController.java @@ -0,0 +1,53 @@ +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.SysAircrafttypeGroupDao; +import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysAircrafttypeGroup; +import com.gzzn.omms.adminapi.dto.ResponseDto; +import com.gzzn.omms.adminapi.dto.basicdata.SysAircrafttypeGroupDto; +import com.gzzn.omms.adminapi.dto.basicdata.convert.SysAircrafttypeGroupConvert; + +/** + * 机型组 + * @author 房鸿朝 + * @since 2018-12-05 + */ +@RestController +public class SysAircrafttypeGroupController { + + /** + * 机型组接口 + */ + @Autowired + private SysAircrafttypeGroupDao sysAircrafttypeGroupDao; + /** + * 机型组Dto接口 + */ + @Autowired + private SysAircrafttypeGroupConvert sysAircrafttypeGroupConvert; + /** + * 获取所有机型组数据 + * @return + */ + @ApiOperation(value="获取机型组列表",tags="基础数据") + @GetMapping(value="/basicdata/sysAircrafttypesGroup") + public ResponseDto> getSysAircrafttypeGroup() { + List sysAircrafttypeGroupList = (List) sysAircrafttypeGroupDao.findAll(); + + //转换dto + List sysAircrafttypeGroupListDto = sysAircrafttypeGroupList.stream().map(x -> { + SysAircrafttypeGroupDto dto = sysAircrafttypeGroupConvert.aircrafttypeGroupToAircrafttypeGroupDto(x); + return dto; + }).collect(Collectors.toList()); + + return ResponseDto.success(sysAircrafttypeGroupListDto); + } +} diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAirlineGroupController.java b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAirlineGroupController.java new file mode 100644 index 0000000..967982d --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAirlineGroupController.java @@ -0,0 +1,52 @@ +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.SysAirlineGroupDao; +import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysAirlineGroup; +import com.gzzn.omms.adminapi.dto.ResponseDto; +import com.gzzn.omms.adminapi.dto.basicdata.SysAirlineGroupDto; +import com.gzzn.omms.adminapi.dto.basicdata.convert.SysAirlineGroupConvert; + +/** + * 航空集团 + * @author fhc + */ +@RestController +public class SysAirlineGroupController { + + /** + * 航空集团接口 + */ + @Autowired + private SysAirlineGroupDao sysAirlineGroupDao; + /** + * 航空集团Dto接口 + */ + @Autowired + private SysAirlineGroupConvert sysAirlineGroupConvert; + /** + * 获取所有航空集团数据 + * @return + */ + @ApiOperation(value="获取航空集团列表",tags="基础数据") + @GetMapping(value="/basicdata/sysAirlineGroup") + public ResponseDto> getSysAirlineGroup() { + List sysAirlineGroupList = (List) sysAirlineGroupDao.findAll(); + + //转换dto + List sysAirlineGroupListDto = sysAirlineGroupList.stream().map(x -> { + SysAirlineGroupDto dto = sysAirlineGroupConvert.sysAirlineGroupToSysAirlineGroupDto(x); + return dto; + }).collect(Collectors.toList()); + + return ResponseDto.success(sysAirlineGroupListDto); + } +} diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAirportGroupController.java b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAirportGroupController.java new file mode 100644 index 0000000..91520ae --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysAirportGroupController.java @@ -0,0 +1,52 @@ +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.SysAirportGroupDao; +import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysAirportGroup; +import com.gzzn.omms.adminapi.dto.ResponseDto; +import com.gzzn.omms.adminapi.dto.basicdata.SysAirportGroupDto; +import com.gzzn.omms.adminapi.dto.basicdata.convert.SysAirportGroupConvert; + +/** + * 机场集团 + * @author nyr + */ +@RestController +public class SysAirportGroupController { + + /** + * 机场集团 + */ + @Autowired + private SysAirportGroupDao sysAirportGroupDao; + /** + * 机场集团Dto接口 + */ + @Autowired + private SysAirportGroupConvert sysAirportGroupConvert; + /** + * 获取所有机场集团数据 + * @return + */ + @ApiOperation(value="获取机场集团列表",tags="基础数据") + @GetMapping(value="/basicdata/sysAirportGroups") + public ResponseDto> getSysAirport() { + List sysAirportGroupList = (List) sysAirportGroupDao.findAll(); + + //转换dto + List sysAirportGroupListDto = sysAirportGroupList.stream().map(x -> { + SysAirportGroupDto dto = sysAirportGroupConvert.airportGroupToAirportGroupDto(x); + return dto; + }).collect(Collectors.toList()); + + return ResponseDto.success(sysAirportGroupListDto); + } +} diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysCountryController.java b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysCountryController.java new file mode 100644 index 0000000..6cbd735 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysCountryController.java @@ -0,0 +1,54 @@ +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.SysCountryDao; +import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysCountry; +import com.gzzn.omms.adminapi.dto.ResponseDto; +import com.gzzn.omms.adminapi.dto.basicdata.SysCountryDto; +import com.gzzn.omms.adminapi.dto.basicdata.convert.SysCountryConvert; + +/** + * 国家 + * @author fhc + * @since 2018-12-05 + */ +@RestController +public class SysCountryController { + + /** + * 国家Dao + */ + @Autowired + private SysCountryDao sysCountryDao; + /** + * 国家Dto + */ + @Autowired + private SysCountryConvert sysCountryConvert; + + /** + * 获取所有国家 + * @return + */ + @ApiOperation(value="获取国家列表",tags="基础数据") + @GetMapping(value="/basicdata/sysCountry") + public ResponseDto> sysCountry() { + List sysCountrylist = (List) sysCountryDao.findAll(); + + //转换dto + List sysCountryListDto = sysCountrylist.stream().map(x -> { + SysCountryDto dto = sysCountryConvert.sysCountryToSysCountryDto(x); + return dto; + }).collect(Collectors.toList()); + + return ResponseDto.success(sysCountryListDto); + } +} diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysAircrafttypeGroupDao.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysAircrafttypeGroupDao.java new file mode 100644 index 0000000..b5dbb84 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysAircrafttypeGroupDao.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.SysAircrafttypeGroup; + +public interface SysAircrafttypeGroupDao extends CrudRepository { + +} diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysAirlineGroupDao.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysAirlineGroupDao.java new file mode 100644 index 0000000..0d5d541 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysAirlineGroupDao.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.SysAirlineGroup; + +public interface SysAirlineGroupDao extends CrudRepository { + +} diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysAirportGroupDao.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysAirportGroupDao.java new file mode 100644 index 0000000..eb45563 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysAirportGroupDao.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.SysAirportGroup; + +public interface SysAirportGroupDao extends CrudRepository { + +} diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysCountryDao.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysCountryDao.java new file mode 100644 index 0000000..80e62b5 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysCountryDao.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.SysCountry; + +public interface SysCountryDao extends CrudRepository { + +} diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysAircrafttypeGroup.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysAircrafttypeGroup.java new file mode 100644 index 0000000..4fd5a92 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysAircrafttypeGroup.java @@ -0,0 +1,60 @@ +package com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.NamedQuery; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +/** + * 机型组 + * @author fhc + * @since 2018-12-05 + * + */ +@Entity +@Table(name="SYS_AIRCRAFTTYPEGROUP") +@NamedQuery(name="SysAircrafttypeGroup.findAll", query="SELECT s FROM SysAircrafttypeGroup s") +public class SysAircrafttypeGroup { + + @Id + @SequenceGenerator(name="SYS_AIRCRAFTTYPEGROUP_ID_GENERATOR", sequenceName="SYS_AIRCRAFTTYPEGROUP_ID") + @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="SYS_AIRCRAFTTYPEGROUP_ID_GENERATOR") + @Column(name="AIRCRAFTTYPEGROUP_ID") + private Long aircraftTypeGroupId; //机型组记录ID + + @Column(name="AIRCRAFTTYPEGROUP_CODE") + private String aircraftTypeGroupCode; //机型组代码 + + @Column(name="AIRCRAFTTYPEGROUP_NAME") + private String aircraftTypeGroupName; //机型组名称 + + public Long getAircraftTypeGroupId() { + return aircraftTypeGroupId; + } + + public void setAircraftTypeGroupId(Long aircraftTypeGroupId) { + this.aircraftTypeGroupId = aircraftTypeGroupId; + } + + public String getAircraftTypeGroupCode() { + return aircraftTypeGroupCode; + } + + public void setAircraftTypeGroupCode(String aircraftTypeGroupCode) { + this.aircraftTypeGroupCode = aircraftTypeGroupCode; + } + + public String getAircraftTypeGroupName() { + return aircraftTypeGroupName; + } + + public void setAircraftTypeGroupName(String aircraftTypeGroupName) { + this.aircraftTypeGroupName = aircraftTypeGroupName; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysAirlineGroup.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysAirlineGroup.java new file mode 100644 index 0000000..ed307de --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysAirlineGroup.java @@ -0,0 +1,172 @@ +package com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata; + +import java.math.BigDecimal; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.NamedQuery; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +/** + * 航空集团 + * @author 房鸿朝 + * @since 2018-12-5 + */ +@Entity +@Table(name="SYS_AIRLINEGROUP") +@NamedQuery(name="SysAirlineGroup.findAll", query="SELECT s FROM SysAirlineGroup s") +public class SysAirlineGroup { + + @Id + @SequenceGenerator(name="SYS_AIRLINE_GROUP_ID_GENERATOR", sequenceName="SYS_AIRLINE_GROUP_ID") + @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="SYS_AIRLINE_GROUP_ID_GENERATOR") + @Column(name="AIRLINE_GROUP_ID") + private Long airlineGroupId; //航空集团公司表记录ID + + @Column(name="AIRLINE_GROUP_CODE") + private String airlineGroupCode; //航空集团公司代码 + + @Column(name="AIRLINE_GROUP_NAME") + private String airlineGroupName; //航空集团公司名称 + + @Column(name="AIRLINE_GROUP_CODE_CAA") + private String airlineGroupCodeCAA; //航空集团公司代码（CAA格式） + + @Column(name="AIRLINE_GROUP_CODE_IATA") + private String airlineGroupCodeIATA; //航空集团公司代码（IATA格式） + + @Column(name="AIRLINE_GROUP_CODE_ICAO") + private BigDecimal airlineGroupCodeICAO; //航空集团公司代码（ICAO格式） + + public Long getAirlineGroupId() { + return airlineGroupId; + } + + public void setAirlineGroupId(Long airlineGroupId) { + this.airlineGroupId = airlineGroupId; + } + + public String getAirlineGroupCode() { + return airlineGroupCode; + } + + public void setAirlineGroupCode(String airlineGroupCode) { + this.airlineGroupCode = airlineGroupCode; + } + + public String getAirlineGroupName() { + return airlineGroupName; + } + + public void setAirlineGroupName(String airlineGroupName) { + this.airlineGroupName = airlineGroupName; + } + + public String getAirlineGroupCodeCAA() { + return airlineGroupCodeCAA; + } + + public void setAirlineGroupCodeCAA(String airlineGroupCodeCAA) { + this.airlineGroupCodeCAA = airlineGroupCodeCAA; + } + + public String getAirlineGroupCodeIATA() { + return airlineGroupCodeIATA; + } + + public void setAirlineGroupCodeIATA(String airlineGroupCodeIATA) { + this.airlineGroupCodeIATA = airlineGroupCodeIATA; + } + + public BigDecimal getAirlineGroupCodeICAO() { + return airlineGroupCodeICAO; + } + + public void setAirlineGroupCodeICAO(BigDecimal airlineGroupCodeICAO) { + this.airlineGroupCodeICAO = airlineGroupCodeICAO; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime + * result + + ((airlineGroupCode == null) ? 0 : airlineGroupCode.hashCode()); + result = prime + * result + + ((airlineGroupCodeCAA == null) ? 0 : airlineGroupCodeCAA + .hashCode()); + result = prime + * result + + ((airlineGroupCodeIATA == null) ? 0 : airlineGroupCodeIATA + .hashCode()); + result = prime + * result + + ((airlineGroupCodeICAO == null) ? 0 : airlineGroupCodeICAO + .hashCode()); + result = prime * result + + ((airlineGroupId == null) ? 0 : airlineGroupId.hashCode()); + result = prime + * result + + ((airlineGroupName == null) ? 0 : airlineGroupName.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; + SysAirlineGroup other = (SysAirlineGroup) obj; + if (airlineGroupCode == null) { + if (other.airlineGroupCode != null) + return false; + } else if (!airlineGroupCode.equals(other.airlineGroupCode)) + return false; + if (airlineGroupCodeCAA == null) { + if (other.airlineGroupCodeCAA != null) + return false; + } else if (!airlineGroupCodeCAA.equals(other.airlineGroupCodeCAA)) + return false; + if (airlineGroupCodeIATA == null) { + if (other.airlineGroupCodeIATA != null) + return false; + } else if (!airlineGroupCodeIATA.equals(other.airlineGroupCodeIATA)) + return false; + if (airlineGroupCodeICAO == null) { + if (other.airlineGroupCodeICAO != null) + return false; + } else if (!airlineGroupCodeICAO.equals(other.airlineGroupCodeICAO)) + return false; + if (airlineGroupId == null) { + if (other.airlineGroupId != null) + return false; + } else if (!airlineGroupId.equals(other.airlineGroupId)) + return false; + if (airlineGroupName == null) { + if (other.airlineGroupName != null) + return false; + } else if (!airlineGroupName.equals(other.airlineGroupName)) + return false; + return true; + } + + @Override + public String toString() { + return "SysAirlineGroup [airlineGroupId=" + airlineGroupId + + ", airlineGroupCode=" + airlineGroupCode + + ", airlineGroupName=" + airlineGroupName + + ", airlineGroupCodeCAA=" + airlineGroupCodeCAA + + ", airlineGroupCodeIATA=" + airlineGroupCodeIATA + + ", airlineGroupCodeICAO=" + airlineGroupCodeICAO + "]"; + } + +} \ No newline at end of file diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysAirportGroup.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysAirportGroup.java new file mode 100644 index 0000000..48e0e1b --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysAirportGroup.java @@ -0,0 +1,107 @@ +package com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.NamedQuery; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + + +/** + * 机场集团公司登记表 + * @author fhc + * @date 2018-12-5 + */ +@Entity +@Table(name="SYS_AIRPORTGROUP") +@NamedQuery(name="SysAirportGroup.findAll", query="SELECT o FROM SysAirportGroup o") +public class SysAirportGroup { + + @Id + @SequenceGenerator(name="SYS_AIRPORT_GROUP_ID_GENERATOR", sequenceName="SYS_AIRPORT_GROUP") + @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="SYS_AIRPORT_GROUP_ID_GENERATOR") + @Column(name="AIRPORT_GROUP_ID") + private Long airportGroupId; //机场集团公司表记录ID + + @Column(name="AIRPORT_GROUP_CODE") + private String airportGroupCode;//机场集团公司代码 + + @Column(name="AIRPORT_GROUP_NAME") + private String airportGroupName;//机场集团公司名称 + + public Long getAirportGroupId() { + return airportGroupId; + } + + public void setAirportGroupId(Long airportGroupId) { + this.airportGroupId = airportGroupId; + } + + public String getAirportGroupCode() { + return airportGroupCode; + } + + public void setAirportGroupCode(String airportGroupCode) { + this.airportGroupCode = airportGroupCode; + } + + public String getAirportGroupName() { + return airportGroupName; + } + + public void setAirportGroupName(String airportGroupName) { + this.airportGroupName = airportGroupName; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime + * result + + ((airportGroupCode == null) ? 0 : airportGroupCode.hashCode()); + result = prime * result + + ((airportGroupId == null) ? 0 : airportGroupId.hashCode()); + result = prime + * result + + ((airportGroupName == null) ? 0 : airportGroupName.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; + SysAirportGroup other = (SysAirportGroup) obj; + if (airportGroupCode == null) { + if (other.airportGroupCode != null) + return false; + } else if (!airportGroupCode.equals(other.airportGroupCode)) + return false; + if (airportGroupId == null) { + if (other.airportGroupId != null) + return false; + } else if (!airportGroupId.equals(other.airportGroupId)) + return false; + if (airportGroupName == null) { + if (other.airportGroupName != null) + return false; + } else if (!airportGroupName.equals(other.airportGroupName)) + return false; + return true; + } + + @Override + public String toString() { + return "SysAirportGroup [airportGroupId=" + airportGroupId + + ", airportGroupCode=" + airportGroupCode + + ", airportGroupName=" + airportGroupName + "]"; + } +} \ No newline at end of file diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysCountry.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysCountry.java new file mode 100644 index 0000000..046b47e --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysCountry.java @@ -0,0 +1,142 @@ +package com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.NamedQuery; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + + +/** + * 国家 + * @author fhc + * @date 2018-12-5 + */ +@Entity +@Table(name="SYS_COUNTRY") +@NamedQuery(name="SysCountry.findAll", query="SELECT o FROM SysCountry o") +public class SysCountry { + + @Id + @SequenceGenerator(name="SYS_COUNTRY_ID_GENERATOR", sequenceName="SYS_COUNTRY_ID") + @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="SYS_COUNTRY_ID_GENERATOR") + @Column(name="COUNTRY_ID") + private Long countryId; //国家ID + + @Column(name="COUNTRY_CODE") + private String countryCode;//国家代码 + + @Column(name="COUNTRY_NAME_CHN") + private String countryNameChn;//国家名称（中文） + + @Column(name="COUNTRY_NAME_ENG") + private String countryNameEng;//国家名称（英文） + + @Column(name="OPERATE") + private Integer operate; //操作标识 1-使用 0-删除标识 + + public Long getCountryId() { + return countryId; + } + + public void setCountryId(Long countryId) { + this.countryId = countryId; + } + + public String getCountryCode() { + return countryCode; + } + + public void setCountryCode(String countryCode) { + this.countryCode = countryCode; + } + + public String getCountryNameChn() { + return countryNameChn; + } + + public void setCountryNameChn(String countryNameChn) { + this.countryNameChn = countryNameChn; + } + + public String getCountryNameEng() { + return countryNameEng; + } + + public void setCountryNameEng(String countryNameEng) { + this.countryNameEng = countryNameEng; + } + + public Integer getOperate() { + return operate; + } + + public void setOperate(Integer operate) { + this.operate = operate; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + + ((countryCode == null) ? 0 : countryCode.hashCode()); + result = prime * result + + ((countryId == null) ? 0 : countryId.hashCode()); + result = prime * result + + ((countryNameChn == null) ? 0 : countryNameChn.hashCode()); + result = prime * result + + ((countryNameEng == null) ? 0 : countryNameEng.hashCode()); + result = prime * result + ((operate == null) ? 0 : operate.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; + SysCountry other = (SysCountry) obj; + if (countryCode == null) { + if (other.countryCode != null) + return false; + } else if (!countryCode.equals(other.countryCode)) + return false; + if (countryId == null) { + if (other.countryId != null) + return false; + } else if (!countryId.equals(other.countryId)) + return false; + if (countryNameChn == null) { + if (other.countryNameChn != null) + return false; + } else if (!countryNameChn.equals(other.countryNameChn)) + return false; + if (countryNameEng == null) { + if (other.countryNameEng != null) + return false; + } else if (!countryNameEng.equals(other.countryNameEng)) + return false; + if (operate == null) { + if (other.operate != null) + return false; + } else if (!operate.equals(other.operate)) + return false; + return true; + } + + @Override + public String toString() { + return "SysCountry [countryId=" + countryId + ", countryCode=" + + countryCode + ", countryNameChn=" + countryNameChn + + ", countryNameEng=" + countryNameEng + ", operate=" + operate + + "]"; + } + +} \ No newline at end of file diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAircrafttypeGroupDto.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAircrafttypeGroupDto.java new file mode 100644 index 0000000..2c63247 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAircrafttypeGroupDto.java @@ -0,0 +1,43 @@ +package com.gzzn.omms.adminapi.dto.basicdata; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +@ApiModel(value="机型组Dto",description="机型组") +public class SysAircrafttypeGroupDto { + + @ApiModelProperty(value="机型组记录ID",example="15235001") + private Long aircraftTypeGroupId; //机型组记录ID + + @ApiModelProperty(value="机型组代码",example="AB") + private String aircraftTypeGroupCode; //机型组代码 + + @ApiModelProperty(value="机型组名称",example="AB类") + private String aircraftTypeGroupName; //机型组名称 + + public Long getAircraftTypeGroupId() { + return aircraftTypeGroupId; + } + + public void setAircraftTypeGroupId(Long aircraftTypeGroupId) { + this.aircraftTypeGroupId = aircraftTypeGroupId; + } + + public String getAircraftTypeGroupCode() { + return aircraftTypeGroupCode; + } + + public void setAircraftTypeGroupCode(String aircraftTypeGroupCode) { + this.aircraftTypeGroupCode = aircraftTypeGroupCode; + } + + public String getAircraftTypeGroupName() { + return aircraftTypeGroupName; + } + + public void setAircraftTypeGroupName(String aircraftTypeGroupName) { + this.aircraftTypeGroupName = aircraftTypeGroupName; + } + + +} diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAirlineGroupDto.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAirlineGroupDto.java new file mode 100644 index 0000000..d694aeb --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAirlineGroupDto.java @@ -0,0 +1,77 @@ +package com.gzzn.omms.adminapi.dto.basicdata; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.math.BigDecimal; + +@ApiModel(value="航空集团Dto",description="航空集团基础数据") +public class SysAirlineGroupDto { + + @ApiModelProperty(value="航空集团公司表记录ID",example="98897531") + private Long airlineGroupId; //航空集团公司表记录ID + + @ApiModelProperty(value="航空集团公司代码",example="airlineGroupCode") + private String airlineGroupCode; //航空集团公司代码 + + @ApiModelProperty(value="航空集团公司名称",example="航空集团公司名称") + private String airlineGroupName; //航空集团公司名称 + + @ApiModelProperty(value="航空集团公司代码（CAA格式）",example="航空集团公司代码（CAA格式）") + private String airlineGroupCodeCAA; //航空集团公司代码（CAA格式） + + @ApiModelProperty(value="航空集团公司代码（IATA格式）",example="航空集团公司代码（IATA格式）") + private String airlineGroupCodeIATA; //航空集团公司代码（IATA格式） + + @ApiModelProperty(value="航空集团公司代码（ICAO格式）",example="航空集团公司代码（ICAO格式）") + private BigDecimal airlineGroupCodeICAO; //航空集团公司代码（ICAO格式） + + public Long getAirlineGroupId() { + return airlineGroupId; + } + + public void setAirlineGroupId(Long airlineGroupId) { + this.airlineGroupId = airlineGroupId; + } + + public String getAirlineGroupCode() { + return airlineGroupCode; + } + + public void setAirlineGroupCode(String airlineGroupCode) { + this.airlineGroupCode = airlineGroupCode; + } + + public String getAirlineGroupName() { + return airlineGroupName; + } + + public void setAirlineGroupName(String airlineGroupName) { + this.airlineGroupName = airlineGroupName; + } + + public String getAirlineGroupCodeCAA() { + return airlineGroupCodeCAA; + } + + public void setAirlineGroupCodeCAA(String airlineGroupCodeCAA) { + this.airlineGroupCodeCAA = airlineGroupCodeCAA; + } + + public String getAirlineGroupCodeIATA() { + return airlineGroupCodeIATA; + } + + public void setAirlineGroupCodeIATA(String airlineGroupCodeIATA) { + this.airlineGroupCodeIATA = airlineGroupCodeIATA; + } + + public BigDecimal getAirlineGroupCodeICAO() { + return airlineGroupCodeICAO; + } + + public void setAirlineGroupCodeICAO(BigDecimal airlineGroupCodeICAO) { + this.airlineGroupCodeICAO = airlineGroupCodeICAO; + } + +} diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAirportGroupDto.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAirportGroupDto.java new file mode 100644 index 0000000..a66a307 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysAirportGroupDto.java @@ -0,0 +1,42 @@ +package com.gzzn.omms.adminapi.dto.basicdata; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +@ApiModel(value="机场集团公司Dto",description="机场集团公司") +public class SysAirportGroupDto { + + @ApiModelProperty(value="机场集团公司表记录ID",example="26") + private Long airportGroupId; //机场集团公司表记录ID + + @ApiModelProperty(value="机场集团公司代码",example="BYJC01") + private String airportGroupCode;//机场集团公司代码 + + @ApiModelProperty(value="机场集团公司名称",example="白云1号机场公司") + private String airportGroupName;//机场集团公司名称 + + public Long getAirportGroupId() { + return airportGroupId; + } + + public void setAirportGroupId(Long airportGroupId) { + this.airportGroupId = airportGroupId; + } + + public String getAirportGroupCode() { + return airportGroupCode; + } + + public void setAirportGroupCode(String airportGroupCode) { + this.airportGroupCode = airportGroupCode; + } + + public String getAirportGroupName() { + return airportGroupName; + } + + public void setAirportGroupName(String airportGroupName) { + this.airportGroupName = airportGroupName; + } + +} diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysCountryDto.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysCountryDto.java new file mode 100644 index 0000000..e523b22 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysCountryDto.java @@ -0,0 +1,65 @@ +package com.gzzn.omms.adminapi.dto.basicdata; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +@ApiModel(value="国家Dto",description="国家") +public class SysCountryDto { + + + @ApiModelProperty(value="国家ID",example="15233871") + private Long countryId; //国家ID + + @ApiModelProperty(value="国家代码",example="AF") + private String countryCode;//国家代码 + + @ApiModelProperty(value="国家名称（中文）",example="阿富汗") + private String countryNameChn;//国家名称（中文） + + @ApiModelProperty(value="国家名称（英文）",example="AFGHANISTAN") + private String countryNameEng;//国家名称（英文） + + @ApiModelProperty(value="操作标识 1-使用 0-删除标识",example="1") + private Integer operate; //操作标识 1-使用 0-删除标识 + + public Long getCountryId() { + return countryId; + } + + public void setCountryId(Long countryId) { + this.countryId = countryId; + } + + public String getCountryCode() { + return countryCode; + } + + public void setCountryCode(String countryCode) { + this.countryCode = countryCode; + } + + public String getCountryNameChn() { + return countryNameChn; + } + + public void setCountryNameChn(String countryNameChn) { + this.countryNameChn = countryNameChn; + } + + public String getCountryNameEng() { + return countryNameEng; + } + + public void setCountryNameEng(String countryNameEng) { + this.countryNameEng = countryNameEng; + } + + public Integer getOperate() { + return operate; + } + + public void setOperate(Integer operate) { + this.operate = operate; + } + +} diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAircrafttypeGroupConvert.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAircrafttypeGroupConvert.java new file mode 100644 index 0000000..3662eb7 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAircrafttypeGroupConvert.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.SysAircrafttypeGroup; +import com.gzzn.omms.adminapi.dto.basicdata.SysAircrafttypeGroupDto; + +@Mapper(componentModel="spring") +public interface SysAircrafttypeGroupConvert { + + public SysAircrafttypeGroupDto aircrafttypeGroupToAircrafttypeGroupDto(SysAircrafttypeGroup sysAircrafttypeGroup); +} diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAirlineGroupConvert.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAirlineGroupConvert.java new file mode 100644 index 0000000..fe46f7c --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAirlineGroupConvert.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.SysAirlineGroup; +import com.gzzn.omms.adminapi.dto.basicdata.SysAirlineGroupDto; + +@Mapper(componentModel="spring") +public interface SysAirlineGroupConvert { + + public SysAirlineGroupDto sysAirlineGroupToSysAirlineGroupDto(SysAirlineGroup sysAirlineGroup); +} diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAirportGroupConvert.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAirportGroupConvert.java new file mode 100644 index 0000000..59c32f5 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysAirportGroupConvert.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.SysAirportGroup; +import com.gzzn.omms.adminapi.dto.basicdata.SysAirportGroupDto; + +@Mapper(componentModel="spring") +public interface SysAirportGroupConvert { + + public SysAirportGroupDto airportGroupToAirportGroupDto(SysAirportGroup sysAirportGroup); +} diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysCountryConvert.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysCountryConvert.java new file mode 100644 index 0000000..8fa4363 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysCountryConvert.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.SysCountry; +import com.gzzn.omms.adminapi.dto.basicdata.SysCountryDto; + +@Mapper(componentModel="spring") +public interface SysCountryConvert { + + public SysCountryDto sysCountryToSysCountryDto(SysCountry sysCountry); +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dbce3eb..f8b769b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,4 +4,9 @@ spring: jpa: properties: hibernate: - show_sql: true \ No newline at end of file + show_sql: true +logging: + level: + root: info + com.gzzn.omms.dao: debug + file: logs/adminapi.log \ No newline at end of file