From 9eeb62c02a7b3c7b95c20678b6a9c74e7f12f943 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 01 七月 2026 18:15:10 +0800
Subject: [PATCH] Merge branch '3.0.1' of http://139.186.142.91:10010/r/productDev/parkBike into 3.0.1
---
server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java b/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
index f4643c6..d361e1b 100644
--- a/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
+++ b/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
@@ -11,6 +11,8 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.dingding.DingDingNotice;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.track.RideActiveCache;
+import com.doumee.core.track.RideActiveInfo;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.PositionUtil;
import com.doumee.core.utils.StringTools;
@@ -30,6 +32,7 @@
import com.doumee.dao.business.web.response.UserResponse;
import com.doumee.jtt808.web.endpoint.MessageManager;
import com.doumee.service.business.GoodsorderService;
+import com.doumee.service.business.MemberRidesTrackService;
import com.doumee.service.business.PricingRuleService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
@@ -100,6 +103,12 @@
@Autowired
PricingRuleService pricingRuleService;
+ /** 鐢佃溅娲昏穬璁㈠崟缂撳瓨:寮�閿佸啓 / 杩樿溅鍒� / 浣嶇疆涓婃姤璇�,鍏嶉珮棰戞煡 member_rides */
+ @Autowired
+ private RideActiveCache rideActiveCache;
+ /** 楠戣杞ㄨ抗钀藉簱(浣嶇疆涓婃姤鍛戒腑娲昏穬璁㈠崟鏃跺啓) */
+ @Autowired
+ private MemberRidesTrackService memberRidesTrackService;
public APIResult<T0201_0500> bikeControl(@RequestBody T8500 request) {
Mono<APIResult<T0201_0500>> result = messageManager.requestR(request, T0201_0500.class);
APIResult<T0201_0500> data = result.block();
@@ -177,6 +186,12 @@
rides.setDuration( rideTime > freeRentTime ? rideTime : 0 );
rides.setEditDate(rides.getBackDate());
memberRidesJoinMapper.updateById(rides);//鏇存柊楠戣鐘舵�佷负宸茶繕杞�
+ // 鐢佃溅杩樿溅鈫掑凡杩樿溅:鍒犻櫎娲昏穬璁㈠崟缂撳瓨,鍚庣画涓婃姤涓嶅啀鍐欒璁㈠崟杞ㄨ抗
+ try {
+ rideActiveCache.remove(rides.getBikeCode());
+ } catch (Exception e) {
+ log.warn("鍒犻櫎娲昏穬璁㈠崟缂撳瓨澶辫触 bikeCode={}", rides.getBikeCode(), e);
+ }
}
}
}
@@ -385,6 +400,22 @@
.set( Bikes::getHeartDate,date)
.eq(Bikes::getId,bikes.getId()));
+ // 鐢佃溅浣嶇疆涓婃姤:鏌ユ椿璺冭鍗曠紦瀛�,鍛戒腑鍒欏啓涓�鏉¤建杩�(鍧愭爣鏈夋晥鎵嶅啓);鏁翠綋瀹归敊涓嶉樆鏂綅缃洿鏂颁富娴佺▼
+ if(bike.getLatitude() != null && bike.getLongitude() != null){
+ try {
+ RideActiveInfo active = rideActiveCache.get(bikes.getCode());
+ if(active != null){
+ // 鍛戒腑娲昏穬璁㈠崟:钀藉簱杞ㄨ抗鐐�(缁忕含搴︿负杞崲鍚庣殑楂樺痉 GCJ02,reportTime 涓鸿澶囦笂鎶ユ椂闂�)
+ memberRidesTrackService.record(bikes.getId(), bikes.getCode(),
+ active.getRidesId(), active.getOrderId(),
+ bike.getLongitude(), bike.getLatitude(),
+ DateUtil.getDateFromLocalDateTime(m.getDeviceTime()));
+ }
+ } catch (Exception e) {
+ log.warn("杞ㄨ抗鍐欏叆澶辫触 bikeCode={}", bikes.getCode(), e);
+ }
+ }
+
if(bikes.getVoltage().compareTo(lowVoltage)>=Constants.ZERO
&& bike.getVoltage().compareTo(lowVoltage)<Constants.ZERO){
//鍙戦�侀拤閽夐�氱煡
@@ -477,6 +508,13 @@
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
memberRides.setCloseStatus(Constants.ZERO);
memberRidesJoinMapper.insert(memberRides);
+ // 鐢佃溅寮�閿佹垚鍔熲啋楠戣涓�:鍐欏叆銆岃溅杈嗏啋娲昏穬璁㈠崟銆嶇紦瀛�,渚涘悗缁綅缃笂鎶� O(1) 鍙栬鍗曞啓杞ㄨ抗
+ // 瀹归敊:缂撳瓨鍐欏叆澶辫触涓嶅緱闃绘柇寮�閿佷富娴佺▼
+ try {
+ rideActiveCache.set(memberRides.getBikeCode(), memberRides.getId(), memberRides.getOrdreId());
+ } catch (Exception e) {
+ log.warn("鍐欏叆娲昏穬璁㈠崟缂撳瓨澶辫触 bikeCode={}", memberRides.getBikeCode(), e);
+ }
BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
return memberRidesDetailResponse;
}catch (BusinessException biz){
@@ -526,6 +564,12 @@
memberRides.setEditDate(memberRides.getBackDate());
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
memberRidesJoinMapper.updateById(memberRides);
+ // 涓村仠鎭㈠楠戣:鍒锋柊缂撳瓨(涓村仠鏈熼棿鏈垹,姝ゅ閲嶇疆 TTL 闃蹭复鐣岃繃鏈�)
+ try {
+ rideActiveCache.set(memberRides.getBikeCode(), memberRides.getId(), memberRides.getOrdreId());
+ } catch (Exception e) {
+ log.warn("鍒锋柊娲昏穬璁㈠崟缂撳瓨澶辫触 bikeCode={}", memberRides.getBikeCode(), e);
+ }
}
@@ -626,6 +670,12 @@
rides.setDuration( rideTime > freeRentTime ? rideTime : 0 );
rides.setEditDate(rides.getBackDate());
memberRidesJoinMapper.updateById(rides);//鏇存柊楠戣鐘舵�佷负宸茶繕杞�
+ // 鐢佃溅杩樿溅鈫掑凡杩樿溅(涓村仠瓒呮椂鑷姩杩樿溅):鍒犻櫎娲昏穬璁㈠崟缂撳瓨
+ try {
+ rideActiveCache.remove(rides.getBikeCode());
+ } catch (Exception e) {
+ log.warn("鍒犻櫎娲昏穬璁㈠崟缂撳瓨澶辫触 bikeCode={}", rides.getBikeCode(), e);
+ }
}
}
}
--
Gitblit v1.9.3