From a3ff160ff0e25bf0802aa5f14d651776b6652cdc Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期一, 04 八月 2025 16:03:17 +0800
Subject: [PATCH] feat(dry): 更新干燥设备接口和实时数据处理

---
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java
index 93ff976..291bfda 100755
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java
@@ -1,6 +1,7 @@
 package org.jeecg.modules.dry.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.config.TenantContext;
 import org.jeecg.common.constant.CommonCacheConstant;
 import org.jeecg.common.util.RedisUtil;
@@ -30,6 +31,8 @@
 
     @Autowired
     private RedisUtil redisUtil;
+    @Autowired
+    private DryEqpTypeServiceImpl dryEqpTypeServiceImpl;
 
 
     @Override
@@ -63,4 +66,21 @@
                 ));
         return userMap;
     }
+
+    @Override
+    @Cacheable(cacheNames = CommonCacheConstant.DRY_CACHE_TENANT_EQUS_LIST, key = "#dryEquipment.tenantId+':'+#dryEquipment.enable" , unless = "#result == null " )
+    public List<DryEquipment> queryEqusByTenantId(DryEquipment dryEquipment) {
+        TenantContext.setTenant(dryEquipment.getTenantId() +"");
+        QueryWrapper<DryEquipment> queryWrapper  = new QueryWrapper<>();
+        queryWrapper.lambda().eq(DryEquipment::getTenantId,dryEquipment.getTenantId());
+        if (dryEquipment.getEnable()!=null){
+            queryWrapper.lambda().eq(DryEquipment::getEnable,dryEquipment.getEnable());
+        }
+        queryWrapper.lambda().orderByAsc(DryEquipment::getCode);
+        List<DryEquipment> equipmentList = this.list(queryWrapper);
+        equipmentList.stream().forEach(item -> {
+            item.setType(dryEqpTypeServiceImpl.getById(item.getType()).getName());
+        });
+        return equipmentList;
+    }
 }

--
Gitblit v1.9.3