From 291354e580dbe8686d3d53ac69c825df75da9098 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 17 二月 2025 15:18:45 +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 | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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 bf4ec31..3397748 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
@@ -4,6 +4,7 @@
import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.StringTools;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.BikesMapper;
import com.doumee.dao.business.join.BikesJoinMapper;
@@ -19,6 +20,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.system.SystemDictDataService;
+import com.github.xiaoymin.knife4j.core.util.StrUtil;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -91,6 +93,27 @@
public Bikes findById(String id) {
return bikesMapper.selectById(id);
}
+ @Override
+ public void updateByJtt( Bikes m){
+ if(StringUtils.isBlank(m.getDeviceSn() )){
+ return;
+ }
+ String tSn = StringTools.leftPad(m.getDeviceSn(),12,'0') ;
+ Bikes bikes = bikesJoinMapper.selectOne(new QueryWrapper<Bikes>().lambda()
+ .eq(Bikes::getDeviceSn,tSn)
+ .eq(Bikes::getIsdeleted,Constants.ZERO)
+ .eq(Bikes::getType,Constants.ONE)
+ .last("limit 1"));
+ if(bikes == null){
+ return;
+ }
+ bikesJoinMapper.update(null,new UpdateWrapper<Bikes>().lambda()
+ .set(m.getLatitude()!=null,Bikes::getLatitude,m.getLatitude())
+ .set(m.getVoltage()!=null,Bikes::getVoltage,m.getVoltage())
+ .set(m.getLongitude()!=null,Bikes::getLongitude,m.getLongitude())
+ .set(m.getHeartDate()!=null,Bikes::getHeartDate,m.getHeartDate())
+ .eq(Bikes::getId,bikes.getId()));
+ }
@Override
public Bikes findOne(Bikes bikes) {
@@ -121,11 +144,15 @@
.leftJoin(Sites.class,Sites::getId,Bikes::getSiteId)
.like(StringUtils.isNotBlank(pageWrap.getModel().getSiteId()),Bikes::getSiteId,pageWrap.getModel().getSiteId())
.like(StringUtils.isNotBlank(pageWrap.getModel().getSiteName()), Sites::getName,pageWrap.getModel().getSiteName())
- .like(StringUtils.isNotBlank(pageWrap.getModel().getLockId()),Bikes::getLockId,pageWrap.getModel().getLockId())
- .ne(Bikes::getLockId,collect.get(Constants.FORCE_BACK_LOCK).getCode())
+ .eq( pageWrap.getModel().getLockId() !=null,Bikes::getLockId,pageWrap.getModel().getLockId())
+ .ne(Bikes::getLockId,Constants.formatIntegerFromStr(collect.get(Constants.FORCE_BACK_LOCK).getCode()))
.ne(Bikes::getSiteId,collect.get(Constants.FORCE_BACK_SITE).getCode())
- .isNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,Bikes::getCode)
- .isNotNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,Bikes::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,"")));
queryWrapper.selectAll(Bikes.class)
.selectAs(BaseParam::getName,Bikes::getParamName)
.selectAs(Sites::getName,Bikes::getSiteName) ;
--
Gitblit v1.9.3