From bf64b258bcd21cf158e39f2be80d309ea7aeabc1 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Tue, 15 Apr 2025 10:49:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E8=BD=A6=E8=BE=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ebike/feign/model/rsp/RspBikeInfo.java    | 2 ++
 .../ebikeoperate/service/impl/EbikeRegionServiceImpl.java   | 6 ++++++
 .../com/cdzy/orders/service/impl/UserOrdersServiceImpl.java | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ebike-feign/src/main/java/com/ebike/feign/model/rsp/RspBikeInfo.java b/ebike-feign/src/main/java/com/ebike/feign/model/rsp/RspBikeInfo.java
index 5d983161..1ee4828d 100644
--- a/ebike-feign/src/main/java/com/ebike/feign/model/rsp/RspBikeInfo.java
+++ b/ebike-feign/src/main/java/com/ebike/feign/model/rsp/RspBikeInfo.java
@@ -17,6 +17,8 @@ public class RspBikeInfo {
      */
     private String reginId;
 
+    private Integer soc;
+
     /**
      * 中控ID
      */
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeRegionServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeRegionServiceImpl.java
index 92fc704d..7b5ca751 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeRegionServiceImpl.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeRegionServiceImpl.java
@@ -1,10 +1,12 @@
 package com.cdzy.ebikeoperate.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.cdzy.common.enums.Code;
 import com.cdzy.common.enums.Message;
 import com.cdzy.common.model.JsonResult;
 import com.cdzy.common.model.PageParam;
+import com.cdzy.common.model.ResGPSDto;
 import com.cdzy.ebikeoperate.enums.EbikeRegionInOperation;
 import com.cdzy.ebikeoperate.enums.EbikeRegionType;
 import com.cdzy.ebikeoperate.enums.ShapeType;
@@ -254,6 +256,7 @@ public class EbikeRegionServiceImpl extends ServiceImpl<EbikeRegionMapper, Ebike
     }
 
     private List<RspBikeInfo> getRspBikeInfos(List<RedisPoint> points) {
+        //TODO:优化为点列表+电量，再通过详情接口获取车辆详情
      if (points != null && !points.isEmpty()) {
          List<String> sns = points.stream().map(RedisPoint::getMember).toList();
          JsonResult<List<RspBikeInfo>> bike = maintenanceFeignClient.getBikeByEcuSn(new ReqEcuSnDto(sns));
@@ -266,6 +269,9 @@ public class EbikeRegionServiceImpl extends ServiceImpl<EbikeRegionMapper, Ebike
                  if (redisPoint.getMember().equals(rspBikeInfo.getEcuSn())) {
                      rspBikeInfo.setLongitude(redisPoint.getPoint().getX());
                      rspBikeInfo.setLatitude(redisPoint.getPoint().getY());
+                     String jsonString = JSONObject.toJSONString(redisUtil.get(rspBikeInfo.getEcuSn()));
+                     ResGPSDto resGPSDto = JSONObject.parseObject(jsonString, ResGPSDto.class);
+                     rspBikeInfo.setSoc(resGPSDto.getSoc());
                  }
              });
          }
diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
index 30b947e3..d923f2ad 100644
--- a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
+++ b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
@@ -88,7 +88,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
         if (!pointInOperation){
             throw new RuntimeException("当前车辆再运营区外");
         }
-        //TODO:开锁
+        //TODO:开锁,并且等待结果
 
         userOrders.setBikeId(bikeInfoDto.getBikeId());
         String stringBuilder = resGpsDto.getLongitude() + "," + resGpsDto.getLatitude();