From c185de12314b8733f23ed7856e6d1e87ee95c1ca Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 14 二月 2025 15:09:59 +0800
Subject: [PATCH] jtt808初始化

---
 server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 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 6c10e38..95f2de0 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,26 @@
     public Bikes findById(String id) {
         return bikesMapper.selectById(id);
     }
+    @Override
+    public  void updateByJtt( Bikes m){
+        if(StringUtils.isBlank(m.getDeviceSn() )){
+            return;
+        }
+        Bikes bikes = bikesJoinMapper.selectOne(new MPJLambdaWrapper<Bikes>()
+                        .eq(Bikes::getDeviceSn,String.format("%012s",m.getDeviceSn()))
+                        .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,8 +141,8 @@
                 .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( pageWrap.getModel().getLockId() !=null,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())
                 .and(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,
                         s->s.isNull(Bikes::getCode)

--
Gitblit v1.9.3