From db82b41a3018de6aa5a2622677018026bca4d59f Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期五, 08 十一月 2024 11:28:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/herb' into herb
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryEqpTypeService.java | 1 -
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryShopServiceImpl.java | 7 -------
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryShopService.java | 1 -
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEqpTypeServiceImpl.java | 7 -------
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java | 7 ++++---
5 files changed, 4 insertions(+), 19 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 b51e204..e9e23cf 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
@@ -281,17 +281,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);
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryEqpTypeService.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryEqpTypeService.java
index 746724b..42e41d6 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryEqpTypeService.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryEqpTypeService.java
@@ -11,5 +11,4 @@
*/
public interface IDryEqpTypeService extends IService<DryEqpType> {
- DryEqpType selectByTenantIdTypeId(String type, String equipmentVoType);
}
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryShopService.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryShopService.java
index 9c23bc3..623969b 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryShopService.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryShopService.java
@@ -11,5 +11,4 @@
*/
public interface IDryShopService extends IService<DryShop> {
- DryShop selectByTenantIdShopId(String tenantId, String shopId);
}
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEqpTypeServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEqpTypeServiceImpl.java
index ce66fce..682cd8a 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEqpTypeServiceImpl.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEqpTypeServiceImpl.java
@@ -17,11 +17,4 @@
@Service
public class DryEqpTypeServiceImpl extends ServiceImpl<DryEqpTypeMapper, DryEqpType> implements IDryEqpTypeService {
- @Override
- public DryEqpType selectByTenantIdTypeId(String tenantId, String id) {
- LambdaQueryWrapper<DryEqpType> query = new LambdaQueryWrapper<>();
- query.eq(DryEqpType::getTenantId, tenantId);
- query.eq(DryEqpType::getId, id);
- return this.getOne(query);
- }
}
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryShopServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryShopServiceImpl.java
index 5d8663f..bf551d2 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryShopServiceImpl.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryShopServiceImpl.java
@@ -17,11 +17,4 @@
@Service
public class DryShopServiceImpl extends ServiceImpl<DryShopMapper, DryShop> implements IDryShopService {
- @Override
- public DryShop selectByTenantIdShopId(String tenantId, String shopId) {
- LambdaQueryWrapper<DryShop> query = new LambdaQueryWrapper<>();
- query.eq(DryShop::getTenantId, tenantId);
- query.eq(DryShop::getId, shopId);
- return this.getOne(query);
- }
}
--
Gitblit v1.9.3