From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商

---
 server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

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 0b483c2..f4c8335 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
@@ -11,6 +11,7 @@
 import com.doumee.dao.business.SitesMapper;
 import com.doumee.dao.business.model.*;
 import com.doumee.service.business.*;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,8 +78,8 @@
                 }
                 if(StringUtils.contains(topic, info)){
                     //濡傛灉閿佸ご淇℃伅涓婃姤
-                    String lockid =  ss[3];//閿佸ご缂栫爜
-                    if( StringUtils.isBlank(lockid)){
+                    Integer lockid = Constants.formatIntegerFromStr(ss[3])  ;//閿佸ご缂栫爜
+                    if( lockid == null){
                         //濡傛灉閿佸ご缂栫爜涓虹┖
                         log.error("mqtt娑堟伅璁㈤槄==============鏃犳晥鏁版嵁====="+topic+param);
                         return;
@@ -92,8 +93,8 @@
                     log.info("mqtt娑堟伅璁㈤槄=========閿佷俊鎭�==========鎴愬姛");
                 }else if(StringUtils.contains(topic, closeLock)){
                     //濡傛灉杩樿溅涓婃姤
-                    String lockid =  ss[3];//閿佸ご缂栫爜
-                    if( StringUtils.isBlank(lockid)){
+                    Integer lockid = Constants.formatIntegerFromStr(ss[3]);//閿佸ご缂栫爜
+                    if( lockid == null){
                         //濡傛灉閿佸ご缂栫爜涓虹┖
                         log.error("mqtt娑堟伅璁㈤槄==============鏃犳晥鏁版嵁====="+topic+param);
                         return;
@@ -104,6 +105,7 @@
                     bikes.setBackLockId( lockid);
                     bikes.setBackSiteId( siteid);
                     bikes.setBackCommondId(logId);
+                    bikes.setStatus(pjson.getInteger("status"));
                     result = memberRidesService.mqttCloseBikeEvent(bikes);
                     logInfo = "mqtt娑堟伅璁㈤槄杩樿溅娑堟伅";
                     log.info("mqtt娑堟伅璁㈤槄=========杩樿溅==========鎴愬姛");

--
Gitblit v1.9.3