From 5e1cfd9032785dbe6438c830acad294d346f2734 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 07 十一月 2023 17:29:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java | 9 +++++----
1 files changed, 5 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 040e773..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;
--
Gitblit v1.9.3