Browse Source

22.本地自测”查获信息展示“接口;
23.本地自测”查获物品分布“接口;

sunpanhu 3 weeks ago
parent
commit
28a4b91978

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

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

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

@@ -15,9 +15,9 @@ public class SeizeCategoryQuantityVO implements Serializable {
15
     /**
15
     /**
16
      * 违规品类别名称(饼图名称)
16
      * 违规品类别名称(饼图名称)
17
      */
17
      */
18
-    private String categoryName;
18
+    private String itemName;
19
     /**
19
     /**
20
      * 该类别总查获数量(饼图数值)
20
      * 该类别总查获数量(饼图数值)
21
      */
21
      */
22
-    private Integer categoryNum;
22
+    private Integer itemNum;
23
 }
23
 }

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

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

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

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

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

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

+ 13 - 11
airport-ledger/src/main/resources/mapper/ledger/LedgerSeizureStatsMapper.xml

@@ -152,10 +152,10 @@
152
         </where>
152
         </where>
153
         GROUP BY
153
         GROUP BY
154
             <choose>
154
             <choose>
155
-                <when test="groupId != null">inspector_id</when>
156
-                <when test="teamId != null">group_id</when>
157
-                <when test="deptId != null">team_id</when>
158
-                <otherwise>dept_id</otherwise>
155
+                <when test="groupId != null">inspector_id, inspector_name</when>
156
+                <when test="teamId != null">group_id, group_name</when>
157
+                <when test="deptId != null">team_id, team_name</when>
158
+                <otherwise>dept_id, dept_name</otherwise>
159
             </choose>
159
             </choose>
160
         ORDER BY seizeNum DESC
160
         ORDER BY seizeNum DESC
161
     </select>
161
     </select>
@@ -169,17 +169,17 @@
169
         </where>
169
         </where>
170
     </select>
170
     </select>
171
 
171
 
172
-    <select id="countSeizeSubjectCategoryQuantity" parameterType="com.sundot.airport.ledger.domain.vo.CountQueryReqVO" resultType="com.sundot.airport.ledger.domain.vo.SeizeCategoryQuantityVO">
173
-        SELECT item_category AS categoryName, IFNULL(SUM(item_quantity), 0) AS categoryNum
172
+    <select id="countSeizeSubjectItemQuantity" parameterType="com.sundot.airport.ledger.domain.vo.CountQueryReqVO" resultType="com.sundot.airport.ledger.domain.vo.SeizeCategoryQuantityVO">
173
+        SELECT item_name AS itemName, IFNULL(SUM(item_quantity), 0) AS itemNum
174
         FROM ledger_seizure_stats
174
         FROM ledger_seizure_stats
175
         <where>
175
         <where>
176
             <include refid="FILTER_FIXED_CRITERIA_SQL"/>
176
             <include refid="FILTER_FIXED_CRITERIA_SQL"/>
177
             <!-- 过滤空类别,避免脏数据 -->
177
             <!-- 过滤空类别,避免脏数据 -->
178
-            AND item_category IS NOT NULL
179
-            AND item_category != ''
178
+            AND item_name IS NOT NULL
179
+            AND item_name != ''
180
         </where>
180
         </where>
181
-        GROUP BY item_category
182
-        ORDER BY categoryNum DESC
181
+        GROUP BY item_name
182
+        ORDER BY itemNum DESC
183
     </select>
183
     </select>
184
 
184
 
185
     <select id="countSeizeAreaQuantity" parameterType="com.sundot.airport.ledger.domain.vo.CountQueryReqVO" resultType="com.sundot.airport.ledger.domain.vo.SeizureAreaVO">
185
     <select id="countSeizeAreaQuantity" parameterType="com.sundot.airport.ledger.domain.vo.CountQueryReqVO" resultType="com.sundot.airport.ledger.domain.vo.SeizureAreaVO">
@@ -196,7 +196,9 @@
196
 
196
 
197
     <sql id="FILTER_FIXED_CRITERIA_SQL">
197
     <sql id="FILTER_FIXED_CRITERIA_SQL">
198
         del_flag = '0'
198
         del_flag = '0'
199
-        AND record_date BETWEEN #{startDate} AND #{endDate}
199
+        <if test="startDate != null and endDate != null">
200
+            AND record_date BETWEEN #{startDate,jdbcType=DATE} AND #{endDate,jdbcType=DATE}
201
+        </if>
200
         <include refid="FILTER_CRITERIA_SQL"/>
202
         <include refid="FILTER_CRITERIA_SQL"/>
201
     </sql>
203
     </sql>
202
 
204
 

+ 3 - 1
airport-ledger/src/main/resources/mapper/ledger/LedgerUnsafeEventMapper.xml

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