From 1b0085be0e026847f91c460affb6191c286de883 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 十月 2023 19:00:56 +0800
Subject: [PATCH] bug
---
server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 3 +++
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 7 ++++---
server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java | 4 +++-
server/services/src/main/java/com/doumee/core/model/LoginUserInfo.java | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/model/LoginUserInfo.java b/server/services/src/main/java/com/doumee/core/model/LoginUserInfo.java
index 463d292..b57dea6 100644
--- a/server/services/src/main/java/com/doumee/core/model/LoginUserInfo.java
+++ b/server/services/src/main/java/com/doumee/core/model/LoginUserInfo.java
@@ -21,7 +21,7 @@
*/
@Data
public class LoginUserInfo implements Serializable {
-
+ private static final long serialVersionUID = -5021804768443600712l;
@ApiModelProperty(value = "缂栧彿")
private String id ;// 缂栧彿
diff --git a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
index 4388eaa..faadb29 100644
--- a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -3011,6 +3011,9 @@
* @return
*/
public static Integer betweenMin(Date begin, Date end) {
+ if(begin ==null || end == null){
+ return 0;
+ }
long createTime =begin.getTime();//鑾峰彇鍒涘缓鏃堕棿鐨勬椂闂存埑
long currentTime =Objects.isNull(end)?System.currentTimeMillis():end.getTime();//鑾峰彇褰撳墠鏃堕棿鐨勬椂闂存埑
long diff=(currentTime-createTime)/1000/60;//鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勫垎閽�
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java
index 75517d7..ef6b9f6 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java
@@ -90,10 +90,12 @@
log.info("mqtt娑堟伅璁㈤槄=========杩樿溅==========鎴愬姛");
}
}catch (BusinessException e){
+ e.printStackTrace();
logInfo = "mqtt娑堟伅璁㈤槄閿欒==="+e.getMessage();
result =1;
}catch (Exception e){
- logInfo = "mqtt娑堟伅璁㈤槄寮傚父===";
+ e.printStackTrace();
+ logInfo = "mqtt娑堟伅璁㈤槄寮傚父==="+e.getMessage();
result =1;
}
createSubLog(topic,msgId,logId,result,param,logInfo);
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 4a85145..b498189 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
@@ -725,19 +725,20 @@
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.selectById(new QueryWrapper<>(bikes).last("limit 1"));
+ bikes = bikesMapper.selectOne(new QueryWrapper<>(bikes).last("limit 1"));
if(bikes != null ) {
UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
- updateWrapper.lambda().set(Bikes::getId, bikes.getId());
+ updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
updateWrapper.lambda().set(Bikes::getEditDate,new Date());
updateWrapper.lambda().set(Bikes::getLastBackDate,new Date());
//鏇存柊鑷杞︽渶鍚庤繕杞︽椂闂�
- bikesMapper.updateById(bikes);
+ bikesMapper.update(null,updateWrapper);
}
//鏇存柊杩樿溅璁板綍涓哄凡杩樿溅
memberRidesMapper.updateById(update);
--
Gitblit v1.9.3