From 9d7e220f14b368922cac01ecebf9acbd0ed127b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E9=B9=8F?= <812968653@qq.com> Date: Mon, 14 Sep 2026 23:21:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/mysql/member/member_airline_data.sql | 13 +++++++ ...mber_airline_flight_add_detail_columns.sql | 21 ++++++++++ .../app/airline/vo/AirlineFlightVO.java | 39 +++++++++++++++++++ .../airline/MemberAirlineFlightDO.java | 26 +++++++++++++ .../airline/MemberAirlineDataServiceImpl.java | 26 +++++++++++++ 5 files changed, 125 insertions(+) create mode 100644 sql/mysql/member/member_airline_flight_add_detail_columns.sql diff --git a/sql/mysql/member/member_airline_data.sql b/sql/mysql/member/member_airline_data.sql index 1023339..c1a12a8 100644 --- a/sql/mysql/member/member_airline_data.sql +++ b/sql/mysql/member/member_airline_data.sql @@ -20,6 +20,19 @@ CREATE TABLE IF NOT EXISTS `member_airline_flight` ( `fly_begin_date1` varchar(32) NULL DEFAULT '' COMMENT '实际起飞时间', `fly_end_date1` varchar(32) NULL DEFAULT '' COMMENT '实际到达时间', `sign_in_time` varchar(32) NULL DEFAULT '' COMMENT '签到时间', + `aircraft_no` varchar(32) NULL DEFAULT '' COMMENT '机号/编号', + `airline` varchar(64) NULL DEFAULT '' COMMENT '航司', + `aircraft_type` varchar(64) NULL DEFAULT '' COMMENT '机型', + `gate` varchar(32) NULL DEFAULT '' COMMENT '登机口', + `begin_stand` varchar(32) NULL DEFAULT '' COMMENT '出发机场停机位', + `end_stand` varchar(32) NULL DEFAULT '' COMMENT '到达机场停机位', + `cargo_close` varchar(32) NULL DEFAULT '' COMMENT '货关时间', + `pax_close` varchar(32) NULL DEFAULT '' COMMENT '客关时间', + `leave_port` varchar(32) NULL DEFAULT '' COMMENT '离港时间', + `take_off` varchar(32) NULL DEFAULT '' COMMENT '起飞时间', + `land` varchar(32) NULL DEFAULT '' COMMENT '落地时间', + `arrive_port` varchar(32) NULL DEFAULT '' COMMENT '到港时间', + `prev_flight` varchar(255) NULL DEFAULT '' COMMENT '前序航班', `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', `creator` varchar(64) NULL DEFAULT '' COMMENT '创建者', `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', diff --git a/sql/mysql/member/member_airline_flight_add_detail_columns.sql b/sql/mysql/member/member_airline_flight_add_detail_columns.sql new file mode 100644 index 0000000..3306b3d --- /dev/null +++ b/sql/mysql/member/member_airline_flight_add_detail_columns.sql @@ -0,0 +1,21 @@ +-- ---------------------------------------------------------------------------- +-- member_airline_flight 补齐航线详情字段（登机口/货关/客关/停机位/离港/起飞/落地/到港等） +-- 背景：早期云同步表只建了 15 个基础字段，客户端上报的详情字段被服务端丢弃， +-- 拉取后详情页登机口、货关、客关等为空。本脚本为存量库补列。 +-- 已执行过本脚本的库无需重复执行（列已存在会报 Duplicate column）。 +-- ---------------------------------------------------------------------------- + +ALTER TABLE `member_airline_flight` + ADD COLUMN `aircraft_no` varchar(32) NULL DEFAULT '' COMMENT '机号/编号' AFTER `sign_in_time`, + ADD COLUMN `airline` varchar(64) NULL DEFAULT '' COMMENT '航司' AFTER `aircraft_no`, + ADD COLUMN `aircraft_type` varchar(64) NULL DEFAULT '' COMMENT '机型' AFTER `airline`, + ADD COLUMN `gate` varchar(32) NULL DEFAULT '' COMMENT '登机口' AFTER `aircraft_type`, + ADD COLUMN `begin_stand` varchar(32) NULL DEFAULT '' COMMENT '出发机场停机位' AFTER `gate`, + ADD COLUMN `end_stand` varchar(32) NULL DEFAULT '' COMMENT '到达机场停机位' AFTER `begin_stand`, + ADD COLUMN `cargo_close` varchar(32) NULL DEFAULT '' COMMENT '货关时间' AFTER `end_stand`, + ADD COLUMN `pax_close` varchar(32) NULL DEFAULT '' COMMENT '客关时间' AFTER `cargo_close`, + ADD COLUMN `leave_port` varchar(32) NULL DEFAULT '' COMMENT '离港时间' AFTER `pax_close`, + ADD COLUMN `take_off` varchar(32) NULL DEFAULT '' COMMENT '起飞时间' AFTER `leave_port`, + ADD COLUMN `land` varchar(32) NULL DEFAULT '' COMMENT '落地时间' AFTER `take_off`, + ADD COLUMN `arrive_port` varchar(32) NULL DEFAULT '' COMMENT '到港时间' AFTER `land`, + ADD COLUMN `prev_flight` varchar(255) NULL DEFAULT '' COMMENT '前序航班' AFTER `arrive_port`; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/airline/vo/AirlineFlightVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/airline/vo/AirlineFlightVO.java index 9b00c61..ae36515 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/airline/vo/AirlineFlightVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/airline/vo/AirlineFlightVO.java @@ -49,4 +49,43 @@ public class AirlineFlightVO { @Schema(description = "签到时间") private String signInTime; + @Schema(description = "机号/编号") + private String aircraftNo; + + @Schema(description = "航司") + private String airline; + + @Schema(description = "机型") + private String aircraftType; + + @Schema(description = "登机口") + private String gate; + + @Schema(description = "出发机场停机位") + private String beginStand; + + @Schema(description = "到达机场停机位") + private String endStand; + + @Schema(description = "货关时间") + private String cargoClose; + + @Schema(description = "客关时间") + private String paxClose; + + @Schema(description = "离港时间") + private String leavePort; + + @Schema(description = "起飞时间") + private String takeOff; + + @Schema(description = "落地时间") + private String land; + + @Schema(description = "到港时间") + private String arrivePort; + + @Schema(description = "前序航班") + private String prevFlight; + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/airline/MemberAirlineFlightDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/airline/MemberAirlineFlightDO.java index 64c6c2e..bed52f6 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/airline/MemberAirlineFlightDO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/airline/MemberAirlineFlightDO.java @@ -49,5 +49,31 @@ public class MemberAirlineFlightDO extends TenantBaseDO { private String flyEndDate1; /** 签到时间 */ private String signInTime; + /** 机号/编号 */ + private String aircraftNo; + /** 航司 */ + private String airline; + /** 机型 */ + private String aircraftType; + /** 登机口 */ + private String gate; + /** 出发机场停机位 */ + private String beginStand; + /** 到达机场停机位 */ + private String endStand; + /** 货关时间 */ + private String cargoClose; + /** 客关时间 */ + private String paxClose; + /** 离港时间 */ + private String leavePort; + /** 起飞时间 */ + private String takeOff; + /** 落地时间 */ + private String land; + /** 到港时间 */ + private String arrivePort; + /** 前序航班 */ + private String prevFlight; } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/airline/MemberAirlineDataServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/airline/MemberAirlineDataServiceImpl.java index b1f57ba..35bcfbd 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/airline/MemberAirlineDataServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/airline/MemberAirlineDataServiceImpl.java @@ -129,6 +129,19 @@ public class MemberAirlineDataServiceImpl implements MemberAirlineDataService { vo.setFlyBeginDate1(d.getFlyBeginDate1()); vo.setFlyEndDate1(d.getFlyEndDate1()); vo.setSignInTime(d.getSignInTime()); + vo.setAircraftNo(d.getAircraftNo()); + vo.setAirline(d.getAirline()); + vo.setAircraftType(d.getAircraftType()); + vo.setGate(d.getGate()); + vo.setBeginStand(d.getBeginStand()); + vo.setEndStand(d.getEndStand()); + vo.setCargoClose(d.getCargoClose()); + vo.setPaxClose(d.getPaxClose()); + vo.setLeavePort(d.getLeavePort()); + vo.setTakeOff(d.getTakeOff()); + vo.setLand(d.getLand()); + vo.setArrivePort(d.getArrivePort()); + vo.setPrevFlight(d.getPrevFlight()); return vo; } @@ -147,6 +160,19 @@ public class MemberAirlineDataServiceImpl implements MemberAirlineDataService { d.setFlyBeginDate1(StrUtil.nullToEmpty(vo.getFlyBeginDate1())); d.setFlyEndDate1(StrUtil.nullToEmpty(vo.getFlyEndDate1())); d.setSignInTime(StrUtil.nullToEmpty(vo.getSignInTime())); + d.setAircraftNo(StrUtil.nullToEmpty(vo.getAircraftNo())); + d.setAirline(StrUtil.nullToEmpty(vo.getAirline())); + d.setAircraftType(StrUtil.nullToEmpty(vo.getAircraftType())); + d.setGate(StrUtil.nullToEmpty(vo.getGate())); + d.setBeginStand(StrUtil.nullToEmpty(vo.getBeginStand())); + d.setEndStand(StrUtil.nullToEmpty(vo.getEndStand())); + d.setCargoClose(StrUtil.nullToEmpty(vo.getCargoClose())); + d.setPaxClose(StrUtil.nullToEmpty(vo.getPaxClose())); + d.setLeavePort(StrUtil.nullToEmpty(vo.getLeavePort())); + d.setTakeOff(StrUtil.nullToEmpty(vo.getTakeOff())); + d.setLand(StrUtil.nullToEmpty(vo.getLand())); + d.setArrivePort(StrUtil.nullToEmpty(vo.getArrivePort())); + d.setPrevFlight(StrUtil.nullToEmpty(vo.getPrevFlight())); return d; }