From 84ae873e1c19ca7d2ffc5c98248285706dae818b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 26 六月 2026 18:07:37 +0800
Subject: [PATCH] 功能开发
---
server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java | 132 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 121 insertions(+), 11 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 d66257d..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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
@@ -10,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;
@@ -26,12 +29,16 @@
import com.doumee.dao.business.web.request.LocaltionDTO;
import com.doumee.dao.business.web.request.OpenElecBikeRequest;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
+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;
import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.lang3.StringUtils;
+import org.apache.xpath.operations.Bool;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -55,6 +62,7 @@
import java.util.concurrent.ConcurrentMap;
@Service
+@Slf4j
public class Jtt808Service {
@Value("${tencent.map.remoteHost}")
private String mapHost;
@@ -95,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();
@@ -116,22 +130,27 @@
gparam.setStatus(Constants.goodsorderStatus.pay);
gparam.setType(Constants.ZERO);
Goodsorder goodsorder = goodsorderService.findOne(gparam);
- this.backBike(goodsorder);
+ this.backBike(goodsorder,false);
}
/**
- * 鑷姩杩樿溅
+ * 寮哄埗杩樿溅
* @param id
*/
@Transactional
public void forceBack(String id){
Goodsorder goodsorder = goodsorderService.findById(id);
- this.backBike(goodsorder);
+ this.backBike(goodsorder,true);
}
+ /**
+ * 杩樿溅涓氬姟
+ * @param goodsorder
+ * @param isForce 寮哄埗杩樿溅 涓嶉獙璇佽溅杈嗗湴鐐�
+ */
@Transactional(rollbackFor = {BusinessException.class})
- public void backBike(Goodsorder goodsorder){
+ public void backBike(Goodsorder goodsorder, Boolean isForce){
if(Objects.isNull(goodsorder)){
throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"鏃犻獞琛岃鍗曡褰�");
}
@@ -147,10 +166,14 @@
&&Constants.equalsInteger(rides.getType(),Constants.ONE)){
//濡傛灉鏄數杞﹀苟涓旀槸楠戣涓� 杩涜鍏抽攣澶勭悊
Bikes bike = getElecBikeByCode(rides.getBikeCode());
- //鏌ヨ鍋滆溅绔欑偣淇℃伅
- if(bike.getSiteId() ==null){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇锋寜瑕佹眰鍓嶅線鍋滆溅鐐瑰仠杞︼紒");
+ //闈炲己鍒惰繕杞� 闇�瑕侀檺鍒跺湴鐐�
+ if(!isForce){
+ //鏌ヨ鍋滆溅绔欑偣淇℃伅
+ if(bike.getSiteId() ==null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇锋寜瑕佹眰鍓嶅線鍋滆溅鐐瑰仠杞︼紒");
+ }
}
+
lockBikes(bike.getDeviceSn(),Constants.ONE);//鍙戣捣鍏抽攣鎸囦护璇锋眰
backIds.add(rides.getId());
rides.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());//宸茶繕杞�
@@ -163,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);
+ }
}
}
}
@@ -371,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){
//鍙戦�侀拤閽夐�氱煡
@@ -407,9 +452,13 @@
}
Bikes bike = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda().eq(Bikes::getCode,openElecBikeRequest.getCode()).eq(Bikes::getIsdeleted,Constants.ZERO)
.eq(Bikes::getType,Constants.ONE).last(" limit 1 "));
+
if(bike == null && StringUtils.isBlank(bike.getParamId())){
//濡傛灉杞﹁締绫诲瀷鏄┖
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曪紒");
+ }
+ if(!Constants.equalsInteger(bike.getBikeStatus(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ヨ溅杈嗙姸鎬佸紓甯革紝涓嶆敮鎸佸嚭鍊燂紝璇峰皾璇曟洿鎹㈠叾浠栬溅杈嗭紒");
}
if(!Constants.equalsInteger(bike.getStatus(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ溅杈嗗凡琚攣瀹氬�熺敤锛岃灏濊瘯鏇存崲鍏朵粬杞﹁締锛�");
@@ -459,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){
@@ -508,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);
+ }
}
@@ -608,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);
+ }
}
}
}
@@ -632,11 +700,53 @@
}
}
+ public String updateLockStatusBatch(UserResponse user, List<String> idList, Integer lockStatus) {
+ if(idList ==null && idList.size()==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ String message = "";
+ int sNum =0,eNum=0,ingNum=0;
+ lockStatus = lockStatus==0?0:1;
+ List<Bikes> bikesList = bikesMapper.selectList(new LambdaQueryWrapper<Bikes>()
+ .eq(Bikes::getType,Constants.ONE)
+ .in(Bikes::getIsdeleted,Constants.ZERO)
+ .in(Bikes::getId,idList)
+ );
+ for(Bikes bike: bikesList){
+ if(Constants.equalsInteger(bike.getStatus(),Constants.ONE)){
+ //鍑哄�熶腑
+ ingNum++;
+ continue;
+ }
+ boolean r = true;
+ try {
+ this.lockBikes(bike.getDeviceSn(),lockStatus==0?1:0);
+ }catch (Exception e){
+ log.error(e.getMessage());
+ r =false;
+ eNum++;
+ }
+ if(r){
+ bikesMapper.update(null,new UpdateWrapper<Bikes>().lambda()
+ .set(Bikes::getEditDate,new Date())
+ .set(Bikes::getEditor,user.getId())
+ .set(Bikes::getLockStatus,lockStatus)
+ .set(Bikes::getIsdeleted,Constants.ZERO)
+ .eq(Bikes::getType,Constants.ONE )
+ .eq(Bikes::getId,bike.getId()));
+ sNum++;
+ }
+ }
+ message="鎴愬姛鎿嶄綔["+sNum+"]杈嗙數杞�";
+ if(ingNum>0){
+ message = message+"锛孾"+ingNum+"]杈嗙數杞︽鍑哄�熶腑";
+ }
+ if(eNum>0){
+ message = message+"锛孾"+eNum+"]杈嗙數杞﹁繙绋嬫搷浣滃け璐�";
+ }
+ return message;
+ }
-
-// public void test(double lat,double lng){
-// this.getBackSiteByPostion(lat,lng);
-// }
}
--
Gitblit v1.9.3