From 508b29c617a2a2bd848d3ce298587384df0c0bc84ac28ef3d81dc23108df0a33 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Thu, 4 Dec 2025 10:59:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E8=A7=A3=E6=9E=90=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=BD=A6=E8=BE=86=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cdzy/common/model/dto/ResGPSDto.java  |  5 ---
 .../model/dto/EbikeOrderBikeInfoDto.java      | 31 +++-------------
 .../impl/EbikeBikeOrderServiceImpl.java       | 35 ++++++++++++++++++-
 .../src/main/resources/application-dev.yml    |  4 +++
 4 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/ebike-common/src/main/java/com/cdzy/common/model/dto/ResGPSDto.java b/ebike-common/src/main/java/com/cdzy/common/model/dto/ResGPSDto.java
index 95bb00a..54d82c5 100644
--- a/ebike-common/src/main/java/com/cdzy/common/model/dto/ResGPSDto.java
+++ b/ebike-common/src/main/java/com/cdzy/common/model/dto/ResGPSDto.java
@@ -36,11 +36,6 @@ public class ResGPSDto {
      */
     private Integer gsm;
 
-    /**
-     * 时间戳
-     */
-    private Number timestamp;
-
     /**
      * 0: 头盔不在位 1: 头盔在位
      */
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java
index 884dea6..6767e62 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java
@@ -36,7 +36,6 @@ public class EbikeOrderBikeInfoDto implements Serializable {
      */
     private Long bikeInfoId;
 
-
     /**
      * 定位
      */
@@ -51,6 +50,11 @@ public class EbikeOrderBikeInfoDto implements Serializable {
      */
     private Integer usageStatus;
 
+    /**
+     * 最新骑行时间
+     */
+    private LocalDateTime latestCyclingTime;
+
     /**
      * 外接电池电量（该值由控制器提供，若控制器不支持此值为0）
      */
@@ -66,11 +70,6 @@ public class EbikeOrderBikeInfoDto implements Serializable {
      */
     private Integer gsm;
 
-    /**
-     * 时间戳
-     */
-    private Number timestamp;
-
     /**
      * 0: 头盔不在位 1: 头盔在位
      */
@@ -86,11 +85,6 @@ public class EbikeOrderBikeInfoDto implements Serializable {
      */
     private Character isWheelSpin;
 
-    /**
-     * 0:撤防状态 1:设防状态
-     */
-    private Character isDefendOn;
-
     /**
      * 0: 车辆静止 1: 车辆移动（运动状态
      */
@@ -126,24 +120,9 @@ public class EbikeOrderBikeInfoDto implements Serializable {
      */
     private String ecuSn;
 
-    /**
-     * 是否在运营区（记录最后一次用户停车
-     */
-    private Boolean inOperation;
-
-    /**
-     * 是否在停车区（记录最后一次用户停车
-     */
-    private Boolean inParking;
-
     /**
      * 最后一次上报时间
      */
     private LocalDateTime latestTime;
 
-    /**
-     * 放电状态：0-关闭（断电） 1-打开（通电）
-     */
-    private Integer mosState;
-
 }
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
index 15dd945..7364ff2 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
@@ -14,8 +14,11 @@ import com.cdzy.operations.model.vo.EbikeBatteryClaimReturnVo;
 import com.cdzy.operations.model.vo.FaultOrderVo;
 import com.cdzy.operations.model.vo.InspectionSwapOrderVo;
 import com.cdzy.operations.service.EbikeBikeOrderService;
+import com.cdzy.operations.utils.GeoCodingUtil;
 import com.cdzy.operations.utils.MinioUtil;
 import com.cdzy.operations.utils.RedisUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.core.update.UpdateChain;
@@ -78,6 +81,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
     @Resource
     MinioUtil minioUtil;
 
+    @Resource
+    GeoCodingUtil geoCodingUtil;
+
     @Resource
     private EbikeBikeOrderMapper ebikeBikeOrderMapper;
 
@@ -372,7 +378,34 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
 
     @Override
     public EbikeOrderBikeInfoDto bikeInfo(String bikeCode) {
-        return null;
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                .select(EBIKE_BIKE_INFO.BIKE_INFO_ID,EBIKE_BIKE_INFO.LOCATION,EBIKE_BIKE_INFO.USAGE_STATUS,EBIKE_BIKE_INFO.LATEST_CYCLING_TIME,EBIKE_ECU_INFO.ECU_SN)
+                .where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode))
+                .leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID));
+        EbikeOrderBikeInfoDto bikeInfo = bikeInfoMapper.selectOneByQueryAs(queryWrapper,EbikeOrderBikeInfoDto.class);
+        if (bikeInfo == null) {
+            throw new EbikeException("车辆编号错误");
+        }
+        ResGPSDto resGPSDto = (ResGPSDto)redisUtil.getEcu(bikeInfo.getEcuSn());
+        bikeInfo.setSoc(resGPSDto.getSoc());
+        bikeInfo.setVoltage(resGPSDto.getVoltage());
+        bikeInfo.setGsm(resGPSDto.getGsm());
+        bikeInfo.setHelmetExit(resGPSDto.getHelmetExit());
+        bikeInfo.setIsHelmetLocked(resGPSDto.getIsHelmetLocked());
+        bikeInfo.setIsWheelSpin(resGPSDto.getIsWheelSpin());
+        bikeInfo.setIsMoving(resGPSDto.getIsMoving());
+        bikeInfo.setAccOn(resGPSDto.getAccOn());
+        bikeInfo.setWheelLocked(resGPSDto.getWheelLocked());
+        bikeInfo.setSeatLocked(resGPSDto.getSeatLocked());
+        bikeInfo.setSpeed(resGPSDto.getSpeed());
+        bikeInfo.setLatestTime(resGPSDto.getLatestTime());
+        ObjectMapper mapper = new ObjectMapper();
+        ObjectNode objectNode = mapper.createObjectNode();
+        objectNode.put("lng",resGPSDto.getLongitude());
+        objectNode.put("lat",resGPSDto.getLatitude());
+        String locationToAddress = geoCodingUtil.getLocationToAddress(objectNode);
+        bikeInfo.setChineseLocation(locationToAddress);
+        return bikeInfo;
     }
 
     EbikeBikeInfo checkBikeCode(String bikeCode) {
diff --git a/ebike-operations/src/main/resources/application-dev.yml b/ebike-operations/src/main/resources/application-dev.yml
index 46a83f1..e750969 100644
--- a/ebike-operations/src/main/resources/application-dev.yml
+++ b/ebike-operations/src/main/resources/application-dev.yml
@@ -114,3 +114,7 @@ minio:
 logging:
   pattern:
     dateformat: yyyy-MM-dd HH:mm:ss
+
+geo-coding:
+  api-url: https://restapi.amap.com/v3/geocode
+  access-key: c9bc51e353b49acd42a560f37121929a