Merge remote-tracking branch 'origin/feature/dev' into feature/dev

airport-admin/src/main/java/com/sundot/airport/web/controller/blocked/BlockedDashboardController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -388,6 +389,33 @@ public class BlockedDashboardController extends BaseController {
         return success(resultList);
     }
 
+    /**
+     * 查询旅检万分查堵率平均值
+     * 数据源：每日过检行李查堵数据收集表-旅检万分查堵率-平均值
+     * 
+     * @param queryDTO 查询参数（开始时间、结束时间、大队ID）
+     * @return 旅检万分查堵率平均值
+     */
+    @ApiOperation("旅检万分查堵率平均值")
+    @GetMapping("/travelInspectionBlockRate")
+    public AjaxResult getTravelInspectionBlockRate(BlockedDashboardQueryDTO queryDTO) {
+        BigDecimal result = blockedDashboardService.getTravelInspectionBlockRate(queryDTO);
+        return success(result);
+    }
+
+    /**
+     * 查询行检万分查堵率平均值
+     * 数据源：每日过检行李查堵数据收集表-行检万分查堵率-平均值
+     * 
+     * @param queryDTO 查询参数（开始时间、结束时间、大队ID）
+     * @return 行检万分查堵率平均值
+     */
+    @ApiOperation("行检万分查堵率平均值")
+    @GetMapping("/walkInspectionBlockRate")
+    public AjaxResult getWalkInspectionBlockRate(BlockedDashboardQueryDTO queryDTO) {
+        BigDecimal result = blockedDashboardService.getWalkInspectionBlockRate(queryDTO);
+        return success(result);
+    }
 
 
   

airport-blocked/src/main/java/com/sundot/airport/blocked/domain/BlockedLuggageStatisticsDaily.java

@@ -148,6 +148,16 @@ public class BlockedLuggageStatisticsDaily extends BaseEntity {
     @Excel(name = "T2行检万分率")
     private BigDecimal t2WalkBlockRate;
 
+    /** 旅检万分查堵率（(T1旅检查堵件数+T2旅检查堵件数)/(T1旅检过检行李数+T2旅检过检行李数)*10000） */
+    @ApiModelProperty("旅检万分查堵率")
+    @Excel(name = "旅检万分查堵率")
+    private BigDecimal travelInspectionBlockRate;
+
+    /** 行检万分查堵率（(T1行检查堵件数+T2行检查堵件数)/(T1行检过检行李数+T2行检过检行李数)*10000） */
+    @ApiModelProperty("行检万分查堵率")
+    @Excel(name = "行检万分查堵率")
+    private BigDecimal walkInspectionBlockRate;
+
     /** 查堵合计件数万分率（查堵合计件数/过检行李合计*10000） */
     @ApiModelProperty("查堵合计万分率")
     @Excel(name = "查堵合计万分率")
@@ -405,6 +415,22 @@ public class BlockedLuggageStatisticsDaily extends BaseEntity {
         return t2WalkBlockRate;
     }
 
+    public void setTravelInspectionBlockRate(BigDecimal travelInspectionBlockRate) {
+        this.travelInspectionBlockRate = travelInspectionBlockRate;
+    }
+
+    public BigDecimal getTravelInspectionBlockRate() {
+        return travelInspectionBlockRate;
+    }
+
+    public void setWalkInspectionBlockRate(BigDecimal walkInspectionBlockRate) {
+        this.walkInspectionBlockRate = walkInspectionBlockRate;
+    }
+
+    public BigDecimal getWalkInspectionBlockRate() {
+        return walkInspectionBlockRate;
+    }
+
     public void setTotalBlockRate(BigDecimal totalBlockRate) {
         this.totalBlockRate = totalBlockRate;
     }
@@ -514,6 +540,8 @@ public class BlockedLuggageStatisticsDaily extends BaseEntity {
                 .append("t2TravelBlockRate", getT2TravelBlockRate())
                 .append("t1WalkBlockRate", getT1WalkBlockRate())
                 .append("t2WalkBlockRate", getT2WalkBlockRate())
+                .append("travelInspectionBlockRate", getTravelInspectionBlockRate())
+                .append("walkInspectionBlockRate", getWalkInspectionBlockRate())
                 .append("totalBlockRate", getTotalBlockRate())
                 .append("dailyBlockRate", getDailyBlockRate())
                 .append("totalLuggageCount", getTotalLuggageCount())

airport-blocked/src/main/java/com/sundot/airport/blocked/mapper/BlockedDashboardMapper.java

@@ -375,4 +375,20 @@ public interface BlockedDashboardMapper {
      * @return 开机年限分布统计列表
      */
     List<BlockedOperatingYearsDistributionDTO> selectOperatingYearsDistribution(BlockedDashboardQueryDTO queryDTO);
+
+    /**
+     * 查询旅检万分查堵率平均值
+     * 
+     * @param queryDTO 查询参数
+     * @return 旅检万分查堵率平均值
+     */
+    java.math.BigDecimal selectTravelInspectionBlockRate(BlockedDashboardQueryDTO queryDTO);
+
+    /**
+     * 查询行检万分查堵率平均值
+     * 
+     * @param queryDTO 查询参数
+     * @return 行检万分查堵率平均值
+     */
+    java.math.BigDecimal selectWalkInspectionBlockRate(BlockedDashboardQueryDTO queryDTO);
 }

airport-blocked/src/main/java/com/sundot/airport/blocked/service/IBlockedDashboardService.java

@@ -2,6 +2,7 @@ package com.sundot.airport.blocked.service;
 
 import com.sundot.airport.blocked.dto.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -362,4 +363,21 @@ public interface IBlockedDashboardService {
      * @return 开机年限分布统计列表
      */
     List<BlockedOperatingYearsDistributionDTO> getOperatingYearsDistribution(BlockedDashboardQueryDTO queryDTO);
+
+    /**
+     * 查询旅检万分查堵率平均值
+     * 
+     * @param queryDTO 查询参数
+     * @return 旅检万分查堵率平均值
+     */
+    BigDecimal getTravelInspectionBlockRate(BlockedDashboardQueryDTO queryDTO);
+
+    /**
+     * 查询行检万分查堵率平均值
+     * 
+     * @param queryDTO 查询参数
+     * @return 行检万分查堵率平均值
+     */
+    BigDecimal getWalkInspectionBlockRate(BlockedDashboardQueryDTO queryDTO);
 }
+

airport-blocked/src/main/java/com/sundot/airport/blocked/service/impl/BlockedDashboardServiceImpl.java

@@ -1057,4 +1057,36 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
 
         return result;
     }
+
+    /**
+     * 查询旅检万分查堵率平均值
+     * 
+     * @param queryDTO 查询参数
+     * @return 旅检万分查堵率平均值
+     */
+    @Override
+    public BigDecimal getTravelInspectionBlockRate(BlockedDashboardQueryDTO queryDTO) {
+        BigDecimal travelRate = blockedDashboardMapper.selectTravelInspectionBlockRate(queryDTO);
+        // 保留两位小数
+        if (travelRate != null) {
+            return travelRate.setScale(2, java.math.RoundingMode.HALF_UP);
+        }
+        return BigDecimal.ZERO;
+    }
+
+    /**
+     * 查询行检万分查堵率平均值
+     * 
+     * @param queryDTO 查询参数
+     * @return 行检万分查堵率平均值
+     */
+    @Override
+    public BigDecimal getWalkInspectionBlockRate(BlockedDashboardQueryDTO queryDTO) {
+        BigDecimal walkRate = blockedDashboardMapper.selectWalkInspectionBlockRate(queryDTO);
+        // 保留两位小数
+        if (walkRate != null) {
+            return walkRate.setScale(2, java.math.RoundingMode.HALF_UP);
+        }
+        return BigDecimal.ZERO;
+    }
 }

