feat(bag): Result重命名+bag查询

src/main/java/com/dlbridge/jadp/common/web/Result.java → src/main/java/com/dlbridge/jadp/common/web/ResultBean.java

@@ -8,43 +8,43 @@ import lombok.Data;
  * 通用接口返回结果
  */
 @Data
-public class Result<T> {
+public class ResultBean<T> {
     private int code;
     private String msg;
     private T content;
     private boolean status;
 
-    public Result() {}
+    public ResultBean() {}
 
     // ✅ 泛型安全的成功结果（无 content）
-    public static <T> Result<T> success() {
-        Result<T> result = new Result<>();
-        result.setCode(ResultStatus.SUCCESS.code);
-        result.setMsg(ResultStatus.SUCCESS.msg);
-        result.setStatus(true);
-        return result;
+    public static <T> ResultBean<T> success() {
+        ResultBean<T> resultBean = new ResultBean<>();
+        resultBean.setCode(ResultStatus.SUCCESS.code);
+        resultBean.setMsg(ResultStatus.SUCCESS.msg);
+        resultBean.setStatus(true);
+        return resultBean;
     }
 
     // ✅ 泛型安全的成功结果（带 content）
-    public static <T> Result<T> success(T content) {
-        Result<T> result = success();
-        result.setContent(content);
-        return result;
+    public static <T> ResultBean<T> success(T content) {
+        ResultBean<T> resultBean = success();
+        resultBean.setContent(content);
+        return resultBean;
     }
 
     // ✅ 泛型安全的失败结果
-    public static <T> Result<T> fail() {
-        Result<T> result = new Result<>();
-        result.setCode(ResultStatus.FAIL.code);
-        result.setMsg(ResultStatus.FAIL.msg);
-        result.setStatus(false);
-        return result;
+    public static <T> ResultBean<T> fail() {
+        ResultBean<T> resultBean = new ResultBean<>();
+        resultBean.setCode(ResultStatus.FAIL.code);
+        resultBean.setMsg(ResultStatus.FAIL.msg);
+        resultBean.setStatus(false);
+        return resultBean;
     }
 
     // ✅ 可自定义失败信息
-    public static <T> Result<T> fail(String msg) {
-        Result<T> result = fail();
-        result.setMsg(msg);
-        return result;
+    public static <T> ResultBean<T> fail(String msg) {
+        ResultBean<T> resultBean = fail();
+        resultBean.setMsg(msg);
+        return resultBean;
     }
 }
\ No newline at end of file

src/main/java/com/dlbridge/jadp/config/web/GlobalExceptionHandler.java

 package com.dlbridge.jadp.config.web;
 
-import com.dlbridge.jadp.common.web.Result;
+import com.dlbridge.jadp.common.web.ResultBean;
+import org.springframework.core.annotation.Order;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 import java.util.Objects;
-
+@Order(1) // 优先级最高
 @RestControllerAdvice
 public class GlobalExceptionHandler {
 
     @ExceptionHandler(MethodArgumentNotValidException.class)
-    public Result<?> handleValidException(MethodArgumentNotValidException e) {
+    public ResultBean<?> handleValidException(MethodArgumentNotValidException e) {
         String msg = Objects.requireNonNull(e.getBindingResult()
                         .getFieldError())
                 .getDefaultMessage();
-        return Result.fail(msg);
+        return ResultBean.fail(msg);
     }
 }

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/BusService.java

 package com.dlbridge.jadp.plugins.cmpt.service;
 
-import com.dlbridge.jadp.common.web.Result;
+import com.dlbridge.jadp.common.web.ResultBean;
 import com.dlbridge.jadp.plugins.cmpt.dao.mapper.BusMapper;
 import com.dlbridge.jadp.plugins.cmpt.dao.model.param.BusParam;
 import com.dlbridge.jadp.plugins.cmpt.dao.model.param.BusTicketParam;
@@ -137,27 +137,27 @@ public class BusService {
      * @return
      */
     @Transactional
-    public Result verifyTicket(BusParam param) {
+    public ResultBean verifyTicket(BusParam param) {
         if (param.getCmptId() == null || param.getScheduleId() == null || StringUtils.isBlank(param.getTicketNo()) || param.getQrTimestamp() == null) {
-            return Result.fail("主要参数不能为空");
+            return ResultBean.fail("主要参数不能为空");
         }
 
         // 验证二维码时效性（1分钟）
         long currentTime = System.currentTimeMillis();
         if (currentTime - param.getQrTimestamp() > 60000) {
-            return Result.fail("二维码已过期，请重新生成");
+            return ResultBean.fail("二维码已过期，请重新生成");
         }
 
         // 查询票务信息
         BusTicketVerification ticket = busMapper.selectTicketForVerification(param.getCmptId(), param.getTicketNo(), param.getScheduleId());
         if (ticket == null) {
-            return Result.fail("未找到有效的车票信息");
+            return ResultBean.fail("未找到有效的车票信息");
         }
 
         // 检查是否允许多次核销
         if (ticket.getAllowMultipleVerification() == 0) {
             if (ticket.getVerificationCount() > 0) {
-                return Result.fail("该车票已核销，不支持多次核销");
+                return ResultBean.fail("该车票已核销，不支持多次核销");
             }
         }
 
@@ -184,7 +184,7 @@ public class BusService {
         webSocketSessionService.sendVerificationSuccess(ticket.getTicketNo(), successMessage);
         log.info("车票核销成功并已发送通知 - 票号: {}, 用户: {}", ticket.getTicketNo(), ticket.getIdNumber());
 
-        return Result.success();
+        return ResultBean.success();
     }
 
     /**

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/BusController.java

 package com.dlbridge.jadp.plugins.cmpt.web;
 
-import com.dlbridge.jadp.common.web.Result;
+import com.dlbridge.jadp.common.web.ResultBean;
 import com.dlbridge.jadp.plugins.cmpt.dao.model.param.BusParam;
 import com.dlbridge.jadp.plugins.cmpt.dao.model.param.BusTicketParam;
 import com.dlbridge.jadp.plugins.cmpt.dao.model.param.BusVerifyRecordParam;
@@ -35,9 +35,9 @@ public class BusController {
     @ResponseBody
     @ApiOperation(value = "获取个人购票列表", notes = "获取个人购票列表")
     @RequestMapping(value = "/mine/tickets", method = RequestMethod.POST)
-    public Result<List<BusTicketVerification>> getPersonalTickets(@RequestBody BusParam param) {
+    public ResultBean<List<BusTicketVerification>> getPersonalTickets(@RequestBody BusParam param) {
         List<BusTicketVerification> tickets = busService.selectTicketByIdNumber(param.getCmptId(), param.getIdNumber());
-        return Result.success(tickets);
+        return ResultBean.success(tickets);
     }
 
     /**
@@ -49,9 +49,9 @@ public class BusController {
     @ResponseBody
     @RequestMapping(value = "/ticket/detail", method = RequestMethod.POST)
     @ApiOperation(value = "获取车票详情", notes = "获取车票详情")
-    public Result<BusTicketVerification> getTicketDetail(@RequestBody BusParam param) {
+    public ResultBean<BusTicketVerification> getTicketDetail(@RequestBody BusParam param) {
         BusTicketVerification ticket = busService.getTicketDetail(param.getCmptId(), param.getTicketNo());
-        return Result.success(ticket);
+        return ResultBean.success(ticket);
     }
 
     /**
@@ -79,7 +79,7 @@ public class BusController {
     @ResponseBody
     @ApiOperation(value = "核销车票", notes = "核销车票")
     @RequestMapping(value = "/ticket/verify", method = RequestMethod.POST)
-    public Result<?> verifyTicket(@RequestBody BusParam param) {
+    public ResultBean<?> verifyTicket(@RequestBody BusParam param) {
         return busService.verifyTicket(param);
     }
 
@@ -91,10 +91,10 @@ public class BusController {
     @ResponseBody
     @ApiOperation(value = "获取赛事班车列表", notes = "获取赛事班车列表")
     @RequestMapping(value = "/schedules", method = RequestMethod.POST)
-    public Result<?> selectSchedulesByCmptId(@RequestBody BusParam param) {
+    public ResultBean<?> selectSchedulesByCmptId(@RequestBody BusParam param) {
         List<BusSchedule> schedules = busService.selectSchedulesByCmptId(param.getCmptId());
         List<BusStation> stations = busService.selectStationsByScheduleId(param.getScheduleId());
-        return Result.success(schedules);
+        return ResultBean.success(schedules);
     }
 
     /**
@@ -105,9 +105,9 @@ public class BusController {
     @ResponseBody
     @ApiOperation(value = "获取班次途经站点列表", notes = "获取班次途经站点列表")
     @RequestMapping(value = "/schedule-stations", method = RequestMethod.POST)
-    public Result<?> selectStationsByScheduleId(@RequestBody BusParam param) {
+    public ResultBean<?> selectStationsByScheduleId(@RequestBody BusParam param) {
         List<BusStation> stations = busService.selectStationsByScheduleId(param.getScheduleId());
-        return Result.success(stations);
+        return ResultBean.success(stations);
     }
 
     /**
@@ -118,9 +118,9 @@ public class BusController {
     @ResponseBody
     @ApiOperation(value = "获取赛事班车站点列表", notes = "获取赛事班车站点列表")
     @RequestMapping(value = "/cmpt-stations", method = RequestMethod.POST)
-    public Result<?> selectStationsByCmptId(@RequestBody BusParam param) {
+    public ResultBean<?> selectStationsByCmptId(@RequestBody BusParam param) {
         List<BusStation> stations = busService.selectStationsByCmptId(param.getCmptId());
-        return Result.success(stations);
+        return ResultBean.success(stations);
     }
 
     /**
@@ -131,9 +131,9 @@ public class BusController {
     @ResponseBody
     @ApiOperation(value = "获取核销记录", notes = "获取核销记录")
     @RequestMapping(value = "/verification-record", method = RequestMethod.POST)
-    public Result<?> selectVerificationRecord(@RequestBody BusParam param) {
+    public ResultBean<?> selectVerificationRecord(@RequestBody BusParam param) {
         List<BusVerificationRecord> records = busService.selectVerificationRecord(param.getCmptId(), param.getVerifierId(), param.getTicketNo());
-        return Result.success(records);
+        return ResultBean.success(records);
     }
 
     /**
@@ -145,9 +145,9 @@ public class BusController {
     @ResponseBody
     @ApiOperation(value = "获取赛事核销统计", notes = "获取赛事核销统计")
     @RequestMapping(value = "/verify-statistics/{cmptId}", method = RequestMethod.GET)
-    public Result<?> busVerifyStatistics(@PathVariable("cmptId") Integer cmptId) {
+    public ResultBean<?> busVerifyStatistics(@PathVariable("cmptId") Integer cmptId) {
         List<BusVerifyStatistics> statistics = busService.busVerifyStatistics(cmptId);
-        return Result.success(statistics);
+        return ResultBean.success(statistics);
     }
 
     /**
@@ -159,9 +159,9 @@ public class BusController {
     @ResponseBody
     @PostMapping("/verification-page-record")
     @ApiOperation(value = "获取操作日志列表", notes = "获取操作日志列表")
-    public Result<?> verifyPageRecord(@RequestBody BusVerifyRecordParam queryDTO) {
+    public ResultBean<?> verifyPageRecord(@RequestBody BusVerifyRecordParam queryDTO) {
         Page<List<BusVerificationRecord>> result = busService.verifyPageRecord(queryDTO);
-        return Result.success(result);
+        return ResultBean.success(result);
     }
     /**
      * 查询车票记录分页列表接口
@@ -172,9 +172,9 @@ public class BusController {
     @ResponseBody
     @PostMapping("/bus-ticket-page")
     @ApiOperation(value = "获取班车车票列表", notes = "获取班车车票列表")
-    public Result<?> busTicketPage(@RequestBody BusTicketParam queryDTO) {
+    public ResultBean<?> busTicketPage(@RequestBody BusTicketParam queryDTO) {
         Page<List<BusTicketVerification>> result = busService.busTicketPage(queryDTO);
-        return Result.success(result);
+        return ResultBean.success(result);
     }
 
 }

src/main/java/com/dlbridge/jadp/plugins/partner/bean/param/BagDeliveryParam.java

+package com.dlbridge.jadp.plugins.partner.bean.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+
+@Data
+public class BagDeliveryParam {
+    @NotNull(message = "赛事ID不能为空")
+    @ApiModelProperty(value = "赛事ID", notes = "赛事ID")
+    private Integer cmptId;
+
+    @NotEmpty(message = "赛包业务类型不能为空")
+    @ApiModelProperty(value = "赛包业务类型（1：赛包邮寄，2：赛包寄存）", notes = "赛包业务类型（1：赛包邮寄，赛包寄存）")
+    private String serviceType;
+
+    @ApiModelProperty(value = "参赛号", notes = "参赛号")
+    @NotBlank(message = "参赛号不能为空")
+    private String markNo;
+}

src/main/java/com/dlbridge/jadp/plugins/partner/controller/BagDeliveryController.java

 package com.dlbridge.jadp.plugins.partner.controller;
 
 import com.dlbridge.jadp.common.interceptor.PageView;
+import com.dlbridge.jadp.common.web.ResultBean;
 import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
 import com.dlbridge.jadp.plugins.cmpt.service.CmptService;
 import com.dlbridge.jadp.plugins.cmpt.utils.Page;
 import com.dlbridge.jadp.plugins.partner.bean.BagDelivery;
 import com.dlbridge.jadp.plugins.partner.bean.BagDropPoints;
 import com.dlbridge.jadp.plugins.partner.bean.BagParam;
+import com.dlbridge.jadp.plugins.partner.bean.param.BagDeliveryParam;
 import com.dlbridge.jadp.plugins.partner.bean.vo.BagDropPointsVO;
 import com.dlbridge.jadp.plugins.partner.service.BagDeliveryService;
 import com.neusoft.www.utils.web.Result;
@@ -65,6 +67,29 @@ public class BagDeliveryController {
     public Result<?> applyBagDelivery(@RequestBody BagDelivery bagDelivery) {
         return bagDeliveryService.applyBagDelivery(bagDelivery);
     }
+    /**
+     * 查询赛包邮寄申请详情
+     * @param bagDeliveryParam 查询参数
+     * @return 赛包邮寄申请详情
+     */
+    @PostMapping("/query")
+    @ApiOperation("查询赛包申请详情")
+    public ResultBean<BagDelivery> queryBagDeliveryByParam(@RequestBody BagDeliveryParam bagDeliveryParam) {
+         // 判断是否为空
+        if (bagDeliveryParam.getCmptId() == null) {
+            return ResultBean.fail("查询参数不能为空");
+        }
+        // 判断是否为空
+        if (bagDeliveryParam.getServiceType() == null) {
+            return ResultBean.fail("查询参数不能为空");
+        }
+        // 判断是否为空
+        if (bagDeliveryParam.getMarkNo() == null) {
+            return ResultBean.fail("查询参数不能为空");
+        }
+         BagDelivery bagDelivery = bagDeliveryService.queryBagDeliveryByParam(bagDeliveryParam);
+         return ResultBean.success(bagDelivery);
+    }
 
     @ResponseBody
     @RequestMapping(value = "/update", method = RequestMethod.POST)

src/main/java/com/dlbridge/jadp/plugins/partner/controller/DropPointController.java

@@ -12,7 +12,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.annotation.Resource;
 
 @RestController
-@Api(tags = "寄存包",value = "寄存包")
+@Api(tags = "寄存点",value = "寄存点")
 @RequestMapping("gk/dropPoint")
 public class DropPointController {
 

src/main/java/com/dlbridge/jadp/plugins/partner/mapper/BagDeliveryMapper.java

@@ -3,6 +3,7 @@ package com.dlbridge.jadp.plugins.partner.mapper;
 import com.dlbridge.jadp.plugins.partner.bean.BagDelivery;
 import com.dlbridge.jadp.plugins.partner.bean.BagDropPoints;
 import com.dlbridge.jadp.plugins.partner.bean.BagParam;
+import com.dlbridge.jadp.plugins.partner.bean.param.BagDeliveryParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
 import java.util.List;
@@ -52,4 +53,11 @@ public interface BagDeliveryMapper {
     Integer selectBagCountByPId(Integer status, Integer id);
 
     BagDelivery selectBagDelivery(String id);
+
+     /**
+     * 根据参数查询赛包邮寄申请详情
+     * @param bagDeliveryParam 查询参数
+     * @return 赛包邮寄申请详情
+     */
+    BagDelivery queryBagDeliveryByParam(BagDeliveryParam bagDeliveryParam);
 }

src/main/java/com/dlbridge/jadp/plugins/partner/mapper/BagDeliveryMapper.xml

@@ -212,5 +212,40 @@
     <select id="selectBagDelivery" resultType="com.dlbridge.jadp.plugins.partner.bean.BagDelivery">
         select * from bag_delivery a where a.del_flag=0 and a.id = #{id} limit 1
     </select>
+    <select id="queryBagDeliveryByParam" resultType="com.dlbridge.jadp.plugins.partner.bean.BagDelivery">
+        SELECT c.item_name       roadName,
+               a.id,
+               a.service_type    serviceType,
+               a.cmpt_id         cmptId,
+               a.create_date     createDate,
+               a.update_date     updateDate,
+               a.name,
+               a.mark_no         markNo,
+               a.phone,
+               a.province,
+               a.province_code   provinceCode,
+               a.city,
+               a.city_code       cityCode,
+               a.area,
+               a.area_code       areaCode,
+               a.location,
+               a.delivery_no     deliveryNo,
+               a.express_company expressCompany,
+               a.remark,
+               a.login_code      loginCode,
+               d.point_name      storagePoint,
+               a.status
+        from gksite.bag_delivery a
+                 LEFT JOIN geerunner.cmpt_enroll b ON a.cmpt_id = b.cmpt_id AND a.mark_no = b.nick_id
+                 LEFT JOIN geerunner.cmpt_item c ON c.cmpt_id = b.cmpt_id AND b.cmpt_item = c.item_id
+                 LEFT JOIN gksite.bag_drop_points d on d.cmpt_id = a.cmpt_id and d.id = a.storage_point
+        WHERE a.cmpt_id = #{cmptId}
+          AND a.mark_no = #{markNo}
+          AND a.service_type = #{serviceType}
+          AND a.del_flag = 0
+          AND b.del_flg = 0
+          AND c.del_flg = 0
+          and d.del_flag = 0
+    </select>
 
 </mapper>
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/partner/service/BagDeliveryService.java

@@ -10,6 +10,7 @@ import com.dlbridge.jadp.plugins.cmpt.utils.PageFactory;
 import com.dlbridge.jadp.plugins.partner.bean.BagDelivery;
 import com.dlbridge.jadp.plugins.partner.bean.BagDropPoints;
 import com.dlbridge.jadp.plugins.partner.bean.BagParam;
+import com.dlbridge.jadp.plugins.partner.bean.param.BagDeliveryParam;
 import com.dlbridge.jadp.plugins.partner.bean.vo.BagDropPointsVO;
 import com.dlbridge.jadp.plugins.partner.mapper.BagDeliveryMapper;
 import com.neusoft.www.utils.web.Result;
@@ -317,4 +318,13 @@ public class BagDeliveryService {
         bagDeliveryMapper.delBagDropPointsById(id);
         return Result.success();
     }
+
+     /**
+     * 查询赛包邮寄申请详情
+     * @param bagDeliveryParam 查询参数
+     * @return 赛包邮寄申请详情
+     */
+    public BagDelivery queryBagDeliveryByParam(BagDeliveryParam bagDeliveryParam) {
+        return bagDeliveryMapper.queryBagDeliveryByParam(bagDeliveryParam);
+    }
 }

src/main/java/com/dlbridge/jadp/websocket/WebSocketTestController.java

 package com.dlbridge.jadp.websocket;
 
-import com.dlbridge.jadp.common.web.Result;
-import org.springframework.messaging.handler.annotation.MessageMapping;
+import com.dlbridge.jadp.common.web.ResultBean;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
@@ -19,12 +18,12 @@ public class WebSocketTestController {
      * 测试接口：向指定用户发送票号核销消息
      */
     @PostMapping("/sendToVerify")
-    public Result<String> sendToVerify(@RequestBody Map<String, String> body) {
+    public ResultBean<String> sendToVerify(@RequestBody Map<String, String> body) {
         String message = body.get("message");
         String ticketNo = body.get("ticketNo");
-        if (message == null || ticketNo == null) return Result.fail("缺少 message 或 ticketNo");
+        if (message == null || ticketNo == null) return ResultBean.fail("缺少 message 或 ticketNo");
         sessionService.sendVerificationSuccess(ticketNo,message);
 
-        return Result.success();
+        return ResultBean.success();
     }
 }
\ No newline at end of file