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 53dcc03..a5a6e0e 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 @@ -7,6 +7,7 @@ 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.EbikeLockVo; import com.ebike.feign.model.vo.FeignEbikeBikeRadiusVo; import com.ebike.feign.model.vo.FeignInspectionSwapOrderVo; import org.springframework.cloud.openfeign.FeignClient; @@ -46,8 +47,8 @@ public interface OperationsFeignClient { * * @return 结果 */ - @GetMapping("/ebikeBikeInfo/api/lock") - JsonResult lock(@RequestParam("bikeCode")String bikeCode); + @PostMapping("/ebikeBikeInfo/api/lock") + JsonResult lock(@RequestBody EbikeLockVo lockVo); /** * 用户获取车辆详情及其计费规则 diff --git a/ebike-feign/src/main/java/com/ebike/feign/model/vo/EbikeLockVo.java b/ebike-feign/src/main/java/com/ebike/feign/model/vo/EbikeLockVo.java new file mode 100644 index 0000000..1e7e540 --- /dev/null +++ b/ebike-feign/src/main/java/com/ebike/feign/model/vo/EbikeLockVo.java @@ -0,0 +1,39 @@ +package com.ebike.feign.model.vo; + +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.postgresql.geometric.PGpoint; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 中控基本信息 实体类。 + * + * @author attiya + * @since 2025-09-15 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class EbikeLockVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 车辆编号 + */ + @NotNull(message = "车辆编号不能为空") + private String bikeCode; + + + @NotNull(message = "车辆当前位置不能为空") + private PGpoint point; + + +} diff --git a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeInfoController.java b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeInfoController.java index 1f81108..6ed61a8 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeInfoController.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeInfoController.java @@ -7,11 +7,9 @@ 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.vo.EbikeBatchLaunchVo; -import com.cdzy.operations.model.vo.EbikeBatchUnLaunchVo; -import com.cdzy.operations.model.vo.EbikeBikeBindVo; -import com.cdzy.operations.model.vo.EbikeBikeRadiusVo; +import com.cdzy.operations.model.vo.*; import com.cdzy.operations.service.EbikeBikeInfoService; +import com.ebike.feign.model.vo.EbikeLockVo; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -119,9 +117,9 @@ public class EbikeBikeInfoController { * * @return 结果 */ - @GetMapping("/api/lock") - public JsonResult lock(@RequestParam("bikeCode") String bikeCode) { - EbikeUserLockDto result = ebikeBikeInfoService.lock(bikeCode); + @PostMapping("/api/lock") + public JsonResult lock(@RequestBody @Validated EbikeLockVo lockVo) { + EbikeUserLockDto result = ebikeBikeInfoService.lock(lockVo); return JsonResult.success(result); } 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 38cbc7b..0feaf5c 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 @@ -7,10 +7,8 @@ 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; -import com.cdzy.operations.model.vo.EbikeBikeBindVo; -import com.cdzy.operations.model.vo.EbikeBikeRadiusVo; +import com.cdzy.operations.model.vo.*; +import com.ebike.feign.model.vo.EbikeLockVo; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import org.postgresql.geometric.PGpolygon; @@ -86,9 +84,9 @@ public interface EbikeBikeInfoService extends IService { /** * 用户关锁 - * @param bikeCode 车辆编号 + * @param lockVo 车辆信息 */ - EbikeUserLockDto lock(String bikeCode); + EbikeUserLockDto lock(EbikeLockVo lockVo); /** * 中控换绑 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 0f4c6e8..ea4f5d2 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 @@ -14,6 +14,7 @@ import com.cdzy.operations.model.entity.*; import com.cdzy.operations.model.vo.*; import com.cdzy.operations.service.*; import com.cdzy.operations.utils.RedisUtil; +import com.ebike.feign.model.vo.EbikeLockVo; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.update.UpdateChain; @@ -463,11 +464,12 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl