diff --git a/mhd-bi/sql/create_bi_comprehensive_dm.sql b/mhd-bi/sql/create_bi_comprehensive_dm.sql index d6758b80d..d15ff69f1 100644 --- a/mhd-bi/sql/create_bi_comprehensive_dm.sql +++ b/mhd-bi/sql/create_bi_comprehensive_dm.sql @@ -2,30 +2,43 @@ -- 达梦 DM8：综合态势（单表，可重复执行） -- 接口：GET /biReport/comprehensive -- 执行顺序：删除历史多表/旧快照 → 建 BI_COMPREHENSIVE_SNAPSHOT → 示例 INSERT --- PAYLOAD_JSON 与 ComprehensiveSituationVO 字段名一致；应用取 UPDATE_TIME 最新一条。 +-- PAYLOAD_JSON 与 ComprehensiveSituationVO 字段名一致；接口取 DEL_FLAG=1 且 CREATE_TIME 最新一条。 -- ============================================================================= -- 子表优先 -DROP TABLE IF EXISTS BI_COMPREHENSIVE_INCOME_TREND; -DROP TABLE IF EXISTS BI_COMPREHENSIVE_METRIC; -DROP TABLE IF EXISTS BI_COMPREHENSIVE_SNAPSHOT; +DROP TABLE IF EXISTS +BI_COMPREHENSIVE_INCOME_TREND; +DROP TABLE IF EXISTS +BI_COMPREHENSIVE_METRIC; +DROP TABLE IF EXISTS +BI_COMPREHENSIVE_SNAPSHOT; -CREATE TABLE BI_COMPREHENSIVE_SNAPSHOT ( +CREATE TABLE +BI_COMPREHENSIVE_SNAPSHOT ( ID BIGINT IDENTITY(1,1) NOT NULL, PAYLOAD_JSON CLOB NOT NULL, CREATE_TIME DATETIME DEFAULT NULL, UPDATE_TIME DATETIME DEFAULT NULL, REMARK VARCHAR(500) DEFAULT NULL, + DEL_FLAG NUMBER(1) DEFAULT 1 NOT NULL, PRIMARY KEY (ID) ); -CREATE INDEX IDX_BI_COMP_SNAP_UPD ON BI_COMPREHENSIVE_SNAPSHOT(UPDATE_TIME); -COMMENT ON TABLE BI_COMPREHENSIVE_SNAPSHOT IS '综合态势-整包 JSON 快照'; +CREATE INDEX IDX_BI_COMP_SNAP_DEL_CR ON +BI_COMPREHENSIVE_SNAPSHOT(DEL_FLAG, CREATE_TIME); +CREATE INDEX IDX_BI_COMP_SNAP_UPD ON +BI_COMPREHENSIVE_SNAPSHOT(UPDATE_TIME); +COMMENT ON TABLE +BI_COMPREHENSIVE_SNAPSHOT IS '综合态势-整包 JSON 快照'; +COMMENT ON COLUMN +BI_COMPREHENSIVE_SNAPSHOT.DEL_FLAG IS '0无状态 1正常 2已删除'; -INSERT INTO BI_COMPREHENSIVE_SNAPSHOT (PAYLOAD_JSON, CREATE_TIME, UPDATE_TIME) +INSERT INTO +BI_COMPREHENSIVE_SNAPSHOT (PAYLOAD_JSON, CREATE_TIME, UPDATE_TIME, DEL_FLAG) VALUES ( '{"valueAddedServiceIncome":5330000,"inventoryTurnover":25,"orderCount":42300,"vehicleUtilizationRate":97.4,"fuelConsumptionPerHundredKm":15,"incomeTrend":[280,210,260,310,470,390]}', SYSDATE, - SYSDATE + SYSDATE, + 1 ); COMMIT; diff --git a/mhd-bi/sql/create_bi_platform_surveillance_dm.sql b/mhd-bi/sql/create_bi_platform_surveillance_dm.sql index 9b91607c7..29c8b7736 100644 --- a/mhd-bi/sql/create_bi_platform_surveillance_dm.sql +++ b/mhd-bi/sql/create_bi_platform_surveillance_dm.sql @@ -2,34 +2,52 @@ -- 达梦 DM8：月台监测（单表，可重复执行） -- 接口：GET /biReport/platformSurveillance -- 执行顺序：删除历史多表/旧快照 → 建 BI_PLATFORM_SURVEILLANCE_SNAPSHOT → 示例 INSERT --- PAYLOAD_JSON 与 PlatformSurveillanceVO 一致；应用 ORDER BY UPDATE_TIME DESC LIMIT 1。 +-- PAYLOAD_JSON 与 PlatformSurveillanceVO 一致；接口取 DEL_FLAG=1 且 CREATE_TIME 最新一条。 -- ============================================================================= -DROP TABLE IF EXISTS BI_PS_ALARM_DIST; -DROP TABLE IF EXISTS BI_PS_TASK_TYPE; -DROP TABLE IF EXISTS BI_PS_ALARM_TREND; -DROP TABLE IF EXISTS BI_PS_TASK_LOAD; -DROP TABLE IF EXISTS BI_PS_AVG_DURATION_TREND; -DROP TABLE IF EXISTS BI_PS_VEHICLE; -DROP TABLE IF EXISTS BI_PLATFORM_SURVEILLANCE_METRIC; -DROP TABLE IF EXISTS BI_PLATFORM_SURVEILLANCE_SNAPSHOT; +DROP TABLE IF EXISTS +BI_PS_ALARM_DIST; +DROP TABLE IF EXISTS +BI_PS_TASK_TYPE; +DROP TABLE IF EXISTS +BI_PS_ALARM_TREND; +DROP TABLE IF EXISTS +BI_PS_TASK_LOAD; +DROP TABLE IF EXISTS +BI_PS_AVG_DURATION_TREND; +DROP TABLE IF EXISTS +BI_PS_VEHICLE; +DROP TABLE IF EXISTS +BI_PLATFORM_SURVEILLANCE_METRIC; +DROP TABLE IF EXISTS +BI_PLATFORM_SURVEILLANCE_SNAPSHOT; -CREATE TABLE BI_PLATFORM_SURVEILLANCE_SNAPSHOT ( +CREATE TABLE +BI_PLATFORM_SURVEILLANCE_SNAPSHOT ( ID BIGINT IDENTITY(1,1) NOT NULL, PAYLOAD_JSON CLOB NOT NULL, CREATE_TIME DATETIME DEFAULT NULL, UPDATE_TIME DATETIME DEFAULT NULL, REMARK VARCHAR(500) DEFAULT NULL, + DEL_FLAG NUMBER(1) DEFAULT 1 NOT NULL, PRIMARY KEY (ID) ); -CREATE INDEX IDX_BI_PS_SNAP_UPD ON BI_PLATFORM_SURVEILLANCE_SNAPSHOT(UPDATE_TIME); -COMMENT ON TABLE BI_PLATFORM_SURVEILLANCE_SNAPSHOT IS '月台监测-整包 JSON 快照'; +CREATE INDEX IDX_BI_PS_SNAP_DEL_CR ON +BI_PLATFORM_SURVEILLANCE_SNAPSHOT(DEL_FLAG, CREATE_TIME); +CREATE INDEX IDX_BI_PS_SNAP_UPD ON +BI_PLATFORM_SURVEILLANCE_SNAPSHOT(UPDATE_TIME); +COMMENT ON TABLE +BI_PLATFORM_SURVEILLANCE_SNAPSHOT IS '月台监测-整包 JSON 快照'; +COMMENT ON COLUMN +BI_PLATFORM_SURVEILLANCE_SNAPSHOT.DEL_FLAG IS '0无状态 1正常 2已删除'; -INSERT INTO BI_PLATFORM_SURVEILLANCE_SNAPSHOT (PAYLOAD_JSON, CREATE_TIME, UPDATE_TIME) +INSERT INTO +BI_PLATFORM_SURVEILLANCE_SNAPSHOT (PAYLOAD_JSON, CREATE_TIME, UPDATE_TIME, DEL_FLAG) VALUES ( '{"vehicles":[{"plateNumber":"粤CFR1958","status":"作业中","platformId":"#48","platformDuration":265},{"plateNumber":"粤CFR1958","status":"已离园","platformId":"#48","platformDuration":265},{"plateNumber":"粤CFR1958","status":"作业中","platformId":"#48","platformDuration":265},{"plateNumber":"粤CFR1958","status":"作业中","platformId":"#48","platformDuration":265},{"plateNumber":"粤CFR1958","status":"作业中","platformId":"#48","platformDuration":265},{"plateNumber":"粤CFR1958","status":"作业中","platformId":"#48","platformDuration":265}],"efficiencyStatistics":{"entryOvertimeRate":60,"overtimeCount":45,"platformOnTimeRate":92,"avgPlatformDuration":4.5,"yardOnTimeRate":88,"avgYardDuration":4.5},"platformOverview":{"totalPlatforms":43,"currentOccupancyRate":50,"operatingPlatforms":23,"todayTasks":324},"vehicleStatus":{"todayReservedVehicles":3000,"notCheckedIn":1500,"operatingVehicles":1000,"completedVehicles":1000},"avgOperationDurationTrend":[{"month":"11月","yardDuration":10,"platformDuration":23},{"month":"12月","yardDuration":14,"platformDuration":15},{"month":"1月","yardDuration":23.5,"platformDuration":20},{"month":"2月","yardDuration":22,"platformDuration":17},{"month":"3月","yardDuration":13,"platformDuration":14},{"month":"4月","yardDuration":17,"platformDuration":10}],"monthlyTaskStatistics":{"taskTotal":1455,"taskTotalYoY":5,"avgTaskDuration":4.5,"avgDurationYoY":-5,"taskCompletionRate":95,"completionRateYoY":5},"taskLoadStatistics":[{"time":"15时","taskCount":100},{"time":"16时","taskCount":110},{"time":"17时","taskCount":115},{"time":"18时","taskCount":80},{"time":"19时","taskCount":60},{"time":"20时","taskCount":40},{"time":"21时","taskCount":40},{"time":"22时","taskCount":40},{"time":"23时","taskCount":30},{"time":"0时","taskCount":10},{"time":"1时","taskCount":10},{"time":"2时","taskCount":10},{"time":"3时","taskCount":10},{"time":"4时","taskCount":10},{"time":"5时","taskCount":10},{"time":"6时","taskCount":20},{"time":"7时","taskCount":30},{"time":"8时","taskCount":70},{"time":"9时","taskCount":95},{"time":"10时","taskCount":110},{"time":"11时","taskCount":120},{"time":"12时","taskCount":130},{"time":"13时","taskCount":130}],"platformAlarmTrend":[{"date":"11日","alarmCount":10},{"date":"12日","alarmCount":14},{"date":"13日","alarmCount":23},{"date":"14日","alarmCount":22},{"date":"15日","alarmCount":13},{"date":"16日","alarmCount":17},{"date":"17日","alarmCount":8}],"taskTypeStatistics":{"totalTasks":4325,"taskTypes":[{"type":"类型1","count":2400},{"type":"类型2","count":2300},{"type":"类型3","count":2300},{"type":"类型4","count":2300}]},"platformAlarmStatistics":{"todayAlarmTotal":13,"handled":12,"unhandled":1},"platformAlarmDistribution":[{"type":"类型1","count":300},{"type":"类型2","count":245},{"type":"类型3","count":280},{"type":"类型4","count":340},{"type":"类型5","count":455},{"type":"类型6","count":400},{"type":"类型7","count":300}]}', SYSDATE, - SYSDATE + SYSDATE, + 1 ); COMMIT; diff --git a/mhd-bi/sql/create_bi_warehouse_transport_dm.sql b/mhd-bi/sql/create_bi_warehouse_transport_dm.sql index 9bf319dd8..62a83b121 100644 --- a/mhd-bi/sql/create_bi_warehouse_transport_dm.sql +++ b/mhd-bi/sql/create_bi_warehouse_transport_dm.sql @@ -2,30 +2,44 @@ -- 达梦 DM8：仓储运输（单表，可重复执行） -- 接口：GET /biReport/warehouseTransport -- 执行顺序：删除历史多表/旧快照 → 建 BI_WAREHOUSE_TRANSPORT_SNAPSHOT → 示例 INSERT --- PAYLOAD_JSON 与 WarehouseTransportSituationVO 字段名一致；应用取 UPDATE_TIME 最新一条。 +-- PAYLOAD_JSON 与 WarehouseTransportSituationVO 字段名一致；接口取 DEL_FLAG=1 且 CREATE_TIME 最新一条。 -- ============================================================================= -DROP TABLE IF EXISTS BI_WTS_CUSTOMER_RANK; -DROP TABLE IF EXISTS BI_WTS_TIME_SERIES; -DROP TABLE IF EXISTS BI_WAREHOUSE_TRANSPORT_METRIC; -DROP TABLE IF EXISTS BI_WAREHOUSE_TRANSPORT_SNAPSHOT; +DROP TABLE IF EXISTS +BI_WTS_CUSTOMER_RANK; +DROP TABLE IF EXISTS +BI_WTS_TIME_SERIES; +DROP TABLE IF EXISTS +BI_WAREHOUSE_TRANSPORT_METRIC; +DROP TABLE IF EXISTS +BI_WAREHOUSE_TRANSPORT_SNAPSHOT; -CREATE TABLE BI_WAREHOUSE_TRANSPORT_SNAPSHOT ( +CREATE TABLE +BI_WAREHOUSE_TRANSPORT_SNAPSHOT ( ID BIGINT IDENTITY(1,1) NOT NULL, PAYLOAD_JSON CLOB NOT NULL, CREATE_TIME DATETIME DEFAULT NULL, UPDATE_TIME DATETIME DEFAULT NULL, REMARK VARCHAR(500) DEFAULT NULL, + DEL_FLAG NUMBER(1) DEFAULT 1 NOT NULL, PRIMARY KEY (ID) ); -CREATE INDEX IDX_BI_WTS_SNAP_UPD ON BI_WAREHOUSE_TRANSPORT_SNAPSHOT(UPDATE_TIME); -COMMENT ON TABLE BI_WAREHOUSE_TRANSPORT_SNAPSHOT IS '仓储运输-整包 JSON 快照'; +CREATE INDEX IDX_BI_WTS_SNAP_DEL_CR ON +BI_WAREHOUSE_TRANSPORT_SNAPSHOT(DEL_FLAG, CREATE_TIME); +CREATE INDEX IDX_BI_WTS_SNAP_UPD ON +BI_WAREHOUSE_TRANSPORT_SNAPSHOT(UPDATE_TIME); +COMMENT ON TABLE +BI_WAREHOUSE_TRANSPORT_SNAPSHOT IS '仓储运输-整包 JSON 快照'; +COMMENT ON COLUMN +BI_WAREHOUSE_TRANSPORT_SNAPSHOT.DEL_FLAG IS '0无状态 1正常 2已删除'; -INSERT INTO BI_WAREHOUSE_TRANSPORT_SNAPSHOT (PAYLOAD_JSON, CREATE_TIME, UPDATE_TIME) +INSERT INTO +BI_WAREHOUSE_TRANSPORT_SNAPSHOT (PAYLOAD_JSON, CREATE_TIME, UPDATE_TIME, DEL_FLAG) VALUES ( '{"warehouseDistributionOnTimeRate":99.2,"currentYearOrders":525440,"currentQuarterOrders":225120,"currentMonthOrders":23560,"warehouseOrderTrend":[100,93,85,70,98,88],"throughput":[10,14,23,10,13,19],"currentMonthTurnoverRate":3,"currentYearTurnoverRate":4,"inventoryTurnoverTrend":[10,14,23,22,13,17],"totalTransportIncome":5850,"orderCount":856,"transportTrips":533,"annualTransportVolume":15,"transportOrderTotal":4325,"crossBorderTransportOrder":2400,"domesticTransportOrder":2300,"transportTripsTrend":[100,140,230,100,130,192],"vehicleUtilizationRate":[600,460,350,470,450,620],"warehouseDockSyncRate":[100,98,87,78,97,86],"customerContributionRank":{"customerName":["客户A","客户B","客户C","客户D","客户E"],"customerAmount":[147,150,170,160,180]}}', SYSDATE, - SYSDATE + SYSDATE, + 1 ); COMMIT; diff --git a/mhd-bi/sql/sql.sql b/mhd-bi/sql/sql.sql new file mode 100644 index 000000000..b48b5724b --- /dev/null +++ b/mhd-bi/sql/sql.sql @@ -0,0 +1,15 @@ +ALTER TABLE BI_COMPREHENSIVE_SNAPSHOT + ADD (DEL_FLAG TINYINT DEFAULT 1); + +COMMENT ON COLUMN BI_COMPREHENSIVE_SNAPSHOT.DEL_FLAG IS '删除标志：0-无状态, 1-正常, 2-已删除'; + +ALTER TABLE BI_PLATFORM_SURVEILLANCE_SNAPSHOT + ADD (DEL_FLAG TINYINT DEFAULT 1); + +COMMENT ON COLUMN BI_PLATFORM_SURVEILLANCE_SNAPSHOT.DEL_FLAG IS '删除标志：0-无状态, 1-正常, 2-已删除'; + + +ALTER TABLE BI_WAREHOUSE_TRANSPORT_SNAPSHOT + ADD (DEL_FLAG TINYINT DEFAULT 1); + +COMMENT ON COLUMN BI_WAREHOUSE_TRANSPORT_SNAPSHOT.DEL_FLAG IS '删除标志：0-无状态, 1-正常, 2-已删除'; \ No newline at end of file diff --git a/mhd-bi/src/main/java/com/mhd/bi/domain/biReport/support/BiReportSnapshotMapperSupport.java b/mhd-bi/src/main/java/com/mhd/bi/domain/biReport/support/BiReportSnapshotMapperSupport.java index a3f6f7979..6d6086d4c 100644 --- a/mhd-bi/src/main/java/com/mhd/bi/domain/biReport/support/BiReportSnapshotMapperSupport.java +++ b/mhd-bi/src/main/java/com/mhd/bi/domain/biReport/support/BiReportSnapshotMapperSupport.java @@ -12,7 +12,7 @@ import java.util.Collections; import java.util.function.Supplier; /** - * Mapper 层使用的快照 JSON 解析与空态（SQL 仅定义在对应 Mapper.xml） + * Mapper 层使用的快照 JSON 解析与空态（SQL 仅定义在对应 Mapper.xml；查询条件见各 XML：DEL_FLAG=1，按 CREATE_TIME 取最新） */ @Slf4j public final class BiReportSnapshotMapperSupport { 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 b5a17897e..fafae14c3 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 @@ -38,9 +38,9 @@ public class BiReportApi extends BaseController { /** - * 综合态势指标查询 + * 综合态势指标查询（按照 del_flag=1，按 create_time 最新一条） */ - @ApiOperation("综合态势指标查询") + @ApiOperation(value = "综合态势指标查询", notes = "返回 DEL_FLAG=1 且 CREATE_TIME 最新的一条") @GetMapping("/comprehensive") public BiApiResult comprehensive() { ComprehensiveSituationVO data = biComprehensiveReportService.loadLatestComprehensive(); @@ -48,9 +48,9 @@ public class BiReportApi extends BaseController { } /** - * 仓储运输指标查询 + * 仓储运输指标查询（按照 del_flag=1，按 create_time 最新一条） */ - @ApiOperation("仓储运输指标查询") + @ApiOperation(value = "仓储运输指标查询", notes = "返回 DEL_FLAG=1 且 CREATE_TIME 最新的一条") @GetMapping("/warehouseTransport") public BiApiResult warehouseTransport() { WarehouseTransportSituationVO data = biWarehouseTransportReportService.loadLatestWarehouseTransport(); @@ -58,9 +58,9 @@ public class BiReportApi extends BaseController { } /** - * 月台监测指标查询 + * 月台监测指标查询（按照 del_flag=1，按 create_time 最新一条） */ - @ApiOperation("月台监测指标查询") + @ApiOperation(value = "月台监测指标查询", notes = "返回 DEL_FLAG=1 且 CREATE_TIME 最新的一条快照") @GetMapping("/platformSurveillance") public BiApiResult platformSurveillance() { PlatformSurveillanceVO data = biPlatformSurveillanceReportService.loadLatestPlatformSurveillance(); diff --git a/mhd-bi/src/main/resources/mapper/biComprehensive/BiComprehensiveReportMapper.xml b/mhd-bi/src/main/resources/mapper/biComprehensive/BiComprehensiveReportMapper.xml index b71fd5735..b0339bb32 100644 --- a/mhd-bi/src/main/resources/mapper/biComprehensive/BiComprehensiveReportMapper.xml +++ b/mhd-bi/src/main/resources/mapper/biComprehensive/BiComprehensiveReportMapper.xml @@ -5,8 +5,9 @@ diff --git a/mhd-bi/src/main/resources/mapper/biPlatformSurveillance/BiPlatformSurveillanceReportMapper.xml b/mhd-bi/src/main/resources/mapper/biPlatformSurveillance/BiPlatformSurveillanceReportMapper.xml index c29740c99..5e240368c 100644 --- a/mhd-bi/src/main/resources/mapper/biPlatformSurveillance/BiPlatformSurveillanceReportMapper.xml +++ b/mhd-bi/src/main/resources/mapper/biPlatformSurveillance/BiPlatformSurveillanceReportMapper.xml @@ -5,8 +5,9 @@ diff --git a/mhd-bi/src/main/resources/mapper/biWarehouseTransport/BiWarehouseTransportReportMapper.xml b/mhd-bi/src/main/resources/mapper/biWarehouseTransport/BiWarehouseTransportReportMapper.xml index 0692697bc..8811f62f6 100644 --- a/mhd-bi/src/main/resources/mapper/biWarehouseTransport/BiWarehouseTransportReportMapper.xml +++ b/mhd-bi/src/main/resources/mapper/biWarehouseTransport/BiWarehouseTransportReportMapper.xml @@ -5,8 +5,9 @@