From 1f04768f05d4a68f0f16456b7934f729dea9fb83 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期一, 01 九月 2025 08:36:27 +0800
Subject: [PATCH] 去除MQTT log,优化设备列表接口
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java | 4 ++--
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
index d6e5935..cb7eda1 100755
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
@@ -109,6 +109,11 @@
//鏄惁寮�鍚郴缁熺鐞嗘ā鍧楃殑澶氱鎴锋暟鎹殧绂汇�怱AAS澶氱鎴锋ā寮忋��
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());
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java
index 1da8ad4..2c68ac0 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java
@@ -198,7 +198,7 @@
switch (topic) {
// 鏌ヨ璁惧鍦ㄧ嚎
case MqttConstant.MOBILE_QUERY_EQU_STATU:
- log.info("admin鏀跺埌MQTT璇锋眰锛宼opic: {}", topic); // 鏀圭敤鏇磋鑼冪殑鏃ュ織璁板綍
+ //log.info("admin鏀跺埌MQTT璇锋眰锛宼opic: {}", 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;
--
Gitblit v1.9.3