From 6226acca09482447f8591435ccf8771842308a38 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 十一月 2023 11:28:45 +0800
Subject: [PATCH] bug
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 355 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 275 insertions(+), 80 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 d7a7d79..081c45e 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
@@ -36,6 +36,7 @@
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -74,10 +75,13 @@
@Autowired
private SitesMapper sitesMapper;
@Autowired
+ private BaseParamMapper baseParamMapper;
+ @Autowired
private BikesMapper bikesMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
+ @Lazy
private GoodsorderService goodsorderService;
@@ -173,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);
@@ -185,6 +191,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);
@@ -213,10 +228,18 @@
.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());
+// queryWrapper.eq(MemberRides::getBackType, Constants.ZERO);
+ queryWrapper.in(MemberRides::getStatus,
+ Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
queryWrapper
.selectAs(MemberRides::getId,MemberRidesDTO::getId)
.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
@@ -228,12 +251,14 @@
.selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
.selectAs(MemberRides::getRentLockId,MemberRidesDTO::getRentLockId)
.selectAs(MemberRides::getRentSiteId,MemberRidesDTO::getRentSiteId)
- .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
+ .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate)
+ .selectAs(MemberRides::getBackSiteId,MemberRidesDTO::getBackSiteId)
+ .selectAs(MemberRides::getBackLockId,MemberRidesDTO::getBackLockId);
return queryWrapper;
}
@Override
- public String getOnlineBike(String memberId){
+ public MemberRides getOnlineBike(String memberId){
MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>()
.eq("isdeleted", Constants.ZERO)
.eq("member_id",memberId)
@@ -243,7 +268,7 @@
if(Objects.isNull(memberRides)){
return null;
}
- return memberRides.getBikeCode();
+ return memberRides;
}
/**
@@ -263,7 +288,7 @@
throw new BusinessException( ResponseStatus.DATA_EMPTY );
}
if(Constants.formatIntegerNum(model.getStatus()) != Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()||
- Constants.formatIntegerNum(model.getCloseStatus()) != Constants.ONE){
+ Constants.formatIntegerNum(model.getCloseStatus()) != Constants.ZERO){
throw new BusinessException( ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鍙兘閽堝宸茶繕杞︿笖鏈粨绠楃殑鏁版嵁杩涜鎿嶄綔锛�" );
}
if(Constants.formatIntegerNum(memberRides.getDuration()) == Constants.formatIntegerNum(model.getDuration())){
@@ -289,17 +314,17 @@
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);
log.setUserId(user.getId());
log.setUserType(Constants.ONE);
log.setParam(JSONObject.toJSONString(memberRides ));
- log.setType(Constants.ActionLogObjType.memberrides);
+ log.setObjType(Constants.ActionLogObjType.memberrides);
log.setResult(Constants.ZERO);
log.setObjId(model.getId());
- log.setObjType(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getKey());
+ log.setType(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getKey());
log.setContent(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getInfo());
log.setTitle(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getName());
//璁板綍鎿嶄綔鏃ュ織
@@ -328,7 +353,7 @@
}
QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK));
+ .in(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK,Constants.FREE_RENT_TIME));
List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper);
Map<String, SystemDictData> collect = systemDictData.stream().collect(Collectors.toMap(s -> s.getLabel(), s -> s));
@@ -343,29 +368,47 @@
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());
//璁＄畻楠戣璁¤垂鏃堕暱
- update.setDuration(DateUtil.betweenMin(model.getRentDate(), update.getBackDate()));
+ update.setDuration( rideTime > freeRentTime ? rideTime : 0 );
+ //update.setDuration( freeRentTime > 0 ? rideTime - freeRentTime : rideTime);
memberRidesMapper.updateById(update);
//淇敼鍓�
String beforeContent = JSONObject.toJSONString(model);
//淇敼鍚�
String after = JSONObject.toJSONString(update);
+ //鎻掑叆铏氭嫙閿佸ご鍜岀珯鐐逛笂-------
+ Bikes bike = new Bikes();
+ bike.setIsdeleted(Constants.ZERO);
+ bike.setCode(model.getBikeCode());
+ bike.setSiteId(update.getBackSiteId());
+ bike.setLockId(update.getBackLockId());
+ if(bikesMapper.selectCount(new QueryWrapper<>(bike)) == 0){
+ bike.setId(Constants.getUUID());
+ bike.setParamId(model.getParamId());
+ bike.setLastBackDate(model.getRentDate());
+ bike.setStatus(Constants.ZERO);
+ bike.setInfo("寮哄埗杩樿溅缁戝畾");
+ bikesMapper.insert(bike);
+ }
+
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);
log.setUserId(user.getId());
log.setUserType(Constants.ONE);
log.setParam(JSONObject.toJSONString(memberRides ));
- log.setType(Constants.ActionLogObjType.memberrides);
+ log.setObjType(Constants.ActionLogObjType.memberrides);
log.setResult(Constants.ZERO);
log.setObjId(model.getId());
- log.setObjType(Constants.ACTIONLOG_TYPE.FORCE_BACK.getKey());
+ log.setType(Constants.ACTIONLOG_TYPE.FORCE_BACK.getKey());
log.setContent(Constants.ACTIONLOG_TYPE.FORCE_BACK.getInfo());
log.setTitle(Constants.ACTIONLOG_TYPE.FORCE_BACK.getName());
log.setActInfo(memberRides.getBackInfo());
@@ -378,6 +421,9 @@
@Override
public MemberRidesDetailResponse openLock(String code,String memberId) {
+ 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)
@@ -398,16 +444,33 @@
if (memberRidesMapper.selectCount(new QueryWrapper<MemberRides>().eq("member_id", memberId).in("status", 0, 1)) > Constants.ZERO) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪楠戣涓溅杈嗭紝鏃犳硶鎵爜");
}
- Locks locks = locksMapper.selectOne(new QueryWrapper<Locks>().eq("code", code).eq("isdeleted", Constants.ZERO).last("limit 1"));
+ 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(), "鎵爜鏃犳晥锛屾湭鏌ヨ鍒伴攣澶翠俊鎭�");
+// locks =new Locks();
+// locks.setCode(codes[1]);
+// locks.setSiteId(codes[0]);
+// deviceService.getLockInfo(locks);
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛岃绔欑偣閿佸ご鏆備笉鏀寔鍊熷嚭涓氬姟鍝︼紒");
}
//鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝ｅ父
- if (!locks.getStatus().equals(Constants.ZERO)) {
- 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())) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠鎵爜閿佸ご鏃犺溅杈嗕俊鎭紝鏃犳硶杩涜寮�閿�");
+ locks =new Locks();
+ locks.setCode(Constants.formatIntegerFromStr(codes[1]));
+ locks.setSiteId(codes[0]);
+ deviceService.getLockInfo(locks);
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈嗭紒");
}
MemberRides memberRides = new MemberRides();
//鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规
@@ -421,38 +484,22 @@
memberRides.setMemberId(memberId);
memberRides.setCreateDate(new Date());
memberRides.setRentSiteId(locks.getSiteId());
- memberRides.setRentLockId(locks.getId());
+ 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);
- //涓存椂浣跨敤
- Bikes bikes = bikesMapper.selectById(locks.getBikeCode());
- if (Objects.isNull(bikes)) {
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌鑷杞︿俊鎭�");
- }
- memberRides.setBikeCode(bikes.getId());
- memberRides.setParamId(bikes.getParamId());
- memberRides.setRentSiteId(locks.getSiteId());
- memberRides.setRentLockId(locks.getId());
- memberRides.setRentDate(new Date());
- memberRides.setBasePrice(new BigDecimal(3990L));
- memberRides.setBaseTime(1800);
- memberRides.setUnitTime(600);
- memberRides.setUnitPrice(new BigDecimal(1000L));
-
memberRidesMapper.insert(memberRides);
BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
}
-
-
return memberRidesDetailResponse;
}
private boolean isValidePricingType(Locks locks,MemberRides memberRides ) {
Bikes bike= new Bikes();
- bike.setLockId(locks.getId());
+ bike.setLockId(locks.getCode());
bike.setSiteId(locks.getSiteId());
//鏌ヨ杞﹁締淇℃伅
bike = bikesMapper.selectOne(new QueryWrapper<>(bike).last("limit 1"));
@@ -461,7 +508,6 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曪紒");
}
Date date =new Date();
-
QueryWrapper<PricingParam> param = new QueryWrapper<>();
param.lambda().eq(PricingParam::getStatus,Constants.ZERO);
param.lambda().eq(PricingParam::getIsdeleted,Constants.ZERO);
@@ -476,7 +522,8 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曞摝锛�");
}
QueryWrapper<PricingDetail> detail = new QueryWrapper<>();
- detail.lambda().eq(PricingDetail::getPricePramId,bike.getParamId());
+ detail.lambda().eq(PricingDetail::getBikeTypeId,bike.getParamId());
+ detail.lambda().eq(PricingDetail::getPricePramId,pp.getId());
detail.lambda().eq(PricingDetail::getIsdeleted,Constants.ZERO);
detail.lambda().last(" limit 1" ) ;
//鏌ヨ浼樺厛绾ф渶楂橈紙鎺掑簭鐮佹渶灏忕殑锛夊彲鐢ㄩ厤浠锋柟妗�
@@ -488,6 +535,11 @@
Holidays holidays = new Holidays();
holidays.setHoliday(nowDate);
holidays.setIsdeleted(Constants.ZERO);
+ memberRides.setBikeCode(bike.getCode());
+ memberRides.setParamId(bike.getParamId());
+ bike.setLastRentDate(new Date());
+ bike.setStatus(Constants.ONE);
+ bikesMapper.updateById(bike);
//妫�鏌ユ槸鍚﹁妭鍋囨棩
if(holidaysMapper.selectCount(new QueryWrapper<>(holidays)) >0){
//濡傛灉鏄妭鍋囨棩
@@ -516,7 +568,6 @@
MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
return memberRidesDetailResponse;
-
}
/**
@@ -525,54 +576,124 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public int mqttLockInfoEvent(Locks locks){
- if(StringUtils.isBlank(locks.getId()) ||StringUtils.isBlank(locks.getSiteId())){
+ if( locks.getCode() ==null ||StringUtils.isBlank(locks.getSiteId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閿佸ご淇℃伅涓婃姤鍙傛暟閿欒锛�");
}
//鍒ゆ柇妫�鏌ュ鐞嗙珯鐐归攣澶翠俊鎭�
Locks model = dealLockAndSite(locks);
//杞﹁締璁板綍
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());
- memberRides.setRentLockId(model.getId());
+ memberRides.setRentLockId(model.getCode());
+ memberRides.setRentSiteId(model.getSiteId());
memberRides.setIsdeleted(Constants.ZERO);
memberRides = findOne(memberRides);
if(memberRides == null){
return 0;
}
+ MemberRides update = new MemberRides();
+ update.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
+ update.setEditDate(new Date());
+ update.setId(memberRides.getId());
//锛堟洿鏂拌姹傚紑閿佷腑鐨勯攣澶村叧鑱旂殑楠戣璁板綍锛�
- memberRidesMapper.updateById( memberRides);
+ 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;
}
+
+ @Override
+ public void autoRefreshLockStatus() {
+
+ 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.between(s.getCreateDate(), new Date());
+ // 澶т簬闃堝��
+ if (between > 2){
+ s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
+ s.setEditDate(new Date());
+ memberRidesMapper.updateById(s);
+ }
+ });
+ }
+ }
+
private Bikes dealBikesByParam(Locks model) {
+ if(StringUtils.isNotBlank(model.getBikeCode())){
+ UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.lambda().set(Bikes::getCode, null );
+ updateWrapper.lambda().set(Bikes::getParamId, null );
+ updateWrapper.lambda().set(Bikes::getEditDate, new Date() );
+ updateWrapper.lambda().eq(Bikes::getCode, model.getBikeCode() );
+ //娓呯┖鍘熸潵鐨勮嚜琛岃溅缁戝畾鍏崇郴
+ bikesMapper.update(null, updateWrapper);
+ }
+
QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(Bikes::getLockId, model.getId());
+ wrapper.lambda().eq(Bikes::getLockId, model.getCode());
wrapper.lambda().eq(Bikes::getSiteId, model.getSiteId());
- Bikes bikes = bikesMapper.selectOne(wrapper.last("last 1"));
+ Bikes bikes = bikesMapper.selectOne(wrapper.last("limit 1"));
if(bikes != null ) {
- if ( StringUtils.equals(model.getBikeCode(), bikes.getCode())){
+ if ( !StringUtils.equals(model.getBikeCode(), bikes.getCode())){
//濡傛灉缁戝畾杞﹁締淇℃伅鍙戠敓缂栧彿锛屾洿鎹㈢粦瀹氬叧绯�
+ String type =getBileTypeByCode(model.getBikeCode());
UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
- updateWrapper.lambda().set(Bikes::getId, bikes.getId());
+ 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.updateById(bikes);
+ bikesMapper.update(null,updateWrapper);
+ bikes.setCode(model.getBikeCode());
+ bikes.setParamId(model.getBikeType());
}
}else{
bikes = new Bikes();
bikes.setId(Constants.getUUID());
bikes.setIsdeleted(Constants.ZERO);
bikes.setCreateDate(new Date());
+ bikes.setEditDate(bikes.getCreateDate());
bikes.setSiteId(model.getSiteId());
- bikes.setLockId(model.getId());
+ bikes.setLockId(model.getCode());
bikes.setCode(model.getBikeCode());
bikes.setParamId(getBileTypeByCode(model.getBikeCode()));
bikesMapper.insert(bikes);
@@ -581,32 +702,66 @@
}
- //TODO-----JP------------鏍规嵁杞﹁締code鍒嗘瀽杞﹁締绫诲瀷锛屽緟纭鏂规-------------------
+ /**
+ -----------鏍规嵁杞﹁締code鍒嗘瀽杞﹁締绫诲瀷锛屽緟纭鏂规-------------------
+ *
+ */
private String getBileTypeByCode(String bikeCode) {
- return null;
+// int temp=1+(int)(Math.random()*(8));
+ if(StringUtils.isBlank(bikeCode)){
+ return null;
+ }
+ String type = bikeCode.substring(0,1);
+ if(!Constants.BIKE_TYPE.contains(type)){
+ return null;
+ }
+ BaseParam param = new BaseParam();
+ param.setIsdeleted(Constants.ZERO);
+ param.setType(Constants.THREE);
+ param.setSortnum(Integer.parseInt(type));
+ param = baseParamMapper.selectOne(new QueryWrapper<>(param).lambda().last("limit 1" ));
+ if(param == null){
+ return type;
+ }
+ return param.getId();
}
private Locks dealLockAndSite(Locks locks) {
- Locks model = locksMapper.selectById(locks.getId());
+ Locks model = new Locks();
+ model.setSiteId(locks.getSiteId());
+ model.setCode(locks.getCode());
+ model = locksMapper.selectOne(new QueryWrapper<>(model).last("limit 1"));
Date date =new Date();
//妫�鏌ョ珯鐐逛俊鎭紝涓嶅瓨鍦ㄥ垯鏂板
Sites sites = sitesMapper.selectById(locks.getSiteId());
+
if(sites == null){
sites = new Sites();
sites.setIsdeleted(Constants.ZERO);
sites.setCode(locks.getSiteId());
sites.setId(locks.getSiteId());
sites.setCreateDate(date);
+ sites.setEditDate(date);
sites.setStatus(Constants.ZERO);
+ sites.setEditDate(date);
sites.setLockNum(1);
+ sites.setLastLinkDate(date);
//鏂板閿佸ご
sitesMapper.insert(sites);
+ }
+ if(StringUtils.isNotBlank(locks.getBikeCode())){
+ UpdateWrapper<Locks> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.lambda().set(Locks::getBikeCode, null );
+ updateWrapper.lambda().set(Locks::getEditDate, new Date() );
+ updateWrapper.lambda().eq(Locks::getBikeCode, locks.getBikeCode() );
+ //娓呯┖鍘熸潵鐨勮嚜琛岃溅缁戝畾鍏崇郴
+ locksMapper.update(null, updateWrapper);
}
if(model == null){
//濡傛灉閿佸ご涓嶅瓨鍦紝鍒ゆ柇瀛樺偍
model = new Locks();
- model.setId(locks.getId());
+ model.setId(Constants.getUUID());
model.setSiteId(locks.getSiteId());
model.setIsdeleted(Constants.ZERO);
model.setCode(locks.getCode());
@@ -615,16 +770,24 @@
model.setCreateDate(date);
model.setStatus(locks.getStatus());
locksMapper.insert(model);
+ //鏇存柊 绔欑偣閿佸ご鏁伴噺
+ if(Objects.nonNull(sites)){
+ Sites sites1 = new Sites();
+ sites1.setId(sites.getId());
+ sites1.setLockNum(sites.getLockNum()+1);
+ sitesMapper.updateById(sites1);
+ }
}else{
- model.setSiteId(locks.getSiteId());
- model.setIsdeleted(Constants.ZERO);
- model.setCode(locks.getCode());
- model.setId(locks.getSiteId());
- model.setEditDate(date);
- model.setBikeCode(locks.getBikeCode());
+ UpdateWrapper<Locks> updateWrapper = new UpdateWrapper<Locks>();
+ updateWrapper.lambda().eq(Locks::getCode, locks.getCode() );
+ updateWrapper.lambda().eq(Locks::getSiteId, locks.getSiteId() );
+ updateWrapper.lambda().set(Locks::getBikeCode, locks.getBikeCode() );
+ updateWrapper.lambda().set(Locks::getStatus, locks.getStatus() );
+ updateWrapper.lambda().set(Locks::getEditDate, new Date() );
+ updateWrapper.lambda().set(Locks::getIsdeleted, Constants.ZERO);
+ locksMapper.update(null,updateWrapper);
model.setStatus(locks.getStatus());
- locksMapper.update(null, new QueryWrapper<>(model));
-
+ model.setBikeCode(locks.getBikeCode());
}
model.setSites(sites);
return model;
@@ -636,28 +799,43 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public int mqttCloseBikeEvent(MemberRides bikes){
- //鍏嶈垂楠戣鏃堕暱鏌ヨ锛屾暟鎹瓧鍏搁厤缃�
- if(StringUtils.isBlank(bikes.getBikeCode()) ||StringUtils.isBlank(bikes.getRentLockId())){
- 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("last 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) {
-
int freeTime = 0;
try {
freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
@@ -671,10 +849,27 @@
update.setBackLockId(param.getBackLockId());
update.setBackSiteId(param.getBackSiteId());
update.setBackCommondId(param.getBackCommondId());
- int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime;
+// int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime;
+ int min = DateUtil.betweenMin(memberRides.getRentDate(),date);//瀹為檯楠戣鏃堕棿
+ int duration = min>freeTime?min:0;
update.setDuration(duration>0?duration:0);
update.setBackType(Constants.ONE);
update.setBackInfo("鐢ㄦ埛姝ｅ父杩樿溅");
+ update.setId(memberRides.getId());
+
+ Bikes bikes = new Bikes();
+ bikes.setSiteId(memberRides.getBackSiteId());
+ bikes.setLockId(memberRides.getBackLockId());
+// bikes.setCode(memberRides.getBikeCode());
+ bikes = bikesMapper.selectOne(new QueryWrapper<>(bikes).last("limit 1"));
+ if(bikes != null ) {
+ UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
+ updateWrapper.lambda().set(Bikes::getEditDate,new Date());
+ updateWrapper.lambda().set(Bikes::getLastBackDate,new Date());
+ //鏇存柊鑷杞︽渶鍚庤繕杞︽椂闂�
+ bikesMapper.update(null,updateWrapper);
+ }
//鏇存柊杩樿溅璁板綍涓哄凡杩樿溅
memberRidesMapper.updateById(update);
}
--
Gitblit v1.9.3