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

bug修复

Browse Source
This commit is contained in:
PC 2026-02-25 16:19:07 +08:00
parent 27a6006fd0
commit c434fc9321
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebike-operations/src/main/java/com/cdzy/operations/mapper/EbikeRegionMapper.java
View File

@ -29,7 +29,7 @@ public interface EbikeRegionMapper extends BaseMapper<EbikeRegion> {
* @param point 用户当前位置 * @param point 用户当前位置
* @return 列表 * @return 列表
*/ */
List<EbikeRegion> findAllRegionsOrderByDistance(Point point,Long operatorId); List<EbikeRegion> findAllRegionsOrderByDistance(Point point,Long operatorId,Boolean isAdmin);
/** /**
* 根据当前位置查询当前运营区及站点 * 根据当前位置查询当前运营区及站点

11
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.CommonEbikeRole;
import com.cdzy.common.model.response.CommonStaffInfo; 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.*;
@ -800,7 +801,15 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
if (point != null) { if (point != null) {
String loginId = StpUtil.getLoginIdAsString(); String loginId = StpUtil.getLoginIdAsString();
CommonStaffInfo staffInfo = (CommonStaffInfo) StpUtil.getSession().get(loginId); CommonStaffInfo staffInfo = (CommonStaffInfo) StpUtil.getSession().get(loginId);
return regionMapper.findAllRegionsOrderByDistance(point, staffInfo.getOperatorId()); List<CommonEbikeRole> roles = staffInfo.getRoles();
boolean admin = Boolean.FALSE;
for (CommonEbikeRole role : roles) {
if (role.getSysAdmin()){
admin = Boolean.TRUE;
break;
}
}
return regionMapper.findAllRegionsOrderByDistance(point, staffInfo.getOperatorId(),admin);
} else { } else {
return regionMapper.selectAll(); return regionMapper.selectAll();
} }

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

@ -20,17 +20,21 @@
<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 ( #{point.x}, #{point.y}), 4326 ) :: geography ) AS distance_meters, ST_Distance ( region_polygon::geometry, ST_SetSRID ( ST_MakePoint ( #{point.x}, #{point.y}), 4326 ) :: geography
ST_Contains ( ST_SetSRID(region_polygon::geometry, 4326), ST_SetSRID ( ST_MakePoint ( #{point.x}, #{point.y}), 4326 ) ) AS is_within_region ) AS distance_meters,
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
is_deleted IS NOT TRUE is_deleted IS NOT TRUE
<if test="!isAdmin">
AND operator_id = #{operatorId} AND operator_id = #{operatorId}
</if>
ORDER BY ORDER BY
is_within_region DESC, is_within_region DESC,
distance_meters distance_meters
</select> </select>
<resultMap id="FeignEbikeSiteVoMap" type="com.ebike.feign.model.vo.FeignEbikeSiteVo"> <resultMap id="FeignEbikeSiteVoMap" type="com.ebike.feign.model.vo.FeignEbikeSiteVo">