From ab5d8441561fb4b14de7e18e29efd4350b945bb77e16974b2a465fc76a0c5a33 Mon Sep 17 00:00:00 2001 From: PC <2413103649@qq.com> Date: Thu, 22 Jan 2026 11:27:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E6=8E=A7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EbikeBikeInfoController.java | 10 +- .../operations/model/vo/EbikeEcuMsgDto.java | 120 ++++++++++++++++++ .../service/EbikeBikeInfoService.java | 3 +- .../impl/EbikeBikeInfoServiceImpl.java | 15 ++- 4 files changed, 132 insertions(+), 16 deletions(-) create mode 100644 ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbikeEcuMsgDto.java 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 626300c..83c538d 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 @@ -1,6 +1,5 @@ package com.cdzy.operations.controller; -import com.cdzy.common.model.dto.ResGPSDto; import com.cdzy.common.model.request.PageParam; import com.cdzy.common.model.response.JsonResult; import com.cdzy.operations.model.dto.EbikeBikeInfoDto; @@ -8,10 +7,7 @@ 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.cdzy.operations.service.EbikeBikeInfoService; import com.ebike.feign.model.vo.EbikeLockVo; import com.mybatisflex.core.paginate.Page; @@ -171,8 +167,8 @@ public class EbikeBikeInfoController { * @return 结果 */ @GetMapping("/getEcuMsg") - public JsonResult getEcuMsg(@RequestParam("ecuSn") String ecuSn) { - ResGPSDto ecuMsg = ebikeBikeInfoService.getEcuMsg(ecuSn); + public JsonResult getEcuMsg(@RequestParam("ecuSn") String ecuSn) { + EbikeEcuMsgDto ecuMsg = ebikeBikeInfoService.getEcuMsg(ecuSn); return JsonResult.success(ecuMsg); } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbikeEcuMsgDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbikeEcuMsgDto.java new file mode 100644 index 0000000..a67076f --- /dev/null +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbikeEcuMsgDto.java @@ -0,0 +1,120 @@ +package com.cdzy.operations.model.vo; + +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * @author attiya + * @since 2025-03-20 + */ +@Data +public class EbikeEcuMsgDto { + + /** + * 经度 + */ + private Double longitude; + + /** + * 纬度 + */ + private Double latitude; + + /** + * 外接电池电量（该值由控制器提供，若控制器不支持此值为0） + */ + private Integer soc; + + /** + * 外接电源电压，单位：毫伏 + */ + private Integer voltage; + + /** + * 外接电源电压，单位：伏 + */ + private Double realVoltage; + + /** + * GPS信号强度【0-31】 + */ + private Integer gsm; + + /** + * 0: 头盔不在位 1: 头盔在位 + */ + private Character helmetExit; + + /** + * 0: 头盔锁未上锁 1: 头盔锁已上锁 + */ + private Character isHelmetLocked; + + /** + * 0:后轮静止 1:后轮转动（轮动状态 + */ + private Character isWheelSpin; + + /** + * 0:撤防状态 1:设防状态 + */ + private Character isDefendOn; + + /** + * 0: 车辆静止 1: 车辆移动（运动状态 + */ + private Character isMoving; + + /** + * 0:电门关闭 1:电门打开 + */ + private Character accOn; + + /** + * 0:后轮未锁 1:后轮已锁 + */ + private Character wheelLocked; + + /** + * 0:电池仓未锁 1:电池仓已锁 + */ + private Character seatLocked; + + /** + * 速度 + */ + private Float speed; + + /** + * 中文位置 + */ + private String chineseLocation; + + /** + * ecuSn + */ + private String ecuSn; + + /** + * 是否在运营区（记录最后一次用户停车 + */ + private Boolean inOperation; + + /** + * 是否在停车区（记录最后一次用户停车 + */ + private Boolean inParking; + + + /** + * 放电状态：0-关闭（断电） 1-打开（通电） + */ + private Integer mosState; + + /** + * 最后一次上报时间 + */ + private LocalDateTime latestTime; + +} 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 0feaf5c..4738ca1 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 @@ -1,6 +1,5 @@ package com.cdzy.operations.service; -import com.cdzy.common.model.dto.ResGPSDto; import com.cdzy.common.model.request.PageParam; import com.cdzy.operations.model.dto.EbikeBikeInfoDto; import com.cdzy.operations.model.dto.EbikeDto; @@ -100,5 +99,5 @@ public interface EbikeBikeInfoService extends IService { * 根据EcuSn获取信息 * @param ecuSn 中控编号 */ - ResGPSDto getEcuMsg(String ecuSn); + EbikeEcuMsgDto getEcuMsg(String ecuSn); } 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 efec49f..008d901 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 @@ -39,11 +39,7 @@ import com.cdzy.operations.model.entity.EbikeRegion; import com.cdzy.operations.model.entity.EbikeSpecialBillingConfiguration; import com.cdzy.operations.model.entity.EbikeSpecialDay; import com.cdzy.operations.model.entity.EbikeSpecialTime; -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.EbikeInventoryVo; +import com.cdzy.operations.model.vo.*; import com.cdzy.operations.service.EbikeBikeInfoService; import com.cdzy.operations.service.EbikeDispatchConfigurationService; import com.cdzy.operations.service.EbikeEcuInfoService; @@ -51,6 +47,7 @@ import com.cdzy.operations.service.EbikeInventoryRecordService; import com.cdzy.operations.service.EbikeInventoryService; import com.cdzy.operations.utils.RedisUtil; import com.ebike.feign.model.vo.EbikeLockVo; +import com.fasterxml.jackson.databind.ObjectMapper; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.update.UpdateChain; @@ -561,14 +558,18 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl