Merge remote-tracking branch 'origin/master'

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

@@ -13,7 +13,9 @@ import com.sundot.airport.ledger.domain.LedgerSeizureStats;
 import com.sundot.airport.ledger.domain.vo.CountQueryReqVO;
 import com.sundot.airport.ledger.domain.vo.CountSeizureSingleQuantityResVO;
 import com.sundot.airport.ledger.domain.vo.CountSeizureTotalQuantityResVO;
+import com.sundot.airport.ledger.domain.vo.SeizeCategoryQuantityVO;
 import com.sundot.airport.ledger.domain.vo.SeizeTotalAndItemVO;
+import com.sundot.airport.ledger.domain.vo.SeizureAreaVO;
 import com.sundot.airport.ledger.service.ILedgerSeizureStatsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -96,4 +98,34 @@ public class LedgerSeizureStatsController extends BaseController {
         SeizeTotalAndItemVO seizeTotalAndItem = service.getTimeRangeStats(countQueryReq);
         return AjaxResult.success(seizeTotalAndItem);
     }
+
+    /**
+     * 功能描述：查获物品分布
+     *
+     * @param countQueryReq 查询参数
+     * @return AjaxResult
+     * @method countSeizureInfoItem
+     * @author PanHu Sun
+     * @date 2026/5/20 13:32
+     */
+    @PostMapping("/countSeizeSubjectCategoryQuantity")
+    public AjaxResult countSeizeSubjectCategoryQuantity(@RequestBody CountQueryReqVO countQueryReq) {
+        List<SeizeCategoryQuantityVO> seizeCategoryQuantityList = service.countSeizeSubjectCategoryQuantity(countQueryReq);
+        return AjaxResult.success(seizeCategoryQuantityList);
+    }
+
+    /**
+     * 功能描述：查获工作区域分布
+     *
+     * @param countQueryReq 查询参数
+     * @return AjaxResult
+     * @method countSeizureInfoItem
+     * @author PanHu Sun
+     * @date 2026/5/20 13:32
+     */
+    @PostMapping("/countSeizeAreaQuantity")
+    public AjaxResult countSeizeAreaQuantity(@RequestBody CountQueryReqVO countQueryReq) {
+        List<SeizureAreaVO> seizureAreaList = service.countSeizeAreaQuantity(countQueryReq);
+        return AjaxResult.success(seizureAreaList);
+    }
 }

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

@@ -0,0 +1,23 @@
+package com.sundot.airport.ledger.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 功能描述：查获物品分布 Res Entity
+ *
+ * @author PanHu Sun
+ * @date 2026/5/20 14:39
+ */
+@Data
+public class SeizeCategoryQuantityVO implements Serializable {
+    /**
+     * 违规品类别名称（饼图名称）
+     */
+    private String itemName;
+    /**
+     * 该类别总查获数量（饼图数值）
+     */
+    private Integer itemNum;
+}

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

@@ -0,0 +1,27 @@
+package com.sundot.airport.ledger.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 功能描述：查获巩固走区域分布Res Entity
+ *
+ * @author PanHu Sun
+ * @date 2026/5/20 15:08
+ */
+@Data
+public class SeizureAreaVO implements Serializable {
+    /**
+     * 工作区域id（X轴）
+     */
+    private String areaId;
+    /**
+     * 工作区域名称（X轴）
+     */
+    private String workArea;
+    /**
+     * 该区域查获数量（Y轴）
+     */
+    private Integer areaSeizeNum;
+}

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

@@ -1,12 +1,15 @@
 package com.sundot.airport.ledger.mapper;
 
 import java.util.List;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sundot.airport.ledger.domain.LedgerSeizureStats;
 import com.sundot.airport.ledger.domain.vo.CountQueryReqVO;
 import com.sundot.airport.ledger.domain.vo.CountSeizureSingleQuantityResVO;
 import com.sundot.airport.ledger.domain.vo.CountSeizureTotalQuantityResVO;
 import com.sundot.airport.ledger.domain.vo.SeizeItemVO;