airport-blocked/src/main/java/com/sundot/airport/blocked/service/impl/BlockedLuggageStatisticsDailyServiceImpl.java

@@ -220,6 +220,21 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
         data.setT2TravelBlockRate(calculateBlockRate(data.getT2TravelBlockedCount(), data.getT2TravelLuggageCount()));
         data.setT1WalkBlockRate(calculateBlockRate(data.getT1WalkBlockedCount(), data.getT1WalkLuggageCount()));
         data.setT2WalkBlockRate(calculateBlockRate(data.getT2WalkBlockedCount(), data.getT2WalkLuggageCount()));
+        
+        // 计算旅检万分查堵率：(T1旅检查堵件数+T2旅检查堵件数)/(T1旅检过检行李数+T2旅检过检行李数)*10000
+        Integer travelBlockedCount = (data.getT1TravelBlockedCount() != null ? data.getT1TravelBlockedCount() : 0)
+                + (data.getT2TravelBlockedCount() != null ? data.getT2TravelBlockedCount() : 0);
+        Integer travelLuggageCount = (data.getT1TravelLuggageCount() != null ? data.getT1TravelLuggageCount() : 0)
+                + (data.getT2TravelLuggageCount() != null ? data.getT2TravelLuggageCount() : 0);
+        data.setTravelInspectionBlockRate(calculateBlockRate(travelBlockedCount, travelLuggageCount));
+        
+        // 计算行检万分查堵率：(T1行检查堵件数+T2行检查堵件数)/(T1行检过检行李数+T2行检过检行李数)*10000
+        Integer walkBlockedCount = (data.getT1WalkBlockedCount() != null ? data.getT1WalkBlockedCount() : 0)
+                + (data.getT2WalkBlockedCount() != null ? data.getT2WalkBlockedCount() : 0);
+        Integer walkLuggageCount = (data.getT1WalkLuggageCount() != null ? data.getT1WalkLuggageCount() : 0)
+                + (data.getT2WalkLuggageCount() != null ? data.getT2WalkLuggageCount() : 0);
+        data.setWalkInspectionBlockRate(calculateBlockRate(walkBlockedCount, walkLuggageCount));
+        
         data.setTotalBlockRate(calculateBlockRate(totalBlocked, totalLuggage));
         data.setDailyBlockRate(calculateBlockRate(totalBlocked, totalLuggage));
 

