From 29affcc380f8f594109a364ae363ae5222e205a78a7c98d75b900f32826101cf Mon Sep 17 00:00:00 2001 From: attiya <2413103649@qq.com> Date: Tue, 11 Nov 2025 16:23:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=85=B3=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/clients/OperationsFeignClient.java | 3 +- .../model/dto/FeignEbikeUserLockDto.java | 37 +++++++++++++++++ .../operations/mapper/EbikeSiteMapper.java | 4 ++ .../model/dto/EbikeUserLockDto.java | 37 +++++++++++++++++ .../service/EbikeBikeInfoService.java | 3 +- .../impl/EbikeBikeInfoServiceImpl.java | 31 +++++++++++++- .../main/resources/mapper/EbikeSiteMapper.xml | 41 +++++++++++++++++++ 7 files changed, 153 insertions(+), 3 deletions(-) create mode 100644 ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserLockDto.java create mode 100644 ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserLockDto.java create mode 100644 ebike-operations/src/main/resources/mapper/EbikeSiteMapper.xml diff --git a/ebike-feign/src/main/java/com/ebike/feign/clients/OperationsFeignClient.java b/ebike-feign/src/main/java/com/ebike/feign/clients/OperationsFeignClient.java index 60de16d..59cf8b8 100644 --- a/ebike-feign/src/main/java/com/ebike/feign/clients/OperationsFeignClient.java +++ b/ebike-feign/src/main/java/com/ebike/feign/clients/OperationsFeignClient.java @@ -5,6 +5,7 @@ import com.ebike.feign.component.FeignTokenInterceptor; import com.ebike.feign.config.ExampleFeignConfiguration; import com.ebike.feign.model.dto.FeignEbikeDto; import com.ebike.feign.model.dto.FeignEbikeUserBikeInfo; +import com.ebike.feign.model.dto.FeignEbikeUserLockDto; import com.ebike.feign.model.vo.FeignEbikeBikeRadiusVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; @@ -44,7 +45,7 @@ public interface OperationsFeignClient { * @return 结果 */ @GetMapping("/ebikeBikeInfo/api/lock") - JsonResult lock(@RequestParam("bikeCode")String bikeCode); + JsonResult lock(@RequestParam("bikeCode")String bikeCode); /** * 用户获取车辆详情及其计费规则 diff --git a/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserLockDto.java b/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserLockDto.java new file mode 100644 index 0000000..3c58320 --- /dev/null +++ b/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserLockDto.java @@ -0,0 +1,37 @@ +package com.ebike.feign.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 实体类。 + * + * @author attiya + * @since 2025-10-21 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class FeignEbikeUserLockDto implements Serializable { + + /** + * 是否在运营区内 + */ + Boolean bikeInRegion; + + /** + * 是否在停车区内 + */ + Boolean bikeInParking; + + /** + * 是否在禁停区内 + */ + Boolean bikeInNoParking; + +} diff --git a/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbikeSiteMapper.java b/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbikeSiteMapper.java index 6ffd6e0..b719bd3 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbikeSiteMapper.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbikeSiteMapper.java @@ -2,6 +2,7 @@ package com.cdzy.operations.mapper; import com.mybatisflex.core.BaseMapper; import com.cdzy.operations.model.entity.EbikeSite; +import org.springframework.web.bind.annotation.RequestParam; /** * 映射层。 @@ -11,4 +12,7 @@ import com.cdzy.operations.model.entity.EbikeSite; */ public interface EbikeSiteMapper extends BaseMapper { + boolean checkBikeInParking(@RequestParam("bikeCode") String bikeCode); + + boolean checkBikeInNoParking(@RequestParam("bikeCode") String bikeCode); } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserLockDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserLockDto.java new file mode 100644 index 0000000..728f060 --- /dev/null +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserLockDto.java @@ -0,0 +1,37 @@ +package com.cdzy.operations.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 实体类。 + * + * @author attiya + * @since 2025-10-21 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class EbikeUserLockDto implements Serializable { + + /** + * 是否在运营区内 + */ + Boolean bikeInRegion; + + /** + * 是否在停车区内 + */ + Boolean bikeInParking; + + /** + * 是否在禁停区内 + */ + Boolean bikeInNoParking; + +} diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeBikeInfoService.java b/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeBikeInfoService.java index 7b137c3..f1720d5 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeBikeInfoService.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeBikeInfoService.java @@ -4,6 +4,7 @@ import com.cdzy.common.model.request.PageParam; import com.cdzy.operations.model.dto.EbikeBikeInfoDto; import com.cdzy.operations.model.dto.EbikeDto; import com.cdzy.operations.model.dto.EbikeUserBikeInfo; +import com.cdzy.operations.model.dto.EbikeUserLockDto; import com.cdzy.operations.model.entity.EbikeBikeInfo; import com.cdzy.operations.model.vo.EbikeBatchLaunchVo; import com.cdzy.operations.model.vo.EbikeBatchUnLaunchVo; @@ -86,5 +87,5 @@ public interface EbikeBikeInfoService extends IService { * 用户关锁 * @param bikeCode 车辆编号 */ - void lock(String bikeCode); + EbikeUserLockDto lock(String bikeCode); } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java index 56f86d3..600c84b 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java @@ -8,6 +8,7 @@ import com.cdzy.operations.mapper.*; import com.cdzy.operations.model.dto.EbikeBikeInfoDto; import com.cdzy.operations.model.dto.EbikeDto; import com.cdzy.operations.model.dto.EbikeUserBikeInfo; +import com.cdzy.operations.model.dto.EbikeUserLockDto; import com.cdzy.operations.model.entity.*; import com.cdzy.operations.model.vo.*; import com.cdzy.operations.service.EbikeBikeInfoService; @@ -20,6 +21,7 @@ import com.mybatisflex.core.update.UpdateChain; import com.mybatisflex.core.util.StringUtil; import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; import org.postgresql.geometric.PGpolygon; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,6 +49,7 @@ import static com.cdzy.operations.model.entity.table.EbikeSpecialTimeTableDef.EB * @author attiya * @since 2025-10-17 */ +@Slf4j @Service public class EbikeBikeInfoServiceImpl extends ServiceImpl implements EbikeBikeInfoService { @@ -59,6 +62,9 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl ebikeSpecialDays) { diff --git a/ebike-operations/src/main/resources/mapper/EbikeSiteMapper.xml b/ebike-operations/src/main/resources/mapper/EbikeSiteMapper.xml new file mode 100644 index 0000000..08db970 --- /dev/null +++ b/ebike-operations/src/main/resources/mapper/EbikeSiteMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file