From c97a9cd2fc453fcf3b7e7bc1f24e45fa318040a1 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 08 十一月 2024 11:27:02 +0800
Subject: [PATCH] 解决mqtt会话无租户信息时数据查询问题
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java
index fd66d01..4b0354b 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java
@@ -273,17 +273,18 @@
String clientId = mqttUtil.getMqttClient().getClientId();
String tenant = clientId.substring(clientId.lastIndexOf("_")+1);
if (tenantId!=null && tenantId.equals(tenant)) {
+ TenantContext.setTenant(tenantId);
// 鏍规嵁璁惧缂栫爜鏌ヨ璁惧淇℃伅
String code = messageJson.getString("code");
DryEquipment equipmentVo = equipmentService.selectByTenantIdEquipmentId(tenantId,code);
// 鏍规嵁璁惧杞﹂棿id鏌ヨ杞﹂棿淇℃伅
- DryShop shop = dryShopService.selectByTenantIdShopId(tenantId, equipmentVo.getShopId());
+ DryShop shop = dryShopService.getById(equipmentVo.getShopId());
// 鏍规嵁璁惧绫诲瀷ID鏌ヨ璁惧绫诲瀷淇℃伅
- DryEqpType eqpType = eqpTypeService.selectByTenantIdTypeId(tenantId, equipmentVo.getType());
+ DryEqpType eqpType = eqpTypeService.getById(equipmentVo.getType());
JSONObject res = new JSONObject();
- res.put("tenant", clientId);
+ res.put("tenant", tenantId);
res.put("equipment", equipmentVo);
res.put("shop", shop);
res.put("eqpType", eqpType);
--
Gitblit v1.9.3