airport-blocked/src/main/resources/mapper/blocked/BlockedDashboardMapper.xml

@@ -1012,4 +1012,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY count DESC
     </select>
 
+    <!-- 查询旅检万分查堵率平均值 -->
+    <select id="selectTravelInspectionBlockRate" resultType="java.math.BigDecimal">
+        SELECT COALESCE(AVG(travel_inspection_block_rate), 0) as travelInspectionBlockRate
+        FROM blocked_luggage_statistics_daily
+        WHERE del_flag = '0'
+        <if test="startTime != null and endTime != null">
+            AND stat_date &gt;= #{startTime}
+            AND stat_date &lt;= #{endTime}
+        </if>
+        <if test="brigadeId != null">
+            AND brigade_id = #{brigadeId}
+        </if>
+    </select>
+
+    <!-- 查询行检万分查堵率平均值 -->
+    <select id="selectWalkInspectionBlockRate" resultType="java.math.BigDecimal">
+        SELECT COALESCE(AVG(walk_inspection_block_rate), 0) as walkInspectionBlockRate
+        FROM blocked_luggage_statistics_daily
+        WHERE del_flag = '0'
+        <if test="startTime != null and endTime != null">
+            AND stat_date &gt;= #{startTime}
+            AND stat_date &lt;= #{endTime}
+        </if>
+        <if test="brigadeId != null">
+            AND brigade_id = #{brigadeId}
+        </if>
+    </select>
+
 </mapper>

airport-blocked/src/main/resources/mapper/blocked/BlockedLuggageStatisticsDailyMapper.xml

@@ -31,6 +31,8 @@
         <result property="t2TravelBlockRate" column="t2_travel_block_rate"/>
         <result property="t1WalkBlockRate" column="t1_walk_block_rate"/>
         <result property="t2WalkBlockRate" column="t2_walk_block_rate"/>
+        <result property="travelInspectionBlockRate" column="travel_inspection_block_rate"/>
+        <result property="walkInspectionBlockRate" column="walk_inspection_block_rate"/>
         <result property="totalBlockRate" column="total_block_rate"/>
         <result property="dailyBlockRate" column="daily_block_rate"/>
         <result property="totalLuggageCount" column="total_luggage_count"/>
@@ -75,6 +77,8 @@
                t2_travel_block_rate,
                t1_walk_block_rate,
                t2_walk_block_rate,
+               travel_inspection_block_rate,
+               walk_inspection_block_rate,
                total_block_rate,
                daily_block_rate,
                total_luggage_count,
@@ -143,6 +147,8 @@
             <if test="t2TravelBlockRate != null">t2_travel_block_rate,</if>
             <if test="t1WalkBlockRate != null">t1_walk_block_rate,</if>
             <if test="t2WalkBlockRate != null">t2_walk_block_rate,</if>
+            <if test="travelInspectionBlockRate != null">travel_inspection_block_rate,</if>
+            <if test="walkInspectionBlockRate != null">walk_inspection_block_rate,</if>
             <if test="totalBlockRate != null">total_block_rate,</if>
             <if test="dailyBlockRate != null">daily_block_rate,</if>
             <if test="totalLuggageCount != null">total_luggage_count,</if>
@@ -185,6 +191,8 @@
             <if test="t2TravelBlockRate != null">#{t2TravelBlockRate},</if>
             <if test="t1WalkBlockRate != null">#{t1WalkBlockRate},</if>
             <if test="t2WalkBlockRate != null">#{t2WalkBlockRate},</if>
+            <if test="travelInspectionBlockRate != null">#{travelInspectionBlockRate},</if>
+            <if test="walkInspectionBlockRate != null">#{walkInspectionBlockRate},</if>
             <if test="totalBlockRate != null">#{totalBlockRate},</if>
             <if test="dailyBlockRate != null">#{dailyBlockRate},</if>
             <if test="totalLuggageCount != null">#{totalLuggageCount},</if>
@@ -231,6 +239,8 @@
             <if test="t2TravelBlockRate != null">t2_travel_block_rate = #{t2TravelBlockRate},</if>
             <if test="t1WalkBlockRate != null">t1_walk_block_rate = #{t1WalkBlockRate},</if>
             <if test="t2WalkBlockRate != null">t2_walk_block_rate = #{t2WalkBlockRate},</if>
+            <if test="travelInspectionBlockRate != null">travel_inspection_block_rate = #{travelInspectionBlockRate},</if>
+            <if test="walkInspectionBlockRate != null">walk_inspection_block_rate = #{walkInspectionBlockRate},</if>
             <if test="totalBlockRate != null">total_block_rate = #{totalBlockRate},</if>
             <if test="dailyBlockRate != null">daily_block_rate = #{dailyBlockRate},</if>
             <if test="totalLuggageCount != null">total_luggage_count = #{totalLuggageCount},</if>