From 7b76d5c20328072aa3dfff1b1422d5df0c912b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Wed, 9 Sep 2026 19:38:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?BI=E6=8E=A5=E5=8F=A3=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/mapper/BiPlatformRealDataMapper.java | 2 +- .../repository/po/RealBusinessTypeStatPO.java | 8 ++++---- .../service/BiPlatformRealDataService.java | 6 +++--- .../bi/interfaces/facadeApi/biReport/BiReportApi.java | 4 ++-- .../biPlatformRealData/BiPlatformRealDataMapper.xml | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/mapper/BiPlatformRealDataMapper.java b/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/mapper/BiPlatformRealDataMapper.java index b99f69b53..d0ac6ff44 100644 --- a/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/mapper/BiPlatformRealDataMapper.java +++ b/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/mapper/BiPlatformRealDataMapper.java @@ -41,7 +41,7 @@ public interface BiPlatformRealDataMapper { /** 任务负荷（今日 24 小时） */ List queryTaskLoadToday(); - /** 今日预约-租户统计（按 tenantName 分组统计今日预约数量） */ + /** 今日预约-业务类型统计（按 businessName 分组统计今日预约数量） */ List queryTodayBusinessTypeStats(); /** 今日作业准时率统计（total 今日预约总数；onTimeCount 今日准时车辆数） */ diff --git a/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealBusinessTypeStatPO.java b/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealBusinessTypeStatPO.java index 7e4dfb70d..d9df6ab91 100644 --- a/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealBusinessTypeStatPO.java +++ b/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealBusinessTypeStatPO.java @@ -5,15 +5,15 @@ import lombok.Data; import java.io.Serializable; /** - * 今日预约-租户统计（真实数据，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS） - * 按租户名称分组统计今日预约数量 + * 今日预约-业务类型统计（真实数据，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS） + * 按业务类型分组统计今日预约数量 */ @Data public class RealBusinessTypeStatPO implements Serializable { private static final long serialVersionUID = 1L; - /** 租户名称（qms_main_business.tenantName） */ - private String tenantName; + /** 业务类型名称（qms_main_business.businessName） */ + private String businessName; /** 今日预约数量 */ private Long count; diff --git a/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java b/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java index 2b4c65556..de0a5597e 100644 --- a/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java +++ b/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java @@ -307,14 +307,14 @@ public class BiPlatformRealDataService { } /** - * 今日预约-租户统计：按租户名称分组统计今日预约数量。 - * 例：今日预约某租户 3 条 → 返回 {tenantName:"某租户", count:3} + * 今日预约-业务类型统计：按业务类型分组统计今日预约数量。 + * 例：今日预约航空打板 3 条 → 返回 {businessName:"航空打板", count:3} */ public List queryTodayBusinessTypeStats() { try { return biPlatformRealDataMapper.queryTodayBusinessTypeStats(); } catch (Exception e) { - log.error("【YMS】统计今日租户预约失败: {}", e.getMessage(), e); + log.error("【YMS】统计今日业务类型失败: {}", e.getMessage(), e); return java.util.Collections.emptyList(); } } diff --git a/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/BiReportApi.java b/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/BiReportApi.java index 664ab716b..108afc412 100644 --- a/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/BiReportApi.java +++ b/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/BiReportApi.java @@ -122,9 +122,9 @@ public class BiReportApi extends BaseController { } /** - * 今日预约-租户统计（实时查 YMS 库，不落库） + * 今日预约-业务类型统计（实时查 YMS 库，不落库） */ - @ApiOperation(value = "今日预约租户统计", notes = "按租户名称分组统计今日预约数量，实时查询 YMS 库，不落库；例：某租户 3 条") + @ApiOperation(value = "今日预约业务类型统计", notes = "按业务类型分组统计今日预约数量，实时查询 YMS 库，不落库；例：航空打板 3 条") @GetMapping("/businessTypeStats") public BiApiResult> businessTypeStats() { List data = biPlatformRealDataService.queryTodayBusinessTypeStats(); diff --git a/mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml b/mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml index beae38d61..7d8e96670 100644 --- a/mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml +++ b/mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml @@ -111,15 +111,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS - + From 3907b126d95d63213a536059316db5736dfaa5f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Wed, 9 Sep 2026 19:42:39 +0800 Subject: [PATCH 2/6] 31 --- mhd-bi/src/main/resources/bootstrap.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mhd-bi/src/main/resources/bootstrap.yml b/mhd-bi/src/main/resources/bootstrap.yml index 2572662c1..fa1d95e1a 100644 --- a/mhd-bi/src/main/resources/bootstrap.yml +++ b/mhd-bi/src/main/resources/bootstrap.yml @@ -19,14 +19,14 @@ spring: # username: nacos # password: manhuoda@2023 #线上正式环境 - server-addr: 10.102.192.30:6848 + server-addr: 10.102.192.31:6848 username: nacos password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.30:6848 + server-addr: 10.102.192.31:6848 username: nacos password: manhuoda@2023 #线上正式环境 From 0493030620bea438c4b28f4cdd266fdbe29a0ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Wed, 9 Sep 2026 22:02:31 +0800 Subject: [PATCH 3/6] =?UTF-8?q?BI=E6=9C=88=E5=8F=B0=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=87=86=E6=97=B6=E7=8E=87=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BiPlatformRealDataService.java | 9 ++++----- .../service/BiReportSnapshotSyncService.java | 4 +--- .../biPlatformRealData/BiPlatformRealDataMapper.xml | 9 +++++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java b/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java index de0a5597e..6eb351b2d 100644 --- a/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java +++ b/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java @@ -194,9 +194,8 @@ public class BiPlatformRealDataService { } /** - * 今日作业准时率 = 准时车辆数 / 今日预约车辆总数 × 100% - * 准时：今日（TARGET_DATE=今天）已进场且实际进场时间不超过该预约的预约结束时间 bookingEndTime； - * 实际进场时间超过 bookingEndTime 视为不准时。 + * 今日作业准时率 = 今日准时车辆数 / 今日预约总数 × 100%（四舍五入取整） + * 准时：实际进入时间 < 预约日期(TARGET_DATE) + 预约结束时间(BOOKING_END_TIME)。 * 今日预约总数为 0 时返回 0。 */ public int calcTodayOnTimeRate() { @@ -206,7 +205,7 @@ public class BiPlatformRealDataService { long total = po.getTotal() == null ? 0L : po.getTotal(); long onTime = po.getOnTimeCount() == null ? 0L : po.getOnTimeCount(); if (total <= 0) return 0; - // 四舍五入到整数百分比 + // 四舍五入到整数百分比（取整） return (int) Math.round(((double) onTime / (double) total) * 100.0); } catch (Exception e) { log.error("【YMS】计算今日作业准时率失败: {}", e.getMessage(), e); @@ -394,7 +393,7 @@ public class BiPlatformRealDataService { template.getPlatformOverview().setCurrentOccupancyRate(rate); template.getPlatformOverview().setTodayTasks(todayTasks); - // 作业准时率：准时车辆数 / 今日预约总数 × 100%（今日总数为 0 时返回 0） + // 作业准时率（实际进入时间 < 预约日期+预约结束时间 的车辆 / 今日预约总数 × 100% 取整） if (template.getEfficiencyStatistics() != null) { template.getEfficiencyStatistics().setPlatformOnTimeRate(calcTodayOnTimeRate()); } diff --git a/mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/service/BiReportSnapshotSyncService.java b/mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/service/BiReportSnapshotSyncService.java index a149ecf61..297a1331e 100644 --- a/mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/service/BiReportSnapshotSyncService.java +++ b/mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/service/BiReportSnapshotSyncService.java @@ -194,9 +194,7 @@ public class BiReportSnapshotSyncService { template.getPlatformOverview().setCurrentOccupancyRate(rate); template.getPlatformOverview().setTodayTasks(todayTasks); - // 作业准时率 = 准时车辆数 / 今日预约总数 × 100% - // 准时：今日（TARGET_DATE=今天）已进场且 ENTRY_TIME <= bookingEndTime（预约结束时间），超过视为不准时 - // 今日预约总数 = 0 时返回 0 + // 作业准时率 = 实际进入时间 < 预约日期+预约结束时间 的车辆 / 今日预约总数 × 100%（取整） if (template.getEfficiencyStatistics() != null) { template.getEfficiencyStatistics().setPlatformOnTimeRate(biPlatformRealDataService.calcTodayOnTimeRate()); } diff --git a/mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml b/mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml index 7d8e96670..10fc82463 100644 --- a/mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml +++ b/mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml @@ -50,16 +50,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" From dea39a1a4bc44892b1a9dd663c33f12c63d8a819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Wed, 9 Sep 2026 22:05:47 +0800 Subject: [PATCH 4/6] 30 --- mhd-bi/src/main/resources/bootstrap.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mhd-bi/src/main/resources/bootstrap.yml b/mhd-bi/src/main/resources/bootstrap.yml index fa1d95e1a..2572662c1 100644 --- a/mhd-bi/src/main/resources/bootstrap.yml +++ b/mhd-bi/src/main/resources/bootstrap.yml @@ -19,14 +19,14 @@ spring: # username: nacos # password: manhuoda@2023 #线上正式环境 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境 From ba5d78b36c2072c0929bcd7a1cab258523d8416d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Wed, 9 Sep 2026 23:40:33 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=87=86=E6=97=B6=E7=8E=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BiPlatformRealDataService.java | 4 ++-- .../biPlatformRealData/BiPlatformRealDataMapper.xml | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java b/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java index 6eb351b2d..05fe35cb3 100644 --- a/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java +++ b/mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java @@ -194,9 +194,9 @@ public class BiPlatformRealDataService { } /** - * 今日作业准时率 = 今日准时车辆数 / 今日预约总数 × 100%（四舍五入取整） + * 今日作业准时率 = 今日准时车辆数 / 今日有入场时间的车辆数 × 100%（四舍五入取整） * 准时：实际进入时间 < 预约日期(TARGET_DATE) + 预约结束时间(BOOKING_END_TIME)。 - * 今日预约总数为 0 时返回 0。 + * 分子分母都只统计有入场时间（ENTRY_TIME 不为空）的车辆；分母为 0 时返回 0。 */ public int calcTodayOnTimeRate() { try { diff --git a/mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml b/mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml index 10fc82463..6f9852c18 100644 --- a/mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml +++ b/mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml @@ -49,14 +49,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"