+import com.sundot.airport.ledger.domain.vo.SeizeCategoryQuantityVO;
+import com.sundot.airport.ledger.domain.vo.SeizureAreaVO;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -16,8 +19,8 @@ public interface LedgerSeizureStatsMapper extends BaseMapper<LedgerSeizureStats>
     List<LedgerSeizureStats> selectList(LedgerSeizureStats query);
 
     int countByInspectorAndDateRange(@Param("inspectorName") String inspectorName,
-                                     @Param("beginTime")     String beginTime,
-                                     @Param("endTime")       String endTime);
+                                     @Param("beginTime") String beginTime,
+                                     @Param("endTime") String endTime);
 
     /**
      * 功能描述：近30天查获数量（总表）
@@ -62,4 +65,26 @@ public interface LedgerSeizureStatsMapper extends BaseMapper<LedgerSeizureStats>
      * @date 2026/5/20 13:39
      */
     Integer statsTimeRangeTotal(CountQueryReqVO query);
+
+    /**
+     * 功能描述：查询时间范围内各违规品类别查获数量
+     *
+     * @param query 查询参数
+     * @return List<SeizeCategoryQuantityVO>
+     * @method countSeizeSubjectCategoryQuantity
+     * @author PanHu Sun
+     * @date 2026/5/20 14:40
+     */
+    List<SeizeCategoryQuantityVO> countSeizeSubjectCategoryQuantity(CountQueryReqVO query);
+
+    /**
+     * 功能描述：查获工作区域分布
+     *
+     * @param query 查询参数
+     * @return List<SeizureAreaVO>
+     * @method countSeizeAreaQuantity
+     * @author PanHu Sun
+     * @date 2026/5/20 15:10
+     */
+    List<SeizureAreaVO> countSeizeAreaQuantity(CountQueryReqVO query);
 }

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

@@ -6,7 +6,9 @@ import com.sundot.airport.ledger.domain.LedgerSeizureStats;
 import com.sundot.airport.ledger.domain.vo.CountQueryReqVO;
 import com.sundot.airport.ledger.domain.vo.CountSeizureSingleQuantityResVO;
 import com.sundot.airport.ledger.domain.vo.CountSeizureTotalQuantityResVO;
+import com.sundot.airport.ledger.domain.vo.SeizeCategoryQuantityVO;
 import com.sundot.airport.ledger.domain.vo.SeizeTotalAndItemVO;
+import com.sundot.airport.ledger.domain.vo.SeizureAreaVO;
 
 public interface ILedgerSeizureStatsService extends IService<LedgerSeizureStats> {
     List<LedgerSeizureStats> selectList(LedgerSeizureStats query);
@@ -44,4 +46,26 @@ public interface ILedgerSeizureStatsService extends IService<LedgerSeizureStats>
      * @date 2026/5/20 13:43
      */
     SeizeTotalAndItemVO getTimeRangeStats(CountQueryReqVO countQueryReq);
+
+    /**
+     * 功能描述：查获物品分布
+     *
+     * @param countQueryReq 查询参数
+     * @return List<SeizeCategoryQuantityVO>
+     * @method countSeizeSubjectCategoryQuantity
+     * @author PanHu Sun
+     * @date 2026/5/20 14:46
+     */
+    List<SeizeCategoryQuantityVO> countSeizeSubjectCategoryQuantity(CountQueryReqVO countQueryReq);
+
+    /**
+     * 功能描述：查获工作区域分布
+     *
+     * @param countQueryReq 查询参数
+     * @return List<SeizureAreaVO>
+     * @method countSeizeAreaQuantity
+     * @author PanHu Sun
+     * @date 2026/5/20 15:12
+     */
+    List<SeizureAreaVO> countSeizeAreaQuantity(CountQueryReqVO countQueryReq);
 }

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

@@ -1,5 +1,6 @@
 package com.sundot.airport.ledger.service.impl;
 
+import java.util.Collections;
 import java.util.List;
 
 import cn.hutool.core.collection.CollUtil;
@@ -9,8 +10,10 @@ import com.sundot.airport.ledger.domain.LedgerSeizureStats;
 import com.sundot.airport.ledger.domain.vo.CountQueryReqVO;
 import com.sundot.airport.ledger.domain.vo.CountSeizureSingleQuantityResVO;
 import com.sundot.airport.ledger.domain.vo.CountSeizureTotalQuantityResVO;
