Merge branch 'herb' into cloud

bsw215583320

2024-11-07 e62ffd3aaa1ba27b63885f8a3c8610ed283245d6

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java

@@ -254,11 +254,13 @@


        break;
      case MqttConstant.SERVICE_REQ_EQU_TOPIC:
      case MqttConstant.SERVICE_REQ_PREFIX:
        log.debug("收到设备详细信息查询请求");
        String tenantId = messageJson.getString("tenantId");
        if (tenantId!=null && tenantId.equals(TenantContext.getTenant())) {
        // 根据设备编码查询设备信息
        String code = messageJson.getString("code");
        DryEquipment equipmentVo = equipmentService.selectByTenantIdEquipmentId(TenantContext.getTenant(),code);
          DryEquipment equipmentVo = equipmentService.selectByTenantIdEquipmentId(tenantId,code);
        // 根据设备车间id查询车间信息
        DryShop shop = dryShopService.getById(equipmentVo.getShopId());

@@ -275,6 +277,8 @@
        } catch (Exception e) {
          e.printStackTrace();
        }
        }


        break;