Merge remote-tracking branch 'origin/master'

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerSeizureStatsController.java

@@ -104,13 +104,13 @@ public class LedgerSeizureStatsController extends BaseController {
      *
      * @param countQueryReq 查询参数
      * @return AjaxResult
-     * @method countSeizureInfoItem
+     * @method countSeizeSubjectItemQuantity
      * @author PanHu Sun
      * @date 2026/5/20 13:32
      */
-    @PostMapping("/countSeizeSubjectCategoryQuantity")
-    public AjaxResult countSeizeSubjectCategoryQuantity(@RequestBody CountQueryReqVO countQueryReq) {
-        List<SeizeCategoryQuantityVO> seizeCategoryQuantityList = service.countSeizeSubjectCategoryQuantity(countQueryReq);
+    @PostMapping("/countSeizeSubjectItemQuantity")
+    public AjaxResult countSeizeSubjectItemQuantity(@RequestBody CountQueryReqVO countQueryReq) {
+        List<SeizeCategoryQuantityVO> seizeCategoryQuantityList = service.countSeizeSubjectItemQuantity(countQueryReq);
         return AjaxResult.success(seizeCategoryQuantityList);
     }
 

airport-admin/src/main/java/com/sundot/airport/web/controller/score/ScoreDimensionController.java

@@ -37,9 +37,7 @@ public class ScoreDimensionController extends BaseController {
     /** 不分页列表，用于前端下拉选择 */
     @PreAuthorize("@ss.hasPermi('score:dimension:list')")
     @GetMapping("/all")
-    public AjaxResult all() {
-        ScoreDimension query = new ScoreDimension();
-        query.setStatus("0");
+    public AjaxResult all(ScoreDimension query) {
         return AjaxResult.success(service.selectList(query));
     }
 

airport-common/src/main/java/com/sundot/airport/common/utils/DateUtils.java

@@ -8,16 +8,20 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+import com.google.common.collect.Lists;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
  * 时间工具类
- * 
+ *
  * @author ruoyi
  */
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils
-{
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     public static String YYYY = "yyyy";
 
     public static String YYYY_MM = "yyyy-MM";
@@ -29,63 +33,52 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
 
     private static String[] parsePatterns = {
-            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
 
     /**
      * 获取当前Date型日期
-     * 
+     *
      * @return Date() 当前日期
      */
-    public static Date getNowDate()
-    {
+    public static Date getNowDate() {
         return new Date();
     }
 
     /**
      * 获取当前日期, 默认格式为yyyy-MM-dd
-     * 
+     *
      * @return String
      */
-    public static String getDate()
-    {
+    public static String getDate() {
         return dateTimeNow(YYYY_MM_DD);
     }
 
-    public static final String getTime()
-    {
+    public static final String getTime() {
         return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
     }
 
-    public static final String dateTimeNow()
-    {
+    public static final String dateTimeNow() {
         return dateTimeNow(YYYYMMDDHHMMSS);
     }
 
-    public static final String dateTimeNow(final String format)
-    {
+    public static final String dateTimeNow(final String format) {
         return parseDateToStr(format, new Date());
     }
 
-    public static final String dateTime(final Date date)
-    {
+    public static final String dateTime(final Date date) {
         return parseDateToStr(YYYY_MM_DD, date);
     }
 
-    public static final String parseDateToStr(final String format, final Date date)
-    {
+    public static final String parseDateToStr(final String format, final Date date) {
         return new SimpleDateFormat(format).format(date);
     }
 
-    public static final Date dateTime(final String format, final String ts)
-    {
-        try
-        {
+    public static final Date dateTime(final String format, final String ts) {
+        try {
             return new SimpleDateFormat(format).parse(ts);
-        }
-        catch (ParseException e)
-        {
+        } catch (ParseException e) {
             throw new RuntimeException(e);
         }
     }
@@ -93,8 +86,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如2018/08/08
      */
-    public static final String datePath()
-    {
+    public static final String datePath() {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyy/MM/dd");
     }
@@ -102,8 +94,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如20180808
      */
-    public static final String dateTime()
-    {
+    public static final String dateTime() {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyyMMdd");
     }
@@ -111,18 +102,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期型字符串转化为日期 格式
      */
-    public static Date parseDate(Object str)
-    {
-        if (str == null)
-        {
+    public static Date parseDate(Object str) {
+        if (str == null) {
             return null;
         }
-        try
-        {
+        try {
             return parseDate(str.toString(), parsePatterns);
-        }
-        catch (ParseException e)
-        {
+        } catch (ParseException e) {
             return null;
         }
     }
@@ -130,8 +116,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 获取服务器启动时间
      */
-    public static Date getServerStartDate()
-    {
+    public static Date getServerStartDate() {
         long time = ManagementFactory.getRuntimeMXBean().getStartTime();
         return new Date(time);
     }
@@ -139,20 +124,18 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算相差天数
      */
-    public static int differentDaysByMillisecond(Date date1, Date date2)
-    {
+    public static int differentDaysByMillisecond(Date date1, Date date2) {
         return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
     }
 
     /**
      * 计算时间差
      *
-     * @param endDate 最后时间
+     * @param endDate   最后时间
      * @param startTime 开始时间
      * @return 时间差（天/小时/分钟）
      */
-    public static String timeDistance(Date endDate, Date startTime)
-    {
+    public static String timeDistance(Date endDate, Date startTime) {
         long nd = 1000 * 24 * 60 * 60;
         long nh = 1000 * 60 * 60;
         long nm = 1000 * 60;
@@ -173,8 +156,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 增加 LocalDateTime ==> Date
      */
-    public static Date toDate(LocalDateTime temporalAccessor)
-    {
+    public static Date toDate(LocalDateTime temporalAccessor) {
         ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
     }
@@ -182,10 +164,47 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 增加 LocalDate ==> Date
      */
-    public static Date toDate(LocalDate temporalAccessor)
-    {
+    public static Date toDate(LocalDate temporalAccessor) {
         LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
         ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
     }
+
+    /**
+     * 生成近30天的日期列表（包含今天）
+     */
+    public static List<Date> generateLast30Days() {
+        List<Date> dates = Lists.newArrayList();
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+
+        for (int i = 29; i >= 0; i--) {
+            Calendar cal = (Calendar) calendar.clone();
+            cal.add(Calendar.DAY_OF_MONTH, -i);
+            dates.add(cal.getTime());
+        }
+        return dates;
+    }
+
+    /**
+     * 格式化日期为字符串键值（yyyy-MM-dd）
+     */
+    public static String formatDateKey(Date date) {
+        if (Objects.isNull(date)) {
+            return "";
+        }
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        return String.format("%04d-%02d-%02d",
+                cal.get(Calendar.YEAR),
+                cal.get(Calendar.MONTH) + 1,
+                cal.get(Calendar.DAY_OF_MONTH));
+    }
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/OperationStationHourlyThroughput.java

@@ -53,12 +53,12 @@ public class OperationStationHourlyThroughput extends BaseEntity {
     @Excel(name = "通道号")
     private String laneId;
 
-    /** 记录日期（YYYYMMDD） */
+    /** 记录日期（yyyy-MM-dd） */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "记录日期", width = 20, dateFormat = "yyyy-MM-dd")
     private Date recordDate;
 
-    /** 小时（0:00~1:00、1:00~2:00、23:00~24:00等） */
+    /** 小时（0:00、1:00、2:00等） */
     @Excel(name = "小时")
     private String hourOfDay;
 

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/vo/AreaFlowVO.java

@@ -1,6 +1,8 @@
 package com.sundot.airport.ledger.domain.vo;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -11,6 +13,8 @@ import java.io.Serializable;
  * @date 2026/5/19 16:55
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class AreaFlowVO implements Serializable {
     /**
      * 区域ID

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/vo/LaneThroughputResVO.java

@@ -1,8 +1,11 @@
 package com.sundot.airport.ledger.domain.vo;
 
-import lombok.Data;
+    import com.fasterxml.jackson.annotation.JsonFormat;
+    import lombok.AllArgsConstructor;
+    import lombok.Data;
+    import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
+    import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -13,10 +16,13 @@ import java.util.Date;
  * @date 2026/5/19 15:27
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class LaneThroughputResVO implements Serializable {
     /**
      * 日期
      */
+    @JsonFormat(pattern = "MM-dd")
     private Date recordDate;
 
     /**
@@ -38,4 +44,12 @@ public class LaneThroughputResVO implements Serializable {
      * 过检率（保留1位小数）
      */
     private BigDecimal throughputRate;
+
+    public LaneThroughputResVO(Date date, String groupName) {
+        this.recordDate = date;
+        this.totalThroughput = 0;
+        this.totalRecord = 0;
+        this.throughputRate = java.math.BigDecimal.ZERO;
+        this.groupName = groupName;
+    }
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/vo/SeizeCategoryQuantityVO.java

@@ -15,9 +15,9 @@ public class SeizeCategoryQuantityVO implements Serializable {
     /**
      * 违规品类别名称（饼图名称）
      */
-    private String categoryName;
+    private String itemName;
     /**
      * 该类别总查获数量（饼图数值）
      */
-    private Integer categoryNum;
+    private Integer itemNum;
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/vo/StationHourlyThroughputGroupResVO.java

@@ -14,11 +14,16 @@ import java.util.List;
 @Data
 public class StationHourlyThroughputGroupResVO implements Serializable {
     /**
-     * 小时（0,1,2...23）
+     * 小时（2026-05-20 16:00）
      */
     private String hourOfDay;
 
     /**
+     * 小时（16:00）
+     */
+    private String hour;
+
+    /**
      * 当前小时 所有区域总人流量
      */
     private Integer totalHourFlow;

airport-ledger/src/main/java/com/sundot/airport/ledger/mapper/LedgerSeizureStatsMapper.java

@@ -71,11 +71,11 @@ public interface LedgerSeizureStatsMapper extends BaseMapper<LedgerSeizureStats>
      *
      * @param query 查询参数
      * @return List<SeizeCategoryQuantityVO>
-     * @method countSeizeSubjectCategoryQuantity
+     * @method countSeizeSubjectItemQuantity
      * @author PanHu Sun
      * @date 2026/5/20 14:40
      */
-    List<SeizeCategoryQuantityVO> countSeizeSubjectCategoryQuantity(CountQueryReqVO query);
+    List<SeizeCategoryQuantityVO> countSeizeSubjectItemQuantity(CountQueryReqVO query);
 
     /**
      * 功能描述：查获工作区域分布

airport-ledger/src/main/java/com/sundot/airport/ledger/service/ILedgerSeizureStatsService.java

@@ -52,11 +52,11 @@ public interface ILedgerSeizureStatsService extends IService<LedgerSeizureStats>
      *
      * @param countQueryReq 查询参数
      * @return List<SeizeCategoryQuantityVO>
-     * @method countSeizeSubjectCategoryQuantity
+     * @method countSeizeSubjectItemQuantity
      * @author PanHu Sun
      * @date 2026/5/20 14:46
      */
-    List<SeizeCategoryQuantityVO> countSeizeSubjectCategoryQuantity(CountQueryReqVO countQueryReq);
+    List<SeizeCategoryQuantityVO> countSeizeSubjectItemQuantity(CountQueryReqVO countQueryReq);
 
     /**
      * 功能描述：查获工作区域分布

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerSeizureStatsServiceImpl.java

@@ -98,14 +98,14 @@ public class LedgerSeizureStatsServiceImpl extends ServiceImpl<LedgerSeizureStat
      *
      * @param countQueryReq 查询参数
      * @return List<SeizeCategoryQuantityVO>
-     * @method countSeizeSubjectCategoryQuantity
+     * @method countSeizeSubjectItemQuantity
      * @author PanHu Sun
      * @date 2026/5/20 14:46
      */
     @Override
-    public List<SeizeCategoryQuantityVO> countSeizeSubjectCategoryQuantity(CountQueryReqVO countQueryReq) {
+    public List<SeizeCategoryQuantityVO> countSeizeSubjectItemQuantity(CountQueryReqVO countQueryReq) {
         // 无数据自动返回空数组，符合需求
-        List<SeizeCategoryQuantityVO> seizeCategoryQuantityList = this.baseMapper.countSeizeSubjectCategoryQuantity(countQueryReq);
+        List<SeizeCategoryQuantityVO> seizeCategoryQuantityList = this.baseMapper.countSeizeSubjectItemQuantity(countQueryReq);
         return CollUtil.emptyIfNull(seizeCategoryQuantityList);
     }
 

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/OperationLanePeakThroughputServiceImpl.java

@@ -1,24 +1,31 @@
 package com.sundot.airport.ledger.service.impl;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.ledger.domain.OperationLanePeakThroughput;
 import com.sundot.airport.ledger.domain.vo.CountQueryReqVO;
 import com.sundot.airport.ledger.domain.vo.LaneThroughputResVO;
 import com.sundot.airport.ledger.mapper.OperationLanePeakThroughputMapper;
 import com.sundot.airport.ledger.service.IOperationLanePeakThroughputService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
  * 通道日别高峰时段过检Service业务层处理
  */
+@Slf4j
 @Service
 public class OperationLanePeakThroughputServiceImpl extends ServiceImpl<OperationLanePeakThroughputMapper, OperationLanePeakThroughput>
         implements IOperationLanePeakThroughputService {
@@ -102,7 +109,51 @@ public class OperationLanePeakThroughputServiceImpl extends ServiceImpl<Operatio
         if (Objects.isNull(laneThroughputQuery.getDeptId()) && Objects.isNull(laneThroughputQuery.getTeamId()) && Objects.isNull(laneThroughputQuery.getGroupId())) {
             return Collections.emptyList();
         }
+        
+        // 查询数据库中存在的日期数据
         List<LaneThroughputResVO> laneThroughputResList = this.baseMapper.countLanePeakThroughput(laneThroughputQuery);
-        return CollUtil.emptyIfNull(laneThroughputResList);
+        laneThroughputResList = CollUtil.emptyIfNull(laneThroughputResList);
+        
+        log.info("SQL查询返回数据条数: {}", laneThroughputResList.size());
+        
+        // 生成近30天的日期列表
+        List<Date> last30Days = DateUtils.generateLast30Days();
+        
+        // 将查询结果按日期建立映射（只比较日期部分，忽略时间）
+        Map<String, LaneThroughputResVO> dataMap = laneThroughputResList.stream()
+                .collect(Collectors.toMap(
+                        vo -> DateUtils.formatDateKey(vo.getRecordDate()),
+                        vo -> vo,
+                        (existing, replacement) -> existing
+                ));
+        
+        log.info("数据Map中的日期键: {}", dataMap.keySet());
+
+        // 获取小组名称
+        String groupName = "";
+        if (CollUtil.isNotEmpty(laneThroughputResList)) {
+            groupName = laneThroughputResList.get(0).getGroupName();
+        }
+
+        // 补齐缺失的日期数据
+        List<LaneThroughputResVO> resultList = Lists.newArrayList();
+        for (Date date : last30Days) {
+            String dateKey = DateUtils.formatDateKey(date);
+            if (dataMap.containsKey(dateKey)) {
+                // 存在的日期，使用查询结果
+                resultList.add(dataMap.get(dateKey));
+            } else {
+                // 缺失的日期，补充0数据
+                LaneThroughputResVO emptyLaneThroughput = new LaneThroughputResVO(date, groupName);
+                resultList.add(emptyLaneThroughput);
+            }
+        }
+        
+        log.info("补齐后返回的总数据条数: {}", resultList.size());
+        
+        // 按日期升序排序
+        resultList.sort(Comparator.comparing(LaneThroughputResVO::getRecordDate));
+        
+        return resultList;
     }
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/OperationStationHourlyThroughputServiceImpl.java

@@ -1,25 +1,23 @@
 package com.sundot.airport.ledger.service.impl;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.ledger.domain.OperationStationHourlyThroughput;
 import com.sundot.airport.ledger.domain.vo.AreaFlowVO;
+import com.sundot.airport.ledger.domain.vo.LaneThroughputResVO;
 import com.sundot.airport.ledger.domain.vo.StationHourlyThroughputGroupResVO;
 import com.sundot.airport.ledger.domain.vo.StationHourlyThroughputVO;
 import com.sundot.airport.ledger.mapper.OperationStationHourlyThroughputMapper;
 import com.sundot.airport.ledger.service.IOperationStationHourlyThroughputService;
 import com.sundot.airport.system.domain.BasePosition;
 import com.sundot.airport.system.mapper.BasePositionMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 /**
  * 站级时间段别总过检Service业务层处理
  */
+@Slf4j
 @Service
 public class OperationStationHourlyThroughputServiceImpl extends ServiceImpl<OperationStationHourlyThroughputMapper, OperationStationHourlyThroughput> implements IOperationStationHourlyThroughputService {
 
@@ -107,8 +106,15 @@ public class OperationStationHourlyThroughputServiceImpl extends ServiceImpl<Ope
     @Override
     public List<StationHourlyThroughputGroupResVO> countStationHourlyThroughput() {
         List<StationHourlyThroughputVO> stationHourlyThroughputList = this.baseMapper.countStationHourlyThroughput();
-        if (CollUtil.isEmpty(stationHourlyThroughputList)) {
-            return Collections.emptyList();
+        stationHourlyThroughputList = CollUtil.emptyIfNull(stationHourlyThroughputList);
+
+        log.info("SQL查询返回数据条数: {}", stationHourlyThroughputList.size());
+        if (!stationHourlyThroughputList.isEmpty()) {
+            log.info("SQL查询返回的时间点列表: {}", 
+                    stationHourlyThroughputList.stream()
+                            .map(StationHourlyThroughputVO::getHourOfDay)
+                            .distinct()
+                            .collect(Collectors.toList()));
         }
 
         Map<Long, BasePosition> areaInfoMap = Maps.newHashMap();
@@ -124,33 +130,146 @@ public class OperationStationHourlyThroughputServiceImpl extends ServiceImpl<Ope
             areaInfoMap = CollUtil.emptyIfNull(basePositions).stream().collect(Collectors.toMap(BasePosition::getId, v -> v));
         }
 
-        // 2. 核心：按小时分组 → 组装成前端需要的层级结构
-        Map<String, List<StationHourlyThroughputVO>> hourGroupMap = stationHourlyThroughputList.stream().collect(Collectors.groupingBy(StationHourlyThroughputVO::getHourOfDay));
+        // 2. 按时间点分组
+        Map<String, List<StationHourlyThroughputVO>> hourGroupMap = stationHourlyThroughputList.stream()
+                .collect(Collectors.groupingBy(StationHourlyThroughputVO::getHourOfDay));
+
+        // 3. 生成近24个具体时间点（从当前时间向前推24小时）
+        List<String> last24Hours = this.generateLast24Hours();
+        
+        log.info("需要补齐的24个时间点: {}", last24Hours);
 
         Map<Long, BasePosition> finalAreaInfoMap = areaInfoMap;
-        return hourGroupMap.entrySet().stream().map(entry -> {
-            String hour = entry.getKey();
-            List<StationHourlyThroughputVO> hourDataList = entry.getValue();
-
-            // 构建区域列表
-            List<AreaFlowVO> areaList = hourDataList.stream().map(stats -> {
-                BasePosition basePosition = finalAreaInfoMap.get(stats.getAreaId());
-
-                AreaFlowVO areaFlowVO = new AreaFlowVO();
-                areaFlowVO.setAreaId(stats.getAreaId());
-                areaFlowVO.setAreaName(Objects.nonNull(basePosition) ? basePosition.getName() : "");
-                areaFlowVO.setAreaFlow(stats.getAreaFlow());
-                return areaFlowVO;
-            }).collect(Collectors.toList());
-
-            // 构建小时分组对象
-            StationHourlyThroughputGroupResVO groupVO = new StationHourlyThroughputGroupResVO();
-            groupVO.setHourOfDay(hour);
-            // 总人流量（取第一条即可，同小时数据总流量一致）
-            groupVO.setTotalHourFlow(hourDataList.get(0).getTotalHourFlow());
-            // 区域信息
-            groupVO.setAreaList(areaList);
-            return groupVO;
-        }).collect(Collectors.toList());
+        
+        // 4. 补齐24个时间点数据
+        List<StationHourlyThroughputGroupResVO> resultList = Lists.newArrayList();
+        for (String hourTime : last24Hours) {
+            // 处理日期 转换hourTime格式的日期，例如：2026-05-21 00:00转成0:00，2026-05-21 01:00转成01:00，2026-05-21 11:00转成11:00
+            // 提取小时和分钟部分（去掉日期）
+            String hourOnly = this.extractHourAndMinute(hourTime);
+
+            if (hourGroupMap.containsKey(hourTime)) {
+                // 存在数据的时间点，正常组装
+                List<StationHourlyThroughputVO> hourDataList = hourGroupMap.get(hourTime);
+                
+                List<AreaFlowVO> areaList = hourDataList.stream().map(stats -> {
+                    BasePosition basePosition = finalAreaInfoMap.get(stats.getAreaId());
+                    AreaFlowVO areaFlowVO = new AreaFlowVO();
+                    areaFlowVO.setAreaId(stats.getAreaId());
+                    areaFlowVO.setAreaName(Objects.nonNull(basePosition) ? basePosition.getName() : "");
+                    areaFlowVO.setAreaFlow(stats.getAreaFlow());
+                    return areaFlowVO;
+                }).collect(Collectors.toList());
+
+                // 补充缺失的区域信息
+                if (CollUtil.isEmpty(areaList)){
+                    areaInfoMap.forEach((id, basePosition) -> {
+                        areaList.add(new AreaFlowVO(id, basePosition.getName(), 0));
+                    });
+                } else {
+                    if (areaList.size() != areaInfoMap.size()) {
+                        areaInfoMap.forEach((id, basePosition) -> {
+                            AreaFlowVO newAreaFlow = areaList.stream().filter(areaFlowVO -> areaFlowVO.getAreaId().equals(id)).findFirst().orElse(null);
+                            if (Objects.isNull(newAreaFlow)) {
+                                areaList.add(new AreaFlowVO(id, basePosition.getName(), 0));
+                            }
+                        });
+                    }
+                }
+
+                // 按区域id升序排序
+                if (CollUtil.isNotEmpty(areaList)){
+                    areaList.sort(Comparator.comparing(AreaFlowVO::getAreaId));
+                }
+
+                StationHourlyThroughputGroupResVO groupVO = new StationHourlyThroughputGroupResVO();
+                groupVO.setHourOfDay(hourTime);
+                groupVO.setHour(hourOnly);
+                groupVO.setTotalHourFlow(hourDataList.get(0).getTotalHourFlow());
+                groupVO.setAreaList(areaList);
+                resultList.add(groupVO);
+            } else {
+                List<AreaFlowVO> areaList = Lists.newArrayList();
+                areaInfoMap.forEach((id, basePosition) -> {
+                    areaList.add(new AreaFlowVO(id, basePosition.getName(), 0));
+                });
+
+                // 按区域id升序排序
+                if (CollUtil.isNotEmpty(areaList)){
+                    areaList.sort(Comparator.comparing(AreaFlowVO::getAreaId));
+                }
+
+                // 缺失的时间点，补充空数据
+                StationHourlyThroughputGroupResVO emptyVO = new StationHourlyThroughputGroupResVO();
+                emptyVO.setHourOfDay(hourTime);
+                emptyVO.setHour(hourOnly);
+                emptyVO.setTotalHourFlow(0);
+                emptyVO.setAreaList(areaList);
+                resultList.add(emptyVO);
+            }
+        }
+        
+        log.info("补齐后返回的总时间点数: {}", resultList.size());
+        return resultList;
+    }
+    
+    /**
+     * 生成近24个具体时间点（从当前时间向前推24小时）
+     * 格式：yyyy-MM-dd HH:00
+     */
+    private List<String> generateLast24Hours() {
+        List<String> hours = new ArrayList<>();
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        
+        // 从当前小时向前推23小时，共24个时间点
+        for (int i = 23; i >= 0; i--) {
+            Calendar cal = (Calendar) calendar.clone();
+            cal.add(Calendar.HOUR_OF_DAY, -i);
+            
+            String hourTime = String.format("%04d-%02d-%02d %02d:00",
+                    cal.get(Calendar.YEAR),
+                    cal.get(Calendar.MONTH) + 1,
+                    cal.get(Calendar.DAY_OF_MONTH),
+                    cal.get(Calendar.HOUR_OF_DAY));
+            hours.add(hourTime);
+        }
+        
+        return hours;
+    }
+    
+    /**
+     * 从完整日期时间中提取小时和分钟部分
+     * 例如：2026-05-21 00:00 → 0:00
+     *      2026-05-21 01:00 → 01:00
+     *      2026-05-21 11:00 → 11:00
+     * 
+     * @param hourTime 完整日期时间字符串（格式：yyyy-MM-dd HH:00）
+     * @return 小时和分钟字符串（格式：H:00 或 HH:00）
+     */
+    private String extractHourAndMinute(String hourTime) {
+        if (hourTime == null || hourTime.trim().isEmpty()) {
+            return "";
+        }
+        
+        // 按空格分割，取时间部分
+        String[] parts = hourTime.split(" ");
+        if (parts.length < 2) {
+            return hourTime;
+        }
+        
+        String timePart = parts[1]; // 获取 "00:00" 部分
+        
+        // 去掉小时的前导0（如果有的话）
+        String[] timeComponents = timePart.split(":");
+        if (timeComponents.length >= 2) {
+            int hour = Integer.parseInt(timeComponents[0]);
+            String minute = timeComponents[1];
+            return hour + ":" + minute;
+        }
+        
+        return timePart;
     }
 }

airport-ledger/src/main/resources/mapper/ledger/LedgerSeizureStatsMapper.xml

@@ -152,10 +152,10 @@
         </where>
         GROUP BY
             <choose>
-                <when test="groupId != null">inspector_id</when>
-                <when test="teamId != null">group_id</when>
-                <when test="deptId != null">team_id</when>
-                <otherwise>dept_id</otherwise>
+                <when test="groupId != null">inspector_id, inspector_name</when>
+                <when test="teamId != null">group_id, group_name</when>
+                <when test="deptId != null">team_id, team_name</when>
+                <otherwise>dept_id, dept_name</otherwise>
             </choose>
         ORDER BY seizeNum DESC
     </select>
@@ -169,17 +169,17 @@
         </where>
     </select>
 
-    <select id="countSeizeSubjectCategoryQuantity" parameterType="com.sundot.airport.ledger.domain.vo.CountQueryReqVO" resultType="com.sundot.airport.ledger.domain.vo.SeizeCategoryQuantityVO">
-        SELECT item_category AS categoryName, IFNULL(SUM(item_quantity), 0) AS categoryNum
+    <select id="countSeizeSubjectItemQuantity" parameterType="com.sundot.airport.ledger.domain.vo.CountQueryReqVO" resultType="com.sundot.airport.ledger.domain.vo.SeizeCategoryQuantityVO">
+        SELECT item_name AS itemName, IFNULL(SUM(item_quantity), 0) AS itemNum
         FROM ledger_seizure_stats
         <where>
             <include refid="FILTER_FIXED_CRITERIA_SQL"/>
             <!-- 过滤空类别，避免脏数据 -->
-            AND item_category IS NOT NULL
-            AND item_category != ''
+            AND item_name IS NOT NULL
+            AND item_name != ''
         </where>
-        GROUP BY item_category
-        ORDER BY categoryNum DESC
+        GROUP BY item_name
+        ORDER BY itemNum DESC
     </select>
 
     <select id="countSeizeAreaQuantity" parameterType="com.sundot.airport.ledger.domain.vo.CountQueryReqVO" resultType="com.sundot.airport.ledger.domain.vo.SeizureAreaVO">
@@ -196,7 +196,9 @@
 
     <sql id="FILTER_FIXED_CRITERIA_SQL">
         del_flag = '0'
-        AND record_date BETWEEN #{startDate} AND #{endDate}
+        <if test="startDate != null and endDate != null">
+            AND record_date BETWEEN #{startDate,jdbcType=DATE} AND #{endDate,jdbcType=DATE}
+        </if>
         <include refid="FILTER_CRITERIA_SQL"/>
     </sql>
 

airport-ledger/src/main/resources/mapper/ledger/LedgerUnsafeEventMapper.xml

@@ -94,7 +94,9 @@
     
     <sql id="FILTER_CRITERIA_SQL">
         del_flag = '0'
-        AND record_date BETWEEN #{startDate} AND #{endDate}
+        <if test="startDate != null and endDate != null">
+            AND record_date BETWEEN #{startDate,jdbcType=DATE} AND #{endDate,jdbcType=DATE}
+        </if>
         <!-- 三级联动筛选 -->
         <if test="deptId != null">AND dept_id = #{deptId}</if>
         <if test="teamId != null">AND team_id = #{teamId}</if>

airport-ledger/src/main/resources/mapper/ledger/OperationLanePeakThroughputMapper.xml

@@ -54,15 +54,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             record_date AS recordDate,
             <!-- 动态分组名称：小组>班组>部门 -->
             <choose>
-                <when test="groupId != null">
-                    group_name AS groupName
-                </when>
-                <when test="teamId != null">
-                    team_name AS groupName
-                </when>
-                <when test="deptId != null">
-                    dept_name AS groupName
-                </when>
+                <when test="groupId != null">group_name AS groupName</when>
+                <when test="teamId != null">team_name AS groupName</when>
+                <when test="deptId != null">dept_name AS groupName</when>
             </choose>,
             SUM(throughput) AS totalThroughput,
             COUNT(*) AS totalRecord,
@@ -75,27 +69,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND record_date >= DATE_SUB(CURDATE(), INTERVAL 29 DAY)
             AND record_date &lt;= CURDATE()
             <!-- 三级联动动态筛选 -->
-            <if test="deptId != null">
-                AND dept_id = #{deptId}
-            </if>
-            <if test="teamId != null">
-                AND team_id = #{teamId}
-            </if>
-            <if test="groupId != null">
-                AND group_id = #{groupId}
-            </if>
+            <if test="deptId != null">AND dept_id = #{deptId}</if>
+            <if test="teamId != null">AND team_id = #{teamId}</if>
+            <if test="groupId != null">AND group_id = #{groupId}</if>
             <!-- 动态分组：按选中层级+日期分组 -->
         GROUP BY
             <choose>
-                <when test="groupId != null">
-                    group_id, record_date
-                </when>
-                <when test="teamId != null">
-                    team_id, record_date
-                </when>
-                <when test="deptId != null">
-                    dept_id, record_date
-                </when>
+                <when test="groupId != null">group_id, record_date, group_name</when>
+                <when test="teamId != null">team_id, record_date, team_name</when>
+                <when test="deptId != null">dept_id, record_date, dept_name</when>
             </choose>
         <!-- 按日期升序，大屏展示顺序 -->
         ORDER BY record_date ASC

airport-ledger/src/main/resources/mapper/ledger/OperationStationHourlyThroughputMapper.xml

@@ -53,25 +53,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="countStationHourlyThroughput" resultType="com.sundot.airport.ledger.domain.vo.StationHourlyThroughputVO">
         SELECT
-            t.hour_of_day AS hourOfDay,
+            DATE_FORMAT(STR_TO_DATE(CONCAT(t.record_date, ' ', t.hour_of_day), '%Y-%m-%d %H:%i'), '%Y-%m-%d %H:00') AS hourOfDay,
             t.area_id AS areaId,
             IFNULL(SUM(t.throughput), 0) AS areaFlow,
-            t.total_hour_flow AS totalHourFlow
+            IFNULL(total_flow.total_hour_flow, 0) AS totalHourFlow
         FROM (
             SELECT
+                record_date,
                 hour_of_day,
                 area_id,
-                throughput,
-                SUM(throughput) OVER (PARTITION BY hour_of_day) AS total_hour_flow
+                throughput
             FROM operation_station_hourly_throughput
             WHERE
                 del_flag = '0'
                 AND hour_of_day IS NOT NULL
                 AND hour_of_day != ''
-            -- 近24小时自动匹配
-            AND STR_TO_DATE(CONCAT(record_date, hour_of_day), '%Y%m%d%H') >= DATE_SUB(NOW(), INTERVAL 24 HOUR)
+                -- 近24小时自动匹配
+                AND STR_TO_DATE(CONCAT(record_date, ' ', hour_of_day), '%Y-%m-%d %H:%i') >= DATE_SUB(NOW(), INTERVAL 24 HOUR)
         ) t
-        GROUP BY t.hour_of_day, t.area_id
-        ORDER BY t.hour_of_day ASC
+        LEFT JOIN (
+            SELECT
+                DATE_FORMAT(STR_TO_DATE(CONCAT(record_date, ' ', hour_of_day), '%Y-%m-%d %H:%i'), '%Y-%m-%d %H:00') AS hour_time,
+                SUM(throughput) AS total_hour_flow
+            FROM operation_station_hourly_throughput
+            WHERE
+                del_flag = '0'
+                AND hour_of_day IS NOT NULL
+                AND hour_of_day != ''
+                -- 近24小时自动匹配
+                AND STR_TO_DATE(CONCAT(record_date, ' ', hour_of_day), '%Y-%m-%d %H:%i') >= DATE_SUB(NOW(), INTERVAL 24 HOUR)
+            GROUP BY hour_time
+        ) total_flow ON DATE_FORMAT(STR_TO_DATE(CONCAT(t.record_date, ' ', t.hour_of_day), '%Y-%m-%d %H:%i'), '%Y-%m-%d %H:00') = total_flow.hour_time
+        GROUP BY hourOfDay, t.area_id, total_flow.total_hour_flow
+        ORDER BY hourOfDay ASC
     </select>
 </mapper>

airport-system/src/main/java/com/sundot/airport/system/mapper/BasePositionMapper.java

@@ -79,7 +79,7 @@ public interface BasePositionMapper {
      * @author PanHu Sun
      * @date 2026/5/20 9:36
      */
-    List<BasePosition> selectPositionListByIds(Set<Long> ids);
+    List<BasePosition> selectPositionListByIds(@Param("ids") Set<Long> ids);
 
     /**
      * 修改子元素关系

sql/station_hourly_throughput.sql

@@ -11,8 +11,8 @@ CREATE TABLE `operation_station_hourly_throughput` (
   `group_id` bigint(20) DEFAULT NULL COMMENT '通道/小组ID',
   `group_name` varchar(100) DEFAULT NULL COMMENT '通道/小组',
   `lane_id` varchar(50) DEFAULT NULL COMMENT '通道号',
-  `record_date` varchar(8) DEFAULT NULL COMMENT '记录日期（YYYYMMDD）',
-  `hour_of_day` varchar(20) DEFAULT NULL COMMENT '小时（0:00~1:00、1:00~2:00、23:00~24:00等）',
+  `record_date` varchar(8) DEFAULT NULL COMMENT '记录日期（yyyy-MM-ddYYYYMMDD）',
+  `hour_of_day` varchar(20) DEFAULT NULL COMMENT '小时（0:00、1:00、2:00等）',
   `throughput` int(11) DEFAULT NULL COMMENT '过检人数',
   `throughput_rate` decimal(10,2) DEFAULT NULL COMMENT '过检率',
   `remark` varchar(500) DEFAULT NULL COMMENT '备注',