From a0e79a5c2830f15cca6ce0dc30a5955395054cc7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 14 二月 2025 16:02:45 +0800
Subject: [PATCH] jtt808初始化
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 448d72e..07efb42 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
@@ -477,6 +477,7 @@
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(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈嗭紒");
}
@@ -604,7 +605,7 @@
//杞﹁締璁板綍
Bikes bikes = dealBikesByParam(model);
//鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
- if(locks.getStatus() == Constants.LockStatus.open){
+ if(Constants.formatIntegerNum(locks.getStatus()) == Constants.LockStatus.open){
//濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
MemberRides memberRides = new MemberRides();
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
@@ -621,7 +622,7 @@
update.setId(memberRides.getId());
//锛堟洿鏂拌姹傚紑閿佷腑鐨勯攣澶村叧鑱旂殑楠戣璁板綍锛�
memberRidesMapper.updateById( update);
- }else if(locks.getStatus() == Constants.LockStatus.closed ){
+ }else if(Constants.formatIntegerNum(locks.getStatus()) == Constants.LockStatus.closed ){
//濡傛灉鏄叧閿佷笟鍔★紝鍒ゆ柇瑙﹀彂杩樿溅
if(StringUtils.isNotBlank(locks.getBikeCode())){
MemberRides mbikes = new MemberRides();
@@ -657,6 +658,10 @@
@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()
@@ -665,10 +670,10 @@
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());
+ 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);
}
@@ -792,7 +797,7 @@
if(Objects.nonNull(sites)){
Sites sites1 = new Sites();
sites1.setId(sites.getId());
- sites1.setLockNum(sites.getLockNum()+1);
+ sites1.setLockNum(Constants.formatIntegerNum(sites.getLockNum())+1);
sitesMapper.updateById(sites1);
}
}else{
--
Gitblit v1.9.3