+import com.sundot.airport.ledger.domain.vo.SeizeCategoryQuantityVO;
 import com.sundot.airport.ledger.domain.vo.SeizeItemVO;
 import com.sundot.airport.ledger.domain.vo.SeizeTotalAndItemVO;
+import com.sundot.airport.ledger.domain.vo.SeizureAreaVO;
 import com.sundot.airport.ledger.mapper.LedgerSeizureStatsMapper;
 import com.sundot.airport.ledger.service.ILedgerSeizureStatsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,4 +92,36 @@ public class LedgerSeizureStatsServiceImpl extends ServiceImpl<LedgerSeizureStat
         result.setItemList(itemList);
         return result;
     }
+
+    /**
+     * 功能描述：查获物品分布
+     *
+     * @param countQueryReq 查询参数
+     * @return List<SeizeCategoryQuantityVO>
+     * @method countSeizeSubjectCategoryQuantity
+     * @author PanHu Sun
+     * @date 2026/5/20 14:46
+     */
+    @Override
+    public List<SeizeCategoryQuantityVO> countSeizeSubjectCategoryQuantity(CountQueryReqVO countQueryReq) {
+        // 无数据自动返回空数组，符合需求
+        List<SeizeCategoryQuantityVO> seizeCategoryQuantityList = this.baseMapper.countSeizeSubjectCategoryQuantity(countQueryReq);
+        return CollUtil.emptyIfNull(seizeCategoryQuantityList);
+    }
+
+    /**
+     * 功能描述：查获工作区域分布
+     *
+     * @param countQueryReq 查询参数
+     * @return List<SeizureAreaVO>
+     * @method countSeizeAreaQuantity
+     * @author PanHu Sun
+     * @date 2026/5/20 15:12
+     */
+    @Override
+    public List<SeizureAreaVO> countSeizeAreaQuantity(CountQueryReqVO countQueryReq) {
+        // 无数据自动返回空数组，符合需求
+        List<SeizureAreaVO> seizureAreaList = this.baseMapper.countSeizeAreaQuantity(countQueryReq);
+        return CollUtil.emptyIfNull(seizureAreaList);
+    }
 }

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

@@ -176,7 +176,7 @@
     </select>
 
     <!-- 总查获数查询 -->
-    <select id="statsTimeRangeTotal" parameterType="com.sundot.airport.ledger.domain.vo.CountQueryReqVO">
+    <select id="statsTimeRangeTotal" parameterType="com.sundot.airport.ledger.domain.vo.CountQueryReqVO" resultType="java.lang.Integer">
         SELECT IFNULL(SUM(item_quantity), 0)
         FROM ledger_seizure_stats
         WHERE
@@ -187,4 +187,36 @@
             <if test="groupId != null">AND group_id = #{groupId}</if>
     </select>
 
+    <select id="countSeizeSubjectCategoryQuantity" 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
+            del_flag = '0'
+            AND record_date BETWEEN #{startDate} AND #{endDate}
+            <!-- 三级联动筛选 -->
+            <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>
+            <!-- 过滤空类别，避免脏数据 -->
+            AND item_name IS NOT NULL
+            AND item_name != ''
+        GROUP BY item_name
+        ORDER BY categoryNum DESC
+    </select>
+
+    <select id="countSeizeAreaQuantity" parameterType="com.sundot.airport.ledger.domain.vo.CountQueryReqVO" resultType="com.sundot.airport.ledger.domain.vo.SeizureAreaVO">
+        SELECT area_id AS areaId, work_area AS workArea, IFNULL(SUM(item_quantity), 0) AS areaSeizeNum
+        FROM ledger_seizure_stats
+        WHERE
+            del_flag = '0'
+            AND record_date BETWEEN #{startDate} AND #{endDate}
+            <!-- 三级联动筛选 -->
+            <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>
+            <!-- 过滤空区域脏数据 -->
+            AND work_area IS NOT NULL AND work_area != ''
+        GROUP BY area_id, work_area
+        ORDER BY areaSeizeNum DESC
+    </select>
 </mapper>