attiya/ebike-plus
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

运营区筛选

Browse Source
This commit is contained in:
PC 2026-02-03 17:14:53 +08:00
parent 2dcd1f3c12
commit 08cc2da35a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
View File

@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.io.file.FileNameUtil; import cn.hutool.core.io.file.FileNameUtil;
import com.cdzy.common.ex.EbikeException; import com.cdzy.common.ex.EbikeException;
import com.cdzy.common.model.dto.ResGPSDto; import com.cdzy.common.model.dto.ResGPSDto;
import com.cdzy.common.model.response.CommonStaffInfo;
import com.cdzy.operations.enums.*; import com.cdzy.operations.enums.*;
import com.cdzy.operations.mapper.*; import com.cdzy.operations.mapper.*;
import com.cdzy.operations.model.dto.*; import com.cdzy.operations.model.dto.*;
@ -759,7 +760,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
public List<EbikeRegion> regionList(OrderRegionVo orderRegionVo) { public List<EbikeRegion> regionList(OrderRegionVo orderRegionVo) {
Point point = orderRegionVo.getPoint(); Point point = orderRegionVo.getPoint();
if (point != null) { if (point != null) {
return regionMapper.findAllRegionsOrderByDistance(point,StpUtil.getLoginIdAsLong()); String loginId = StpUtil.getLoginIdAsString();
CommonStaffInfo staffInfo = (CommonStaffInfo) StpUtil.getSession().get(loginId);
return regionMapper.findAllRegionsOrderByDistance(point,staffInfo.getOperatorId());
} else { } else {
return regionMapper.selectAll(); return regionMapper.selectAll();
} }

4
ebike-operations/src/main/resources/mapper/EbikeRegionMapper.xml
View File

@ -21,8 +21,8 @@
<select id="findAllRegionsOrderByDistance" resultType="com.cdzy.operations.model.entity.EbikeRegion"> <select id="findAllRegionsOrderByDistance" resultType="com.cdzy.operations.model.entity.EbikeRegion">
SELECT SELECT
ebike_region.*, ebike_region.*,
ST_Distance ( region_polygon::geometry, ST_SetSRID ( ST_MakePoint ( #{lng}, #{lat}), 4326 ) :: geography ) AS distance_meters, ST_Distance ( region_polygon::geometry, ST_SetSRID ( ST_MakePoint ( #{point.x}, #{point.y}), 4326 ) :: geography ) AS distance_meters,
ST_Contains ( ST_SetSRID(region_polygon::geometry, 4326), ST_SetSRID ( ST_MakePoint ( #{lng}, #{lat}), 4326 ) ) AS is_within_region ST_Contains ( ST_SetSRID(region_polygon::geometry, 4326), ST_SetSRID ( ST_MakePoint ( #{point.x}, #{point.y}), 4326 ) ) AS is_within_region
FROM FROM
ebike_region ebike_region
WHERE WHERE