From 1147614053efae0314a36c15293a6a5ed4e6d737 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 二月 2025 11:28:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
index e441663..e0a6288 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -31,6 +31,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.shiro.SecurityUtils;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -84,7 +85,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杞︾墝鍙峰彿宸插瓨鍦�");
}
LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- bikes.setId(UUID.randomUUID().toString());
+ bikes.setId(UUID.randomUUID().toString().replace("-",""));
bikes.setCreateDate(new Date());
bikes.setCreator(user.getId());
bikes.setEditDate(bikes.getCreateDate());
@@ -117,6 +118,10 @@
@Override
public void updateById(Bikes bikes) {
+ Bikes model =bikesMapper.selectById(bikes.getId());
+ if (model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Bikes::getCode,bikes.getCode())
@@ -132,13 +137,19 @@
.eq(BaseParam::getType,Constants.FOUR)) ==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勭數杞︾被鍨嬶紒");
}
+
LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- bikes.setEditDate(new Date());
- bikes.setEditor(user.getId());
- bikes.setStatus(Constants.ZERO);
- bikes.setIsdeleted(Constants.ZERO);
- bikes.setType(null);//鍙兘鏂板鐢佃溅鏁版嵁
- bikesMapper.updateById(bikes);
+ bikesMapper.update(null,new UpdateWrapper<Bikes>().lambda()
+ .set(Bikes::getEditDate,new Date())
+ .set(Bikes::getEditor,user.getId())
+ .set(StringUtils.isNotBlank(bikes.getCode()),Bikes::getCode,bikes.getCode())
+ .set(!StringUtils.equals( model.getCode(),bikes.getCode()),Bikes::getImgurl,null)
+ .set(StringUtils.isNotBlank(bikes.getDeviceSn()),Bikes::getDeviceSn,bikes.getDeviceSn())
+ .set(StringUtils.isNotBlank(bikes.getParamId()),Bikes::getParamId,bikes.getParamId())
+ .set(Bikes::getStatus, Constants.ZERO)
+ .set(Bikes::getIsdeleted, Constants.ZERO)
+ .eq(Bikes::getId,bikes.getId())
+ );
}
@Override
@@ -210,14 +221,14 @@
.like(StringUtils.isNotBlank(pageWrap.getModel().getDeviceSn()), Bikes::getDeviceSn,pageWrap.getModel().getDeviceSn())
.eq( pageWrap.getModel().getLockId() !=null,Bikes::getLockId,pageWrap.getModel().getLockId())
.eq( Bikes::getType,Constants.formatIntegerNum(pageWrap.getModel().getType()))//榛樿鏌ヨ鑷杞�
- .ne(Bikes::getLockId,Constants.formatIntegerFromStr(collect.get(Constants.FORCE_BACK_LOCK).getCode()))
- .ne(Bikes::getSiteId,collect.get(Constants.FORCE_BACK_SITE).getCode())
+ .ne(Constants.formatIntegerNum(pageWrap.getModel().getType())==0,Bikes::getLockId,Constants.formatIntegerFromStr(collect.get(Constants.FORCE_BACK_LOCK).getCode()))
+ .ne(Constants.formatIntegerNum(pageWrap.getModel().getType())==0, Bikes::getSiteId,collect.get(Constants.FORCE_BACK_SITE).getCode())
.and(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,
s->s.isNull(Bikes::getCode)
.or(b->b.eq(Bikes::getCode,"")))
.and(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,s->s
- .isNotNull(Bikes::getCode)
- .and(b->b.ne(Bikes::getCode,"")));
+ .isNotNull(Constants.formatIntegerNum(pageWrap.getModel().getType())==0,Bikes::getCode)
+ .and(Constants.formatIntegerNum(pageWrap.getModel().getType())==0,b->b.ne(Bikes::getCode,"")));
if(pageWrap.getModel().getLowVoltage()!=null){
double low = 0;
try {
@@ -412,4 +423,18 @@
bike.setType(Constants.ONE);//鍙兘鏂板鐢佃溅鏁版嵁
return bike;
}
+
+
+ @Override
+ public List<Bikes> getEleBikes() {
+ return bikesMapper.selectList(new QueryWrapper<Bikes>()
+ .lambda().eq(Bikes::getIsdeleted,Constants.ZERO)
+ .eq(Bikes::getType,Constants.ONE)
+ .eq(Bikes::getStatus,Constants.ZERO)
+ .isNotNull(Bikes::getLatitude)
+ .isNotNull(Bikes::getLongitude)
+ );
+ }
+
+
}
--
Gitblit v1.9.3