From 000c62b9a5b19197fcd93db6382841cedb0c4537 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 17 二月 2025 18:37:27 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 290 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 213 insertions(+), 77 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index ee172b3..1302e95 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -40,9 +40,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.ConcurrentReferenceHashMap;
import java.math.BigDecimal;
import java.util.*;
+import java.util.concurrent.ConcurrentMap;
import java.util.stream.Collectors;
/**
@@ -177,10 +179,12 @@
public MemberRides findJoinById(String id) {
MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId);
+ queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
+ .leftJoin(Member.class,Member::getId,MemberRides::getMemberId);
queryWrapper.eq(MemberRides::getId, id);
queryWrapper.selectAll(MemberRides.class);
- queryWrapper.selectAs(BaseParam::getName,MemberRidesDTO::getBikeType) ;
+ queryWrapper.selectAs(BaseParam::getName,MemberRidesDTO::getBikeType);
+ queryWrapper.selectAs(Member::getOpenid,MemberRides::getMemberOpenid);
queryWrapper.last("limit 1");
return memberRidesJoinMapper.selectJoinOne(MemberRides.class, queryWrapper);
@@ -189,6 +193,15 @@
public PageData<BikeLogDTO> findBikeLog(PageWrap<MemberRidesQuery> pageWrap) {
IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<MemberRides> queryWrapper = initQueryParamByModel(pageWrap.getModel());
+ MemberRidesQuery model = pageWrap.getModel();
+ //宸茶繕杞�
+ if (Objects.nonNull(model.getHasBack()) && model.getHasBack()){
+ queryWrapper.eq(MemberRides::getStatus,Constants.TWO);
+ }
+ //鏈綊杩樼殑
+ if (Objects.nonNull(model.getHasBack()) && !model.getHasBack()){
+ queryWrapper.eq(MemberRides::getStatus,Constants.ONE);
+ }
IPage<BikeLogDTO> bikeLogDTOIPage = memberRidesJoinMapper.selectJoinPage(page, BikeLogDTO.class, queryWrapper);
initBikeLogObj(bikeLogDTOIPage.getRecords());
return PageData.from(bikeLogDTOIPage);
@@ -217,8 +230,12 @@
.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
.like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid())
.like(StringUtils.isNotBlank(model.getBikeCode()),MemberRides::getBikeCode,model.getBikeCode());
- queryWrapper.ge(model.getRentDateStart()!=null, MemberRides::getRentDate,model.getRentDateStart());
- queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
+ if (Objects.nonNull(model.getStartDate())) {
+ queryWrapper.ge(MemberRides::getRentDate, Utils.Date.getStart(model.getStartDate()));
+ }
+ if (Objects.nonNull(model.getEndDate())) {
+ queryWrapper.le(MemberRides::getRentDate, Utils.Date.getEnd(model.getEndDate()));
+ }
queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
queryWrapper.eq(model.getStatus()!=null,MemberRides::getStatus, model.getStatus());
queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
@@ -227,6 +244,8 @@
Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
queryWrapper
.selectAs(MemberRides::getId,MemberRidesDTO::getId)
+ .selectAs(MemberRides::getDiscountPrice,MemberRidesDTO::getDiscountPrice)
+ .selectAs(MemberRides::getType,MemberRidesDTO::getType)
.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
.selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
.selectAs(MemberRides::getCloseStatus,MemberRidesDTO::getCloseStatus)
@@ -299,7 +318,7 @@
log.setActInfo(memberRides.getBackInfo());
log.setActReason(memberRides.getBackReason());
log.setIsdeleted(Constants.ZERO);
- log.setCreateDate(update.getBackDate());
+ log.setCreateDate(new Date());
log.setCreator(user.getId());
log.setBeforeContent(beforeContent);
log.setAfterContent(after);
@@ -353,7 +372,7 @@
update.setBackType(Constants.ONE);
update.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());
update.setBackSiteId(collect.get(Constants.FORCE_BACK_SITE).getCode());
- update.setBackLockId(collect.get(Constants.FORCE_BACK_LOCK).getCode());
+ update.setBackLockId(Constants.formatIntegerFromStr(collect.get(Constants.FORCE_BACK_LOCK).getCode()));
Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode());
Integer rideTime = DateUtil.betweenMin(model.getRentDate(), update.getBackDate());
//璁＄畻楠戣璁¤垂鏃堕暱
@@ -369,6 +388,7 @@
Bikes bike = new Bikes();
bike.setIsdeleted(Constants.ZERO);
bike.setCode(model.getBikeCode());
+ bike.setType(model.getType());
bike.setSiteId(update.getBackSiteId());
bike.setLockId(update.getBackLockId());
if(bikesMapper.selectCount(new QueryWrapper<>(bike)) == 0){
@@ -376,6 +396,7 @@
bike.setParamId(model.getParamId());
bike.setLastBackDate(model.getRentDate());
bike.setStatus(Constants.ZERO);
+ bike.setType(Constants.ZERO);
bike.setInfo("寮哄埗杩樿溅缁戝畾");
bikesMapper.insert(bike);
}
@@ -383,7 +404,7 @@
ActionLog log = new ActionLog();
log.setId(Constants.getUUID());
log.setIsdeleted(Constants.ZERO);
- log.setCreateDate(update.getBackDate());
+ log.setCreateDate(new Date());
log.setCreator(user.getId());
log.setBeforeContent(beforeContent);
log.setAfterContent(after);
@@ -403,71 +424,100 @@
}
+ public ConcurrentMap<String,Integer> cacheOpenLock = new ConcurrentReferenceHashMap<>();
@Override
public MemberRidesDetailResponse openLock(String code,String memberId) {
- if(StringUtils.isBlank(code) || code.split("/").length != 2){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇ョ珯鐐圭紪鍙蜂笉瀛樺湪锛岃灏濊瘯鏇存崲杞﹁締锛�");
+ if(Constants.formatIntegerNum(cacheOpenLock.get(code)) == 1){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ溅杈嗗凡琚攣瀹氬�熺敤锛岃灏濊瘯鏇存崲鍏朵粬杞﹁締锛�");
}
- //鍒ゆ柇褰撳墠鏄惁宸叉敮浠樻娂閲�
- Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>()
- .eq("isdeleted", Constants.ZERO)
- .eq("status", Constants.goodsorderStatus.pay)
- .eq("member_id", memberId)
- .orderByDesc("create_date")
- .last("limit 1"));
- if (Objects.isNull(goodsorder)) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏈敮浠樻娂閲戯紝鏃犳硶杩涜璇ユ搷浣滐紒");
+ cacheOpenLock.put(code, 1);
+ try {
+ if(StringUtils.isBlank(code) || code.split("/").length != 2){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇ョ珯鐐圭紪鍙蜂笉瀛樺湪锛岃灏濊瘯鏇存崲杞﹁締锛�");
+ }
+ //鍒ゆ柇褰撳墠鏄惁宸叉敮浠樻娂閲�
+ Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>()
+ .eq("isdeleted", Constants.ZERO)
+ .eq("status", Constants.goodsorderStatus.pay)
+ .eq("member_id", memberId)
+ .orderByDesc("create_date")
+ .last("limit 1"));
+ if (Objects.isNull(goodsorder)) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏈敮浠樻娂閲戯紝鏃犳硶杩涜璇ユ搷浣滐紒");
+ }
+ //鍒ゆ柇褰撳墠鎶奸噾璁㈠崟鏄惁涓轰粖鏃ユ娂閲�
+ if (!DateUtil.DateToStr(goodsorder.getPayDate(), "yyyy-MM-dd").equals(DateUtil.getDate(new Date(), "yyyy-MM-dd"))) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "闈炰粖鏃ユ娂閲戣鍗曪紝璇风粨绠楀悗閲嶆柊鏀粯锛�");
+ }
+ //鍒ゆ柇鏄惁澶勪簬钀ヤ笟鏃堕棿
+ goodsorderService.checkBusiness();
+ //鏌ヨ鏄惁澶勪簬楠戣涓�
+ if (memberRidesMapper.selectCount(new QueryWrapper<MemberRides>().eq("member_id", memberId).in("status", 0, 1)) > Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪楠戣涓溅杈嗭紝鏃犳硶鎵爜");
+ }
+ String[] codes = code.split("/");
+ Locks locks = locksMapper.selectOne(new QueryWrapper<Locks>()
+ .lambda().eq(Locks::getCode, codes[1])
+ .eq(Locks::getSiteId, codes[0])
+ .eq(Locks::getIsdeleted, Constants.ZERO)
+ .last("limit 1"));
+ if (Objects.isNull(locks)) {
+// locks =new Locks();
+// locks.setCode(codes[1]);
+// locks.setSiteId(codes[0]);
+// deviceService.getLockInfo(locks);
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛岃绔欑偣閿佸ご鏆備笉鏀寔鍊熷嚭涓氬姟鍝︼紒");
+ }
+ //鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝ｅ父
+ if (Constants.formatIntegerNum(locks.getStatus())!=Constants.ZERO) {
+ locks =new Locks();
+ locks.setCode(Constants.formatIntegerFromStr(codes[1]));
+ locks.setSiteId(codes[0]);
+ deviceService.getLockInfo(locks);
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈唦");
+ }
+ if (StringUtils.isBlank(locks.getBikeCode())) {
+ locks =new Locks();
+ locks.setCode(Constants.formatIntegerFromStr(codes[1]));
+ locks.setSiteId(codes[0]);
+ locks.setId(codes[1]);
+ deviceService.getLockInfo(locks);
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈嗭紒");
+ }
+ MemberRides memberRides = new MemberRides();
+ //鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规
+ isValidePricingType(locks,memberRides) ;
+ MqttLog flag = deviceService.openLock(locks);
+ MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
+ if (flag.getResult() == 0) {
+ //瀛樺偍楠戣璁板綍
+ memberRides.setId(Constants.getUUID());
+ memberRides.setIsdeleted(Constants.ZERO);
+ memberRides.setMemberId(memberId);
+ memberRides.setCreateDate(new Date());
+ memberRides.setRentSiteId(locks.getSiteId());
+ memberRides.setRentLockId(locks.getCode());
+ memberRides.setOrdreId(goodsorder.getId());
+ memberRides.setRentDate(new Date());
+ memberRides.setType(Constants.ZERO);
+ memberRides.setBalance(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
+ memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
+ memberRides.setCloseStatus(Constants.ZERO);
+ memberRidesMapper.insert(memberRides);
+ BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈唦");
+ }
+ return memberRidesDetailResponse;
+ }catch (BusinessException biz){
+ throw biz;
+ }catch (Exception biz){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR);
+ }finally {
+ cacheOpenLock.remove(code);
}
- //鍒ゆ柇褰撳墠鎶奸噾璁㈠崟鏄惁涓轰粖鏃ユ娂閲�
- if (!DateUtil.DateToStr(goodsorder.getPayDate(), "yyyy-MM-dd").equals(DateUtil.getDate(new Date(), "yyyy-MM-dd"))) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "闈炰粖鏃ユ娂閲戣鍗曪紝璇风粨绠楀悗閲嶆柊鏀粯锛�");
- }
- //鍒ゆ柇鏄惁澶勪簬钀ヤ笟鏃堕棿
- goodsorderService.checkBusiness();
- //鏌ヨ鏄惁澶勪簬楠戣涓�
- if (memberRidesMapper.selectCount(new QueryWrapper<MemberRides>().eq("member_id", memberId).in("status", 0, 1)) > Constants.ZERO) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪楠戣涓溅杈嗭紝鏃犳硶鎵爜");
- }
- String[] codes = code.split("/");
- Locks locks = locksMapper.selectOne(new QueryWrapper<Locks>()
- .lambda().eq(Locks::getCode, codes[1])
- .eq(Locks::getSiteId, codes[0])
- .eq(Locks::getIsdeleted, Constants.ZERO)
- .last("limit 1"));
- if (Objects.isNull(locks)) {
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛屾湭鏌ヨ鍒伴攣澶翠俊鎭�");
- }
- //鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝ｅ父
- if (Constants.formatIntegerNum(locks.getStatus())!=Constants.ZERO) {
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠鎵爜閿佸ご鐘舵�侀敊璇紝鏃犳硶杩涜寮�閿�");
- }
- if (StringUtils.isBlank(locks.getBikeCode())) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠鎵爜閿佸ご鏃犺溅杈嗕俊鎭紝鏃犳硶杩涜寮�閿�");
- }
- MemberRides memberRides = new MemberRides();
- //鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规
- isValidePricingType(locks,memberRides) ;
- MqttLog flag = deviceService.openLock(locks);
- MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
- if (flag.getResult() == 0) {
- //瀛樺偍楠戣璁板綍
- memberRides.setId(Constants.getUUID());
- memberRides.setIsdeleted(Constants.ZERO);
- memberRides.setMemberId(memberId);
- memberRides.setCreateDate(new Date());
- memberRides.setRentSiteId(locks.getSiteId());
- memberRides.setRentLockId(locks.getCode());
- memberRides.setOrdreId(goodsorder.getId());
- memberRides.setRentDate(new Date());
- memberRides.setBalance(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
- memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
- memberRides.setCloseStatus(Constants.ZERO);
- memberRidesMapper.insert(memberRides);
- BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
- }
- return memberRidesDetailResponse;
}
private boolean isValidePricingType(Locks locks,MemberRides memberRides ) {
@@ -551,7 +601,7 @@
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public int mqttLockInfoEvent(Locks locks){
- if(StringUtils.isBlank(locks.getCode()) ||StringUtils.isBlank(locks.getSiteId())){
+ if( locks.getCode() ==null ||StringUtils.isBlank(locks.getSiteId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閿佸ご淇℃伅涓婃姤鍙傛暟閿欒锛�");
}
//鍒ゆ柇妫�鏌ュ鐞嗙珯鐐归攣澶翠俊鎭�
@@ -559,7 +609,7 @@
//杞﹁締璁板綍
Bikes bikes = dealBikesByParam(model);
//鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
- if(model.getStatus() == Constants.LockStatus.open){
+ if(Constants.formatIntegerNum(locks.getStatus()) == Constants.LockStatus.open){
//濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
MemberRides memberRides = new MemberRides();
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
@@ -576,8 +626,63 @@
update.setId(memberRides.getId());
//锛堟洿鏂拌姹傚紑閿佷腑鐨勯攣澶村叧鑱旂殑楠戣璁板綍锛�
memberRidesMapper.updateById( update);
+ }else if(Constants.formatIntegerNum(locks.getStatus()) == Constants.LockStatus.closed ){
+ //濡傛灉鏄叧閿佷笟鍔★紝鍒ゆ柇瑙﹀彂杩樿溅
+ if(StringUtils.isNotBlank(locks.getBikeCode())){
+ MemberRides mbikes = new MemberRides();
+ mbikes.setBackLockId(locks.getCode());
+ mbikes.setBackSiteId(locks.getSiteId());
+ mbikes.setBikeCode(locks.getBikeCode());
+ mqttCloseBikeEventDo(mbikes);
+ /* if(StringUtils.isBlank(locks.getBikeCode()) ||StringUtils.isBlank(locks.getCode())
+ ||StringUtils.isBlank(bikes.getSiteId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杩樿溅涓婃姤鍙傛暟閿欒锛�");
+ }
+ QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
+ List<Integer> statusList = new ArrayList<>();
+ statusList.add(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
+ statusList.add(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
+ wrapper.lambda().eq(MemberRides::getBikeCode, locks.getBikeCode());
+ wrapper.lambda().in(MemberRides::getStatus, statusList);
+ wrapper.lambda().eq(MemberRides::getIsdeleted, Constants.ZERO);
+ //鏍规嵁杞﹁締缂栫爜鏌ヨ楠戣涓殑楠戣璁板綍淇℃伅锛屽鏋滄湁杩涜杩樿溅鎿嶄綔
+ List<MemberRides> list = memberRidesMapper.selectList(wrapper);
+// MemberRides memberRides = memberRidesMapper.selectOne(wrapper.last("limit 1"));
+ if(list!=null){
+ //杩涜
+ for(MemberRides memberRides : list){
+ dealMemberRidesBack(memberRides,bikes);
+ }
+ }*/
+ }
}
return 0;
+ }
+
+
+ @Override
+ public void autoRefreshLockStatus() {
+// memberRidesMapper.update(null,new UpdateWrapper<MemberRides>().lambda()
+// .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING.getKey())
+// .apply("" )
+// .set(MemberRides::getStatus, Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey()))
+
+ QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING.getKey())
+ .eq(MemberRides::getIsdeleted,Constants.ZERO);
+ List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper);
+ if (!CollectionUtils.isEmpty(memberRides)){
+ memberRides.forEach(s->{
+ Integer between = DateUtil.betweenSeconds(s.getCreateDate(), new Date());
+ // 澶т簬闃堝��,鑷姩璁句负寮�閿佹垚鍔燂紙濡傚疄闄呮湭寮�閿侊紝鑱旂郴绔欑偣绠＄悊鍛樺悗鍙拌繘琛屽己鍒惰繕杞︽搷浣滐級
+ if (between >= 20){
+ s.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
+ s.setEditDate(new Date());
+ memberRidesMapper.updateById(s);
+ }
+ });
+ }
}
private Bikes dealBikesByParam(Locks model) {
@@ -598,12 +703,15 @@
if(bikes != null ) {
if ( !StringUtils.equals(model.getBikeCode(), bikes.getCode())){
//濡傛灉缁戝畾杞﹁締淇℃伅鍙戠敓缂栧彿锛屾洿鎹㈢粦瀹氬叧绯�
+ String type =getBileTypeByCode(model.getBikeCode());
UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
updateWrapper.lambda().set(Bikes::getCode,model.getBikeCode());
- updateWrapper.lambda().set(Bikes::getParamId,getBileTypeByCode(model.getBikeCode()));
+ updateWrapper.lambda().set(Bikes::getParamId,type);
//鏇存柊鑷绔欑偣閿佸ご缁戝畾鑷杞︿俊鎭�
bikesMapper.update(null,updateWrapper);
+ bikes.setCode(model.getBikeCode());
+ bikes.setParamId(model.getBikeType());
}
}else{
bikes = new Bikes();
@@ -613,6 +721,7 @@
bikes.setEditDate(bikes.getCreateDate());
bikes.setSiteId(model.getSiteId());
bikes.setLockId(model.getCode());
+ bikes.setType(Constants.ZERO);
bikes.setCode(model.getBikeCode());
bikes.setParamId(getBileTypeByCode(model.getBikeCode()));
bikesMapper.insert(bikes);
@@ -664,6 +773,7 @@
sites.setStatus(Constants.ZERO);
sites.setEditDate(date);
sites.setLockNum(1);
+ sites.setLastLinkDate(date);
//鏂板閿佸ご
sitesMapper.insert(sites);
}
@@ -688,6 +798,13 @@
model.setCreateDate(date);
model.setStatus(locks.getStatus());
locksMapper.insert(model);
+ //鏇存柊 绔欑偣閿佸ご鏁伴噺
+ if(Objects.nonNull(sites)){
+ Sites sites1 = new Sites();
+ sites1.setId(sites.getId());
+ sites1.setLockNum(Constants.formatIntegerNum(sites.getLockNum())+1);
+ sitesMapper.updateById(sites1);
+ }
}else{
UpdateWrapper<Locks> updateWrapper = new UpdateWrapper<Locks>();
updateWrapper.lambda().eq(Locks::getCode, locks.getCode() );
@@ -697,6 +814,8 @@
updateWrapper.lambda().set(Locks::getEditDate, new Date() );
updateWrapper.lambda().set(Locks::getIsdeleted, Constants.ZERO);
locksMapper.update(null,updateWrapper);
+ model.setStatus(locks.getStatus());
+ model.setBikeCode(locks.getBikeCode());
}
model.setSites(sites);
return model;
@@ -710,21 +829,38 @@
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public int mqttCloseBikeEvent(MemberRides bikes){
- //鍏嶈垂楠戣鏃堕暱鏌ヨ锛屾暟鎹瓧鍏搁厤缃�
- if(StringUtils.isBlank(bikes.getBikeCode()) ||StringUtils.isBlank(bikes.getBackLockId())||StringUtils.isBlank(bikes.getBackSiteId())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杩樿溅涓婃姤鍙傛暟閿欒锛�");
+ Locks locks = new Locks();
+ locks.setSiteId(bikes.getBackSiteId());
+ locks.setCode(bikes.getBackLockId());
+ locks.setBikeCode(bikes.getBikeCode());
+ locks.setInfo(bikes.getBackCommondId());
+ locks.setStatus(bikes.getStatus());
+ //澶勭悊閿佸ご鏁版嵁
+ mqttLockInfoEvent(locks);
+ mqttCloseBikeEventDo(bikes);
+ return 0;
+ }
+
+ private void mqttCloseBikeEventDo(MemberRides bikes) {
+ if(StringUtils.isBlank(bikes.getBikeCode()) || bikes.getBackLockId() == null ||StringUtils.isBlank(bikes.getBackSiteId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杩樿溅涓婃姤鍙傛暟閿欒锛�");
}
QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
+ List<Integer> statusList = new ArrayList<>();
+ statusList.add(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
+ statusList.add(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
wrapper.lambda().eq(MemberRides::getBikeCode, bikes.getBikeCode());
- wrapper.lambda().eq(MemberRides::getStatus, Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
+ wrapper.lambda().in(MemberRides::getStatus, statusList);
wrapper.lambda().eq(MemberRides::getIsdeleted, Constants.ZERO);
//鏍规嵁杞﹁締缂栫爜鏌ヨ楠戣涓殑楠戣璁板綍淇℃伅锛屽鏋滄湁杩涜杩樿溅鎿嶄綔
- MemberRides memberRides = memberRidesMapper.selectOne(wrapper.last("limit 1"));
- if(memberRides!=null){
+ List<MemberRides> list = memberRidesMapper.selectList(wrapper);
+// MemberRides memberRides = memberRidesMapper.selectOne(wrapper.last("limit 1"));
+ if(list!=null){
//杩涜
- dealMemberRidesBack(memberRides,bikes);
+ for(MemberRides memberRides : list){
+ dealMemberRidesBack(memberRides,bikes);
+ }
}
- return 0;
}
private void dealMemberRidesBack(MemberRides memberRides,MemberRides param) {
--
Gitblit v1.9.3