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/controller/DryEquipmentController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 eb38ac3..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
@@ -12,11 +12,15 @@
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.bean.BeanUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.config.TenantContext;
import org.jeecg.common.constant.CommonCacheConstant;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.RedisUtil;
+import org.jeecg.common.util.TokenUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
import org.jeecg.modules.dry.common.CacheConstants;
@@ -105,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());
@@ -118,9 +127,17 @@
queryWrapper.orderByAsc("code");
List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper);
List<DryEquipmentVo> equipmentVos = new ArrayList<>();
+ if(eqps == null){
+ return equipmentVos;
+ }
+
eqps.stream().forEach(item -> {
DryEquipmentVo dryEquipmentVo = BeanUtil.toBean(item, DryEquipmentVo.class);
DryEqpType dryEqpType = dryEqpTypeService.getById(item.getType());
+ if(dryEqpType == null){
+ equipmentVos.add(dryEquipmentVo);
+ return;
+ }
dryEquipmentVo.setType(dryEqpType.getName());
dryEquipmentVo.setDryEfficiency(dryEqpType.getDryEfficiency());
dryEquipmentVo.setSteamConsumption(dryEqpType.getSteamConsumption());
--
Gitblit v1.9.3