新增城市校验逻辑，完善消息发送及查询接口

shaofan
1 parent c90ac42a
Showing 3 changed files with 42 additions and 8 deletions
src/main/java/com/diligrp/rider/controller/AdminMessageController.java
src/main/java/com/diligrp/rider/service/impl/AdminMessageServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/RiderOrderServiceImpl.java
 package com.diligrp.rider.controller;
+import com.diligrp.rider.common.exception.BizException;
 import com.diligrp.rider.common.result.Result;
 import com.diligrp.rider.entity.RiderMessageTemplate;
 import com.diligrp.rider.service.AdminMessageService;
@@ -23,6 +24,7 @@ public class AdminMessageController {
     @Data
     static class MessageSendDTO {
+        private Long cityId;
         private Long riderId;
         private Integer type;
         private String title;
@@ -33,6 +35,7 @@ public class AdminMessageController {
     @Data
     static class MessageBroadcastDTO {
+        private Long cityId;
         private Integer type;
         private String title;
         private String content;
@@ -43,7 +46,7 @@ public class AdminMessageController {
      */
     @PostMapping("/send")
     public Result<Void> send(@RequestBody MessageSendDTO dto, HttpServletRequest request) {
-        Long cityId = resolveCityId(request);
+        Long cityId = resolveCityId(dto.getCityId(), request);
         messageService.sendToRider(cityId, dto.getRiderId(), dto.getType(), dto.getTitle(), dto.getContent(), dto.getBizType(), dto.getBizId());
         return Result.success();
     }
@@ -53,7 +56,7 @@ public class AdminMessageController {
      */
     @PostMapping("/broadcast")
     public Result<Void> broadcast(@RequestBody MessageBroadcastDTO dto, HttpServletRequest request) {
-        Long cityId = resolveCityId(request);
+        Long cityId = resolveCityId(dto.getCityId(), request);
         messageService.broadcastToCity(cityId, dto.getType(), dto.getTitle(), dto.getContent());
         return Result.success();
     }
@@ -63,12 +66,13 @@ public class AdminMessageController {
      */
     @GetMapping("/list")
     public Result<Map<String, Object>> list(
+            @RequestParam(required = false) Long cityId,
             @RequestParam(required = false) Long riderId,
             @RequestParam(required = false) Integer type,
             @RequestParam(defaultValue = "1") Integer page,
             HttpServletRequest request) {
-        Long cityId = resolveCityId(request);
-        return Result.success(messageService.listMessages(cityId, riderId, type, page));
+        Long scopedCityId = resolveCityId(cityId, request);
+        return Result.success(messageService.listMessages(scopedCityId, riderId, type, page));
     }
     /**
@@ -80,13 +84,15 @@ public class AdminMessageController {
     }
     /**
-     * 解析城市ID（分站管理员自动绑定本城市，超管需要传递）
+     * 解析城市ID：分站管理员固定使用账号绑定城市，平台管理员必须显式选择租户。
      */
-    private Long resolveCityId(HttpServletRequest request) {
+    private Long resolveCityId(Long requestedCityId, HttpServletRequest request) {
         if ("substation".equals(request.getAttribute("role"))) {
             return (Long) request.getAttribute("cityId");
         }
-        // 超管需要从请求参数获取 cityId（这里简化处理，实际应该从请求参数获取）
-        return (Long) request.getAttribute("cityId");
+        if (requestedCityId == null || requestedCityId < 1) {
+            throw new BizException("请选择租户");
+        }
+        return requestedCityId;
     }
 }
@@ -2,6 +2,7 @@ package com.diligrp.rider.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diligrp.rider.common.exception.BizException;
 import com.diligrp.rider.entity.Rider;
 import com.diligrp.rider.entity.RiderMessage;
 import com.diligrp.rider.entity.RiderMessageTemplate;
@@ -33,6 +34,9 @@ public class AdminMessageServiceImpl implements AdminMessageService {
     @Override
     @Transactional
     public void sendToRider(Long cityId, Long riderId, Integer type, String title, String content, String bizType, Long bizId) {
+        ensureCitySelected(cityId);
+        ensureRiderInCity(cityId, riderId);
+
         RiderMessage message = new RiderMessage();
         message.setCityId(cityId);
         message.setRiderId(riderId);
@@ -52,6 +56,8 @@ public class AdminMessageServiceImpl implements AdminMessageService {
     @Override
     @Transactional
     public void broadcastToCity(Long cityId, Integer type, String title, String content) {
+        ensureCitySelected(cityId);
+
         // 查询城市内所有正常状态的骑手
         LambdaQueryWrapper<Rider> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Rider::getCityId, cityId)
@@ -94,6 +100,8 @@ public class AdminMessageServiceImpl implements AdminMessageService {
     @Override
     public Map<String, Object> listMessages(Long cityId, Long riderId, Integer type, Integer page) {
+        ensureCitySelected(cityId);
+
         Page<RiderMessage> pageObj = new Page<>(page, PAGE_SIZE);
         LambdaQueryWrapper<RiderMessage> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(RiderMessage::getCityId, cityId)
@@ -111,6 +119,25 @@ public class AdminMessageServiceImpl implements AdminMessageService {
         return data;
     }
+    private void ensureCitySelected(Long cityId) {
+        if (cityId == null || cityId < 1) {
+            throw new BizException("请选择租户");
+        }
+    }
+
+    private void ensureRiderInCity(Long cityId, Long riderId) {
+        if (riderId == null) {
+            throw new BizException("骑手ID不能为空");
+        }
+        Rider rider = riderMapper.selectById(riderId);
+        if (rider == null) {
+            throw new BizException("骑手不存在");
+        }
+        if (!cityId.equals(rider.getCityId())) {
+            throw new BizException("只能给当前租户骑手发送消息");
+        }
+    }
+
     @Override
     public List<RiderMessageTemplate> listTemplates() {
         LambdaQueryWrapper<RiderMessageTemplate> wrapper = new LambdaQueryWrapper<>();
@@ -27,6 +27,7 @@ import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;