From 9f09976eaa3ca19c7aa0173d174cf2d5bf8c976c Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期五, 08 十一月 2024 08:47:30 +0800
Subject: [PATCH] 租户端接收服务端请求，返回设备信息
---
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 | 8 ++++++++
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 | 8 ++++++++
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java | 4 ++--
5 files changed, 20 insertions(+), 2 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 5269e82..fd66d01 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
@@ -277,9 +277,9 @@
String code = messageJson.getString("code");
DryEquipment equipmentVo = equipmentService.selectByTenantIdEquipmentId(tenantId,code);
// 鏍规嵁璁惧杞﹂棿id鏌ヨ杞﹂棿淇℃伅
- DryShop shop = dryShopService.getById(equipmentVo.getShopId());
+ DryShop shop = dryShopService.selectByTenantIdShopId(tenantId, equipmentVo.getShopId());
// 鏍规嵁璁惧绫诲瀷ID鏌ヨ璁惧绫诲瀷淇℃伅
- DryEqpType eqpType = eqpTypeService.getById(equipmentVo.getType());
+ DryEqpType eqpType = eqpTypeService.selectByTenantIdTypeId(tenantId, equipmentVo.getType());
JSONObject res = new JSONObject();
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 42e41d6..746724b 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,4 +11,5 @@
*/
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 623969b..9c23bc3 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,4 +11,5 @@
*/
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 39e4734..ce66fce 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
@@ -1,5 +1,6 @@
package org.jeecg.modules.dry.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.modules.dry.entity.DryEqpType;
import org.jeecg.modules.dry.mapper.DryEqpTypeMapper;
import org.jeecg.modules.dry.service.IDryEqpTypeService;
@@ -16,4 +17,11 @@
@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 1ba3428..5d8663f 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
@@ -1,5 +1,6 @@
package org.jeecg.modules.dry.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.modules.dry.entity.DryShop;
import org.jeecg.modules.dry.mapper.DryShopMapper;
import org.jeecg.modules.dry.service.IDryShopService;
@@ -16,4 +17,11 @@
@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