租户端接收服务端请求，返回设备信息

bsw215583320

2024-11-08 9f09976eaa3ca19c7aa0173d174cf2d5bf8c976c

租户端接收服务端请求，返回设备信息

 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();


 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);
}

 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);
}

 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);
    }
}

 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);
    }
}