herb.git - Gitblit

			@@ -109,6 +109,11 @@
			//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
			if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
			dryEquipment.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
			//fix: shiro排除的接口无法从jwt获取tenantId
			String tenantId = TokenUtils.getTenantIdByRequest(req);
			if(StringUtils.isNotEmpty(tenantId)){
			dryEquipment.setTenantId(Integer.parseInt(tenantId));
			}
			}
			//------------------------------------------------------------------------------------------------
			QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap());
			@@ -130,6 +135,7 @@
			DryEquipmentVo dryEquipmentVo = BeanUtil.toBean(item, DryEquipmentVo.class);
			DryEqpType dryEqpType = dryEqpTypeService.getById(item.getType());
			if(dryEqpType == null){
			equipmentVos.add(dryEquipmentVo);
			return;
			}
			dryEquipmentVo.setType(dryEqpType.getName());

			@@ -198,7 +198,7 @@
			switch (topic) {
			// 查询设备在线
			case MqttConstant.MOBILE_QUERY_EQU_STATU:
			log.info("admin收到MQTT请求，topic: {}", topic); // 改用更规范的日志记录
			//log.info("admin收到MQTT请求，topic: {}", topic); // 改用更规范的日志记录

			try {

			@@ -334,7 +334,7 @@
			MqMessage<List<DryFaultRecordVo>> mqMessage = new MqMessage<>(faultList, tenantId, resTopic);
			//发送请求设备
			// System.err.println("发送给：" + resTopic);
			sendMqttMessage(resTopic, mqMessage, 2);
			sendMqttMessage(resTopic, mqMessage, 2);

			}
			break;

	jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史