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/BikesServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 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..152fa98 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
@@ -91,6 +91,32 @@
public Bikes findById(String id) {
return bikesMapper.selectById(id);
}
+ @Override
+ public void updateByJtt( Bikes m){
+ if(StringUtils.isBlank(m.getDeviceSn() )){
+ return;
+ }
+ String tSn = m.getDeviceSn();
+ if(tSn.length() <12){
+ for (int i = 0; i < 12-tSn.length(); i++) {
+ tSn = "0"+tSn;
+ }
+ }
+ 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 +147,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