From af06f725fa7b529c480007e61d82be05cebcdca6 Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Tue, 21 Jul 2026 13:16:10 +0800 Subject: [PATCH] fix bug --- AGENTS.md | 1 + .../springblade/system/cache/RegionCache.java | 5 +- .../system/pojo/entity/AirportMaster.java | 15 +++ .../system/pojo/entity/RailwayStation.java | 15 +++ .../system/controller/RegionController.java | 8 +- .../system/excel/AirportMasterExcel.java | 6 ++ .../system/excel/RailwayStationExcel.java | 10 +- .../system/mapper/AirportMasterMapper.xml | 79 +++++++++------- .../system/mapper/PortTerminalMapper.xml | 65 ++++++------- .../system/mapper/RailwayStationMapper.xml | 89 +++++++++++------- .../system/mapper/RegionMapper.java | 2 +- .../system/mapper/RegionMapper.xml | 14 +-- .../system/service/IRegionService.java | 2 +- .../impl/AirportMasterServiceImpl.java | 11 ++- .../impl/RailwayStationServiceImpl.java | 13 ++- .../service/impl/RegionServiceImpl.java | 31 +++++-- .../system/wrapper/RegionWrapper.java | 8 +- .../controller/CustomerArchiveController.java | 3 +- .../impl/AccidentRecordServiceImpl.java | 6 ++ .../impl/CustomerArchiveServiceImpl.java | 29 ++++++ .../impl/ViolationRecordServiceImpl.java | 2 +- doc/sql/transport/blade_insurance_record.sql | 2 +- doc/sql/transport/blade_mileage_record.sql | 2 +- .../blade_region_plus86_migration.sql | 93 +++++++++++++++++++ ...lade_station_airport_address_migration.sql | 12 +++ .../blade_tire_replacement_record.sql | 2 +- doc/sql/transport/transport.sql | 12 ++- .../transport_menu_title_patch_20260720.sql | 4 + 28 files changed, 406 insertions(+), 135 deletions(-) create mode 100644 doc/sql/transport/blade_region_plus86_migration.sql create mode 100644 doc/sql/transport/blade_station_airport_address_migration.sql create mode 100644 doc/sql/transport/transport_menu_title_patch_20260720.sql diff --git a/AGENTS.md b/AGENTS.md index c906667..742ddc8 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -344,3 +344,4 @@ id parent_id code name alias path source sort category action is_open component 2075431753298714626 2075431169720033282 airport_master_status 修改状态 airport_master_status 1 2 0 1 0 2075431820189474818 2075431169720033282 airport_master_add 新增 airport_master_add 1 2 0 1 0 ``` +2.生成的表、字段的排序规则要使用utf8mb4_general_ci \ No newline at end of file diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/RegionCache.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/RegionCache.java index 5a51a17..0e2ed3e 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/RegionCache.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/RegionCache.java @@ -39,7 +39,10 @@ import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE; * @author Chill */ public class RegionCache { - public static final String MAIN_CODE = "00"; + public static final String ROOT_PARENT_CODE = "0"; + public static final String MAIN_CODE = "+86"; + public static final String LEGACY_MAIN_CODE = "00"; + public static final int COUNTRY_LEVEL = 0; public static final int PROVINCE_LEVEL = 1; public static final int CITY_LEVEL = 2; public static final int DISTRICT_LEVEL = 3; diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/AirportMaster.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/AirportMaster.java index b877eb0..b6ce9ce 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/AirportMaster.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/AirportMaster.java @@ -93,6 +93,21 @@ public class AirportMaster extends BaseEntity { */ @Schema(description = "所属城市") private String cityName; + /** + * 行政区划编码 + */ + @Schema(description = "行政区划编码") + private String regionCode; + /** + * 行政区划 + */ + @Schema(description = "行政区划") + private String regionName; + /** + * 详细地址 + */ + @Schema(description = "详细地址") + private String detailAddress; /** * 经度 */ diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/RailwayStation.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/RailwayStation.java index 4880bc4..0fbcfaa 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/RailwayStation.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/RailwayStation.java @@ -93,6 +93,21 @@ public class RailwayStation extends BaseEntity { */ @Schema(description = "所属城市") private String cityName; + /** + * 行政区划编码 + */ + @Schema(description = "行政区划编码") + private String regionCode; + /** + * 行政区划 + */ + @Schema(description = "行政区划") + private String regionName; + /** + * 详细地址 + */ + @Schema(description = "详细地址") + private String detailAddress; /** * 经度 */ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RegionController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RegionController.java index 1e479a1..d539e18 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RegionController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RegionController.java @@ -121,9 +121,9 @@ public class RegionController extends BladeController { }) @ApiOperationSupport(order = 4) @Operation(summary = "懒加载列表", description = "传入menu") - public R> lazyTree(String parentCode, @Parameter(hidden = true) @RequestParam Map menu) { - List list = regionService.lazyTree(parentCode, menu); - return R.data(RegionWrapper.build().listNodeLazyVO(list)); + public R>> lazyTree(String parentCode, @Parameter(hidden = true) @RequestParam Map menu) { + List> list = regionService.lazyTree(parentCode, menu); + return R.data(list); } /** @@ -173,7 +173,7 @@ public class RegionController extends BladeController { @GetMapping("/select") @ApiOperationSupport(order = 9) @Operation(summary = "下拉数据源", description = "传入tenant") - public R> select(@RequestParam(required = false, defaultValue = "00") String code) { + public R> select(@RequestParam(required = false, defaultValue = "+86") String code) { List list = regionService.list(Wrappers.query().lambda().eq(Region::getParentCode, code)); return R.data(list); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/excel/AirportMasterExcel.java b/blade-service/blade-system/src/main/java/org/springblade/system/excel/AirportMasterExcel.java index 1986fb0..2d7d436 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/excel/AirportMasterExcel.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/excel/AirportMasterExcel.java @@ -73,6 +73,12 @@ public class AirportMasterExcel implements Serializable { @ExcelProperty("所属城市") private String cityName; + @ExcelProperty("行政区划") + private String regionName; + + @ExcelProperty("详细地址") + private String detailAddress; + @ExcelProperty("经度") private BigDecimal longitude; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/excel/RailwayStationExcel.java b/blade-service/blade-system/src/main/java/org/springblade/system/excel/RailwayStationExcel.java index 113672f..cee1280 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/excel/RailwayStationExcel.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/excel/RailwayStationExcel.java @@ -64,8 +64,8 @@ public class RailwayStationExcel implements Serializable { @ExcelProperty("车站名称") private String name; - @ExcelProperty("所属铁路线路") - private String railwayLine; +// @ExcelProperty("所属铁路线路") +// private String railwayLine; @ExcelProperty("所属省份") private String provinceName; @@ -73,6 +73,12 @@ public class RailwayStationExcel implements Serializable { @ExcelProperty("所属城市") private String cityName; + @ExcelProperty("行政区划") + private String regionName; + + @ExcelProperty("详细地址") + private String detailAddress; + @ExcelProperty("经度") private BigDecimal longitude; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/AirportMasterMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/AirportMasterMapper.xml index 7af92a1..c0d7bee 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/AirportMasterMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/AirportMasterMapper.xml @@ -8,6 +8,7 @@ + @@ -20,6 +21,9 @@ + + + @@ -28,59 +32,72 @@ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.xml index 034d598..61987bd 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.xml @@ -8,6 +8,7 @@ + @@ -27,61 +28,63 @@ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RailwayStationMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RailwayStationMapper.xml index faa946b..8fc4b83 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RailwayStationMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RailwayStationMapper.xml @@ -8,6 +8,7 @@ + @@ -20,6 +21,9 @@ + + + @@ -28,70 +32,83 @@ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.java index 18f0085..f0f8fa9 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.java @@ -58,7 +58,7 @@ public interface RegionMapper extends BaseMapper { * @param param * @return */ - List lazyTree(String parentCode, Map param); + List> lazyTree(String parentCode, Map param); /** * 导出区划数据 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml index 7d83a3b..f70b9e2 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml @@ -74,14 +74,14 @@ - SELECT - region.code AS "id", - region.parent_code AS "parent_id", - region.name AS "title", - region.code AS "value", - region.code AS "key", - ( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM blade_region WHERE parent_code = region.code ) AS "has_children" + region.code AS id, + region.parent_code AS parentId, + region.name AS title, + region.code AS value, + region.code AS `key`, + ( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM blade_region WHERE parent_code = region.code ) AS hasChildren FROM blade_region region diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IRegionService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IRegionService.java index 49afc33..ffe3a3a 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IRegionService.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IRegionService.java @@ -73,7 +73,7 @@ public interface IRegionService extends IService { * @param param * @return */ - List lazyTree(String parentCode, Map param); + List> lazyTree(String parentCode, Map param); /** * 导入区划数据 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/AirportMasterServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/AirportMasterServiceImpl.java index 8b7dcc7..7709660 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/AirportMasterServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/AirportMasterServiceImpl.java @@ -65,12 +65,15 @@ public class AirportMasterServiceImpl extends BaseServiceImpllambdaQuery() - .eq(Region::getParentCode, "00") + .eq(Region::getParentCode, DEFAULT_COUNTRY_CODE) .eq(Region::getName, airportMaster.getProvinceName()), false); } if (Func.isEmpty(province)) { diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RailwayStationServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RailwayStationServiceImpl.java index f757c6d..877948c 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RailwayStationServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RailwayStationServiceImpl.java @@ -68,12 +68,15 @@ public class RailwayStationServiceImpl extends BaseServiceImpllambdaQuery() - .eq(Region::getParentCode, "00") + .eq(Region::getParentCode, DEFAULT_COUNTRY_CODE) .eq(Region::getName, railwayStation.getProvinceName()), false); } if (Func.isEmpty(province)) { diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java index 9b6bd4a..e503e40 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java @@ -57,14 +57,24 @@ public class RegionServiceImpl extends ServiceImpl impleme @Override public boolean submit(Region region) { - // 设置市级编号格式 String regionCode = region.getCode(); String regionParentCode = region.getParentCode(); - if (regionCode.startsWith(MAIN_CODE)) { - region.setCode(StringUtil.removePrefix(regionCode, MAIN_CODE)); - } - if (regionParentCode.startsWith(MAIN_CODE)) { - region.setParentCode(StringUtil.removePrefix(regionParentCode, MAIN_CODE)); + Integer level = region.getRegionLevel(); + if (level != null && level == COUNTRY_LEVEL) { + region.setParentCode(ROOT_PARENT_CODE); + region.setAncestors(ROOT_PARENT_CODE); + } else { + if (LEGACY_MAIN_CODE.equals(regionParentCode)) { + region.setParentCode(MAIN_CODE); + } + if (StringUtil.isNotBlank(regionCode) && regionCode.startsWith(LEGACY_MAIN_CODE)) { + region.setCode(StringUtil.removePrefix(regionCode, LEGACY_MAIN_CODE)); + } + if (MAIN_CODE.equals(region.getParentCode()) + && StringUtil.isNotBlank(region.getCode()) + && region.getCode().startsWith(MAIN_CODE)) { + region.setCode(StringUtil.removePrefix(region.getCode(), MAIN_CODE)); + } } // 查询是否已存在 Long cnt = baseMapper.selectCount(Wrappers.query().lambda().eq(Region::getCode, region.getCode())); @@ -74,11 +84,14 @@ public class RegionServiceImpl extends ServiceImpl impleme // 设置祖区划编号 Region parent = getByCode(region.getParentCode()); if (Func.isNotEmpty(parent) && Func.isNotEmpty(parent.getCode())) { - String ancestors = parent.getAncestors() + StringPool.COMMA + parent.getCode(); + String ancestors = parent.getRegionLevel() != null && parent.getRegionLevel() == COUNTRY_LEVEL + ? parent.getCode() + : parent.getAncestors() + StringPool.COMMA + parent.getCode(); region.setAncestors(ancestors); + } else if (MAIN_CODE.equals(region.getParentCode())) { + region.setAncestors(MAIN_CODE); } // 设置省、市、区、镇、村 - Integer level = region.getRegionLevel(); String code = region.getCode(); String name = region.getName(); if (level == PROVINCE_LEVEL) { @@ -115,7 +128,7 @@ public class RegionServiceImpl extends ServiceImpl impleme } @Override - public List lazyTree(String parentCode, Map param) { + public List> lazyTree(String parentCode, Map param) { return baseMapper.lazyTree(parentCode, param); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/RegionWrapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/RegionWrapper.java index 355c95c..6251b11 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/RegionWrapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/RegionWrapper.java @@ -35,6 +35,8 @@ import org.springblade.system.pojo.vo.RegionVO; import java.util.List; import java.util.Objects; +import static org.springblade.system.cache.RegionCache.ROOT_PARENT_CODE; + /** * 包装类,返回视图层所需的字段 * @@ -50,7 +52,11 @@ public class RegionWrapper extends BaseEntityWrapper { public RegionVO entityVO(Region region) { RegionVO regionVO = Objects.requireNonNull(BeanUtil.copyProperties(region, RegionVO.class)); Region parentRegion = RegionCache.getByCode(region.getParentCode()); - regionVO.setParentName(parentRegion.getName()); + if (Objects.nonNull(parentRegion)) { + regionVO.setParentName(parentRegion.getName()); + } else if (ROOT_PARENT_CODE.equals(region.getParentCode())) { + regionVO.setParentName("根节点"); + } return regionVO; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CustomerArchiveController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CustomerArchiveController.java index 62764b3..de082a0 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CustomerArchiveController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CustomerArchiveController.java @@ -95,7 +95,8 @@ public class CustomerArchiveController extends BladeController { @ApiOperationSupport(order = 3) @Operation(summary = "新增或修改", description = "传入customerArchive") public R submit(@RequestBody CustomerArchiveVO customerArchive) { - return R.status(customerArchiveService.submit(customerArchive)); + boolean result = customerArchiveService.submit(customerArchive); + return result ? R.data(customerArchive.getId()) : R.status(false); } /** diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/AccidentRecordServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/AccidentRecordServiceImpl.java index 1b4bfe1..7f399d0 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/AccidentRecordServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/AccidentRecordServiceImpl.java @@ -129,6 +129,12 @@ public class AccidentRecordServiceImpl extends BaseServiceImpl CUSTOMER_NATURES = Set.of("有限公司", "个体工商户"); + private static final Set CUSTOMER_TYPES = Set.of("客户", "承运商"); private final CustomerContactMapper contactMapper; private final CustomerReceiptAccountMapper receiptAccountMapper; @@ -146,6 +150,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl typeList = Arrays.stream(customerType.replace("，", ",").split(",")) + .map(String::trim) + .filter(Func::isNotEmpty) + .toList(); + if (Func.isEmpty(typeList)) { + throw new ServiceException("客商类型不能为空"); + } + for (String type : typeList) { + if (!CUSTOMER_TYPES.contains(type)) { + throw new ServiceException("客商类型只能选择客户或承运商"); + } + } + } + private void validateApproval(CustomerArchiveVO customer) { if (Objects.equals(customer.getAccessType(), ACCESS_FORMAL)) { if (Func.isEmpty(customer.getQualificationAttachments())) { diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ViolationRecordServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ViolationRecordServiceImpl.java index e31c85a..d50a500 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ViolationRecordServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ViolationRecordServiceImpl.java @@ -249,7 +249,7 @@ public class ViolationRecordServiceImpl extends BaseServiceImpl 0 + OR FIND_IN_SET('86', `ancestors`) > 0; + +-- 5. 清理旧中国根节点，避免树上出现多个国家根。 +DELETE FROM `blade_region` +WHERE `code` IN ('00', '86') + AND (`region_level` = 0 OR `name` IN ('中华人民共和国', '中国')); + +COMMIT; + +SET FOREIGN_KEY_CHECKS = 1; + +-- 验证： +-- SELECT `code`, `parent_code`, `ancestors`, `name`, `region_level` FROM `blade_region` WHERE `code` = '+86'; +-- SELECT `code`, `parent_code`, `ancestors`, `name`, `region_level` FROM `blade_region` WHERE `parent_code` = '+86' ORDER BY `code` LIMIT 20; +-- SELECT `code`, `parent_code`, `ancestors`, `name` FROM `blade_region` WHERE `parent_code` IN ('00', '86') OR FIND_IN_SET('00', `ancestors`) > 0 OR FIND_IN_SET('86', `ancestors`) > 0; diff --git a/doc/sql/transport/blade_station_airport_address_migration.sql b/doc/sql/transport/blade_station_airport_address_migration.sql new file mode 100644 index 0000000..80de197 --- /dev/null +++ b/doc/sql/transport/blade_station_airport_address_migration.sql @@ -0,0 +1,12 @@ +-- 铁路车站、空港机场补充行政区划与详细地址字段 +-- 执行前请先备份数据库；如字段已存在，请跳过对应 ALTER。 + +ALTER TABLE `blade_railway_station` + ADD COLUMN `region_code` varchar(32) DEFAULT NULL COMMENT '行政区划编码' AFTER `city_name`, + ADD COLUMN `region_name` varchar(128) DEFAULT NULL COMMENT '行政区划' AFTER `region_code`, + ADD COLUMN `detail_address` varchar(255) DEFAULT NULL COMMENT '详细地址' AFTER `region_name`; + +ALTER TABLE `blade_airport_master` + ADD COLUMN `region_code` varchar(32) DEFAULT NULL COMMENT '行政区划编码' AFTER `city_name`, + ADD COLUMN `region_name` varchar(128) DEFAULT NULL COMMENT '行政区划' AFTER `region_code`, + ADD COLUMN `detail_address` varchar(255) DEFAULT NULL COMMENT '详细地址' AFTER `region_name`; diff --git a/doc/sql/transport/blade_tire_replacement_record.sql b/doc/sql/transport/blade_tire_replacement_record.sql index 8b6873f..3a0be18 100644 --- a/doc/sql/transport/blade_tire_replacement_record.sql +++ b/doc/sql/transport/blade_tire_replacement_record.sql @@ -31,7 +31,7 @@ CREATE TABLE `blade_tire_replacement_record` ( -- parent_id 默认挂载至 transport.sql 中的“车/船务管理”：2075436235826896898 -- ---------------------------- INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES -(2077630000000000001, 2075436235826896898, 'tire_replacement_record', '换胎记录', 'tire_replacement_record', '/vehicle/tire-replacement-record', 'iconfont iconicon_doc', 80, 1, 0, 1, '', '', 0), +(2077630000000000001, 2075436235826896898, 'tire_replacement_record', '换胎记录(无船)', 'tire_replacement_record', '/vehicle/tire-replacement-record', 'iconfont iconicon_doc', 80, 1, 0, 1, '', '', 0), (2077630000000000002, 2077630000000000001, 'tire_replacement_record_add', '新增', 'tire_replacement_record_add', '', '', 1, 2, 0, 1, NULL, '', 0), (2077630000000000003, 2077630000000000001, 'tire_replacement_record_edit', '编辑', 'tire_replacement_record_edit', '', '', 2, 2, 0, 1, NULL, '', 0), (2077630000000000004, 2077630000000000001, 'tire_replacement_record_delete', '批量删除', 'tire_replacement_record_delete', '', '', 3, 2, 0, 1, NULL, '', 0), diff --git a/doc/sql/transport/transport.sql b/doc/sql/transport/transport.sql index ea1bb2a..419fe1e 100644 --- a/doc/sql/transport/transport.sql +++ b/doc/sql/transport/transport.sql @@ -32,6 +32,9 @@ CREATE TABLE `blade_airport_master` ( `province_name` varchar(128) DEFAULT NULL COMMENT '所属省份', `city_code` varchar(12) DEFAULT NULL COMMENT '所属城市编码', `city_name` varchar(128) DEFAULT NULL COMMENT '所属城市', + `region_code` varchar(32) DEFAULT NULL COMMENT '行政区划编码', + `region_name` varchar(128) DEFAULT NULL COMMENT '行政区划', + `detail_address` varchar(255) DEFAULT NULL COMMENT '详细地址', `longitude` decimal(12,6) DEFAULT NULL COMMENT '经度', `latitude` decimal(12,6) DEFAULT NULL COMMENT '纬度', `data_source` varchar(20) DEFAULT '手动录入' COMMENT '数据来源', @@ -1039,7 +1042,7 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075438207636316165, 2075437082342301697, 'maintenance_record_export', '批量导出', 'maintenance_record_export', '', '', 1, 2, 0, 1, NULL, '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075444068651868162, 2075437082342301697, 'maintenance_record_list', '列表', 'maintenance_record_list', '/blade-transport/maintenance-record/list', '', 1, 2, 0, 1, NULL, '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075444261606629377, 2075437237678350338, 'maintenance_plan_list', '列表', 'maintenance_plan_list', '/blade-transport/maintenance-plan/list', '', 1, 2, 0, 1, NULL, '', 0); -INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077610000000000001, 2075436235826896898, 'insurance_record', '保险记录', 'insurance_record', '/vehicle/insurance-record', 'iconfont iconicon_doc', 60, 1, 0, 1, '', '', 0); +INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077610000000000001, 2075436235826896898, 'insurance_record', '保险记录(OCR)', 'insurance_record', '/vehicle/insurance-record', 'iconfont iconicon_doc', 60, 1, 0, 1, '', '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077610000000000002, 2077610000000000001, 'insurance_record_add', '新增', 'insurance_record_add', '', '', 1, 2, 0, 1, NULL, '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077610000000000003, 2077610000000000001, 'insurance_record_edit', '编辑', 'insurance_record_edit', '', '', 2, 2, 0, 1, NULL, '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077610000000000004, 2077610000000000001, 'insurance_record_delete', '批量删除', 'insurance_record_delete', '', '', 3, 2, 0, 1, NULL, '', 0); @@ -1058,7 +1061,7 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077620000000000007, 2077620000000000001, 'violation_record_template', '下载模板', 'violation_record_template', '', '', 6, 2, 0, 1, NULL, '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077620000000000008, 2077620000000000001, 'violation_record_export', '批量导出', 'violation_record_export', '', '', 7, 2, 0, 1, NULL, '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077620000000000009, 2077620000000000001, 'violation_record_list', '列表', 'violation_record_list', '/blade-transport/violation-record/list', '', 8, 2, 0, 1, NULL, '', 0); -INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077630000000000001, 2075436235826896898, 'tire_replacement_record', '换胎记录', 'tire_replacement_record', '/vehicle/tire-replacement-record', 'iconfont iconicon_doc', 80, 1, 0, 1, '', '', 0); +INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077630000000000001, 2075436235826896898, 'tire_replacement_record', '换胎记录(无船)', 'tire_replacement_record', '/vehicle/tire-replacement-record', 'iconfont iconicon_doc', 80, 1, 0, 1, '', '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077630000000000002, 2077630000000000001, 'tire_replacement_record_add', '新增', 'tire_replacement_record_add', '', '', 1, 2, 0, 1, NULL, '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077630000000000003, 2077630000000000001, 'tire_replacement_record_edit', '编辑', 'tire_replacement_record_edit', '', '', 2, 2, 0, 1, NULL, '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077630000000000004, 2077630000000000001, 'tire_replacement_record_delete', '批量删除', 'tire_replacement_record_delete', '', '', 3, 2, 0, 1, NULL, '', 0); @@ -1085,7 +1088,7 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077650000000000007, 2077650000000000001, 'annual_inspection_record_template', '下载模板', 'annual_inspection_record_template', '', '', 6, 2, 0, 1, NULL, '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077650000000000008, 2077650000000000001, 'annual_inspection_record_export', '批量导出', 'annual_inspection_record_export', '', '', 7, 2, 0, 1, NULL, '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077650000000000009, 2077650000000000001, 'annual_inspection_record_list', '列表', 'annual_inspection_record_list', '/blade-transport/annual-inspection-record/list', '', 8, 2, 0, 1, NULL, '', 0); -INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077660000000000001, 2075436235826896898, 'mileage_record', '里程记录', 'mileage_record', '/vehicle/mileage-record', 'iconfont iconicon_doc', 110, 1, 0, 1, '', '', 0); +INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077660000000000001, 2075436235826896898, 'mileage_record', '里程记录(无船)', 'mileage_record', '/vehicle/mileage-record', 'iconfont iconicon_doc', 110, 1, 0, 1, '', '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077660000000000002, 2077660000000000001, 'mileage_record_add', '新增', 'mileage_record_add', '', '', 1, 2, 0, 1, NULL, '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077660000000000003, 2077660000000000001, 'mileage_record_edit', '编辑', 'mileage_record_edit', '', '', 2, 2, 0, 1, NULL, '', 0); INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2077660000000000004, 2077660000000000001, 'mileage_record_delete', '批量删除', 'mileage_record_delete', '', '', 3, 2, 0, 1, NULL, '', 0); @@ -1414,6 +1417,9 @@ CREATE TABLE `blade_railway_station` ( `province_name` varchar(128) DEFAULT NULL COMMENT '所属省份', `city_code` varchar(12) DEFAULT NULL COMMENT '所属城市编码', `city_name` varchar(128) DEFAULT NULL COMMENT '所属城市', + `region_code` varchar(32) DEFAULT NULL COMMENT '行政区划编码', + `region_name` varchar(128) DEFAULT NULL COMMENT '行政区划', + `detail_address` varchar(255) DEFAULT NULL COMMENT '详细地址', `longitude` decimal(12,6) DEFAULT NULL COMMENT '经度', `latitude` decimal(12,6) DEFAULT NULL COMMENT '纬度', `data_source` varchar(20) DEFAULT '手动' COMMENT '数据来源', diff --git a/doc/sql/transport/transport_menu_title_patch_20260720.sql b/doc/sql/transport/transport_menu_title_patch_20260720.sql new file mode 100644 index 0000000..b028082 --- /dev/null +++ b/doc/sql/transport/transport_menu_title_patch_20260720.sql @@ -0,0 +1,4 @@ +-- 同步已初始化环境中的运输模块菜单标题 +UPDATE `blade_menu` SET `name` = '保险记录(OCR)' WHERE `code` = 'insurance_record' AND `is_deleted` = 0; +UPDATE `blade_menu` SET `name` = '里程记录(无船)' WHERE `code` = 'mileage_record' AND `is_deleted` = 0; +UPDATE `blade_menu` SET `name` = '换胎记录(无船)' WHERE `code` = 'tire_replacement_record' AND `is_deleted` = 0;