herb.git - Gitblit

			@@ -206,18 +206,26 @@
			case MqttConstant.TENANT_UP_PREFIX_EQU:
			ThreadUtil.execute(() -> {
			try {
			DryEquipment equipment = (DryEquipment) messageJson.get("equipment");

			Object equObj = messageJson.get("equipment");
			DryEquipment equipment = JSON.parseObject(equObj.toString(), DryEquipment.class);
			TenantContext.setTenant(equipment.getTenantId()+"");
			DryEquipment dryEquipment = equipmentService.selectByTenantIdEquipmentId(equipment.getTenantId() + "", equipment.getCode());
			if (dryEquipment == null) {
			equipmentService.save(equipment);
			}

			Object typeObj = messageJson.get("eqpType");
			DryEqpType eqpType = JSON.parseObject(typeObj.toString(), DryEqpType.class);
			DryEqpType dryEqpType = eqpTypeService.getById(eqpType.getId());
			if (dryEqpType == null) {
			eqpTypeService.save(eqpType);
			}
			// 获取设备所属车间
			DryShop shop = (DryShop) messageJson.get("shop");
			shop.setTenantId(equipment.getTenantId());
			Object shopObj = messageJson.get("shop");
			DryShop shop = JSON.parseObject(shopObj.toString(), DryShop.class);
			DryShop dryShop = dryShopService.getById(shop.getId());
			if (dryShop == null) {
			dryShopService.save(shop);

			}
			} catch (Exception e) {
			e.printStackTrace();
			}
			@@ -273,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);