包裹信息查询接口增加字段‘包裹状态’，并增加判断以及代码优化、增加注释

service-park/service-park-biz/src/main/java/com/usky/park/controller/web/DataStHistoryController.java

@@ -1,16 +1,13 @@
 package com.usky.park.controller.web;
 
 
-import com.alibaba.fastjson.JSONObject;
+import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.park.domain.DataStHistory;
 import com.usky.park.service.DataStHistoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * <p>
  * 无人驿站历史数据 前端控制器
@@ -31,6 +28,7 @@ public class DataStHistoryController {
      * 新增
      *
      * @param dataStHistory
+     * @param appKey
      * @return
      */
     @PostMapping("/add")
@@ -40,15 +38,17 @@ public class DataStHistoryController {
     }
     /**
      * 分页查询
-     *
+     * @param pickupStatus
+     * @param pageNum
+     * @param pageSize
      * @return
      */
-    @PostMapping("/pageQuery")
-    public CommonPage<DataStHistory> pageQuery(@RequestBody String requestBody) {
-        JSONObject params = JSONObject.parseObject(requestBody);
-        Integer pageNum = (Integer) params.getOrDefault("pageNum", 1);
-        Integer pageSize = (Integer) params.getOrDefault("pageSize", 10);
-        return dataStHistoryService.pageList(pageNum, pageSize);
+    @GetMapping("/pageQuery")
+    public ApiResult<CommonPage<DataStHistory>> pageQuery(
+            @RequestParam(value = "pickupStatus", required = false, defaultValue = "-1") Integer pickupStatus,//设置默认值为-1，则查询所有包裹（未取件优先展示）
+            @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+            @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(dataStHistoryService.pageList(pickupStatus, pageNum, pageSize));
     }
 }
 

service-park/service-park-biz/src/main/java/com/usky/park/domain/DataStHistory.java

@@ -78,5 +78,10 @@ public class DataStHistory implements Serializable {
      */
     private Integer packStatus;
 
+    /**
+     * 取件状态;0：已取件，1：未取件
+     */
+    private Integer pickupStatus;
+
 
 }

service-park/service-park-biz/src/main/java/com/usky/park/service/DataStHistoryService.java

@@ -14,7 +14,17 @@ import com.usky.park.domain.EventEg;
  * @since 2023-11-29
  */
 public interface DataStHistoryService extends CrudService<DataStHistory> {
+    /**
+     * 新增包裹信息
+     *
+     * @param dataStHistory
+     * @return
+     */
     void add(DataStHistory dataStHistory,String appKey);
-
-    CommonPage<DataStHistory> pageList(Integer pageNum, Integer pageSize);
+    /**
+     * 分页查询包裹信息
+     *
+     * @return
+     */
+    CommonPage<DataStHistory> pageList(Integer pickupStatus, Integer pageNum, Integer pageSize);
 }

service-park/service-park-biz/src/main/java/com/usky/park/service/impl/DataStHistoryServiceImpl.java

@@ -35,6 +35,11 @@ public class DataStHistoryServiceImpl extends AbstractCrudService<DataStHistoryM
     @Autowired
     private DataStHistoryMapper dataStHistoryMapper;
 
+    /**
+     * 包裹信息录入
+     * @param dataStHistory
+     * @param appKey
+     */
     @Override
     public void add(DataStHistory dataStHistory, String appKey) {
 
@@ -56,13 +61,32 @@ public class DataStHistoryServiceImpl extends AbstractCrudService<DataStHistoryM
         baseMapper.insert(dataStHistory);
     }
 
+    /**
+     * 分页查询包裹信息
+     *
+     * @param pickupStatus  包裹状态
+     * @param pageNum   第几页
+     * @param pageSize  页大小
+     */
     @Override
-    public CommonPage<DataStHistory> pageList(Integer pageNum, Integer pageSize){
+    public CommonPage<DataStHistory> pageList(Integer pickupStatus, Integer pageNum, Integer pageSize){
         IPage<DataStHistory> page = new Page<>(pageNum,pageSize);
         LambdaQueryWrapper<DataStHistory> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(DataStHistory::getReceiverPhone,SecurityUtils.getLoginUser().getSysUser().getPhonenumber());
+        if (pickupStatus != null) {
+            if (pickupStatus == 0) {
+                queryWrapper.eq(DataStHistory::getPickupStatus, 0);//代取件
+            } else if (pickupStatus == 1) {
+                queryWrapper.eq(DataStHistory::getPickupStatus, 1);//已取件
+            }
+        }else {
+            queryWrapper.orderByAsc(DataStHistory::getPickupStatus);
+        }
+        //pickupStatus为空就查询所有包裹信息
         page = this.page(page,queryWrapper);
+        if(page.getRecords().isEmpty()) {
+            throw new BusinessException("暂无包裹信息");
+        }
         return new CommonPage<>(page.getRecords(),page.getTotal(),pageNum,pageSize);
-
     }
 }