合并cloud分支代码

bsw215583320

2024-11-08 3b64c08b7defbe7ff1ba4c6a7a4644ddedb5b782

合并cloud分支代码

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

@@ -97,6 +97,8 @@
            // 订阅租户实时数据
            mqttClient.subscribe(MqttConstant.TENANT_UP_PREFIX_REALTIME_DATA);
            System.out.println("admin订阅" + MqttConstant.TENANT_UP_PREFIX_REALTIME_DATA);
            mqttClient.subscribe(MqttConstant.TENANT_UP_PREFIX_EQU);
            System.out.println("admin订阅" + MqttConstant.TENANT_UP_PREFIX_EQU);
            initClients();

            break;

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

@@ -102,9 +102,14 @@

        }
        if (topic.startsWith("$SYS/brokers/") && topic.endsWith("disconnected")) {
          try {
          String clientid = messageJson.getString("clientid");
          redisUtil.del(MqttConstant.MQTT_ONLINE_CLIENT + clientid);
          System.err.println(String.format("设备: %s下线", clientid));
          } catch (Exception e) {
            e.printStackTrace();
          }

        }
        parseAdminCommand(topic, mqttMessage);

@@ -188,25 +193,25 @@

        // 接收设备实时数据
      case MqttConstant.TENANT_UP_PREFIX_REALTIME_DATA:
        ThreadUtil.execute(() -> {
        try {
          RealTimeDataVo vo = JSON.parseObject(message, RealTimeDataVo.class);
          realTimeDataService.realTimeDataHandle(vo);
        } catch (Exception e) {
          e.printStackTrace();
        }
        });

        break;
      case MqttConstant.TENANT_UP_PREFIX_EQU:
        ThreadUtil.execute(() -> {
        try {
          DryEquipment equipment = (DryEquipment) messageJson.get("equipment");

          DryEquipment dryEquipment = equipmentService.selectByTenantIdEquipmentId(equipment.getTenantId() + "", equipment.getCode());

          if (dryEquipment == null) {
            equipmentService.save(equipment);
          }



          // 获取设备所属车间
          DryShop shop = (DryShop) messageJson.get("shop");
@@ -216,6 +221,8 @@
        } catch (Exception e) {
          e.printStackTrace();
        }
        });

    }

  }
@@ -270,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);
    }
}