From f8b9ccf70df347ed40cadb44202e92a9cd812c3d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 09 十一月 2023 10:25:44 +0800
Subject: [PATCH] # 创建修改人
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 80 +++++++++++++++++++++++++++++++---------
1 files changed, 62 insertions(+), 18 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 6126046..31bab54 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
@@ -177,10 +177,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);
@@ -366,7 +368,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());
//璁＄畻楠戣璁¤垂鏃堕暱
@@ -458,17 +460,17 @@
//鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝ｅ父
if (Constants.formatIntegerNum(locks.getStatus())!=Constants.ZERO) {
locks =new Locks();
- locks.setCode(codes[1]);
+ locks.setCode(Constants.formatIntegerFromStr(codes[1]));
locks.setSiteId(codes[0]);
deviceService.getLockInfo(locks);
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠鎵爜閿佸ご鐘舵�侀敊璇紝宸插皾璇曟洿鏂伴攣澶寸姸鎬侊紝璇风◢鍚庨噸璇曪紒");
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈唦");
}
if (StringUtils.isBlank(locks.getBikeCode())) {
locks =new Locks();
- locks.setCode(codes[1]);
+ locks.setCode(Constants.formatIntegerFromStr(codes[1]));
locks.setSiteId(codes[0]);
deviceService.getLockInfo(locks);
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠鎵爜閿佸ご鏃犺溅杈嗕俊鎭紝宸插皾璇曟洿鏂伴攣澶寸姸鎬侊紝璇风◢鍚庨噸璇曪紒");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈嗭紒");
}
MemberRides memberRides = new MemberRides();
//鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规
@@ -576,7 +578,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(),"閿佸ご淇℃伅涓婃姤鍙傛暟閿欒锛�");
}
//鍒ゆ柇妫�鏌ュ鐞嗙珯鐐归攣澶翠俊鎭�
@@ -584,7 +586,7 @@
//杞﹁締璁板綍
Bikes bikes = dealBikesByParam(model);
//鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
- if(model.getStatus() == Constants.LockStatus.open){
+ if(locks.getStatus() == Constants.LockStatus.open){
//濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
MemberRides memberRides = new MemberRides();
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
@@ -601,6 +603,35 @@
update.setId(memberRides.getId());
//锛堟洿鏂拌姹傚紑閿佷腑鐨勯攣澶村叧鑱旂殑楠戣璁板綍锛�
memberRidesMapper.updateById( update);
+ }else if(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;
}
@@ -618,8 +649,9 @@
memberRides.forEach(s->{
Integer between = DateUtil.between(s.getCreateDate(), new Date());
// 澶т簬闃堝��
- if (between > 2){
+ if (between >= 2){
s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
+ s.setEditDate(new Date());
memberRidesMapper.updateById(s);
}
});
@@ -644,12 +676,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();
@@ -751,6 +786,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;
@@ -769,11 +806,16 @@
locks.setCode(bikes.getBackLockId());
locks.setBikeCode(bikes.getBikeCode());
locks.setInfo(bikes.getBackCommondId());
+ locks.setStatus(bikes.getStatus());
//澶勭悊閿佸ご鏁版嵁
mqttLockInfoEvent(locks);
- //鍏嶈垂楠戣鏃堕暱鏌ヨ锛屾暟鎹瓧鍏搁厤缃�
- if(StringUtils.isBlank(bikes.getBikeCode()) ||StringUtils.isBlank(bikes.getBackLockId())||StringUtils.isBlank(bikes.getBackSiteId())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杩樿溅涓婃姤鍙傛暟閿欒锛�");
+ 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<>();
@@ -783,12 +825,14 @@
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