From 4374d41d1fcf28cbff21bc8b31efbbdbc30a893a Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 17 七月 2025 08:43:35 +0800
Subject: [PATCH] feat(dry): 添加获取所有机台接口并优化缓存
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java | 14 ++++++++++++++
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryEquipmentService.java | 2 ++
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonCacheConstant.java | 3 +++
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java | 8 ++++++++
4 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonCacheConstant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonCacheConstant.java
index 9858fa0..9009e28 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonCacheConstant.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonCacheConstant.java
@@ -5,4 +5,7 @@
String SYS_CACHE_TENANT = "sys:cache:tenant";
//redis缂撳瓨鍚勭鎴蜂笅璁惧淇℃伅
String DRY_CACHE_TENANT_EQUS = "dry:cache:tenant::equs";
+
+ // redis缂撳瓨鍚勭鎴蜂笅璁惧淇℃伅鍒楄〃
+ String DRY_CACHE_TENANT_EQUS_LIST = "dry:cache:tenant:equsList";
}
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java
index cec4ab1..a875b57 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java
@@ -142,6 +142,14 @@
}
+ @ApiOperation(value="鑾峰彇鎵�鏈夋満鍙�", notes="閫氳繃绉熸埛ID鑾峰彇鎵�鏈夋満鍙版暟鎹�")
+ @GetMapping("/queryAllEqps")
+ public Result<?> queryAllEqps(DryEquipment equipment) {
+ List<DryEquipment> dryEquipments = dryEquipmentService.queryEqusByTenantId(equipment);
+ return Result.OK(dryEquipments);
+ }
+
+
/**
* 1001 椋庣鍗� 1002 椋庣闄�
* 1003 婊氱瓛鍗� 1004 婊氱瓛闄�
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryEquipmentService.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryEquipmentService.java
index 6e39cbd..67a72ee 100755
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryEquipmentService.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryEquipmentService.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.dry.service;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.dry.entity.DryEquipment;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -24,4 +25,5 @@
*/
Map<String,DryEquipment> queryEquByTenantId(Integer tenantId);
+ List<DryEquipment> queryEqusByTenantId(DryEquipment dryEquipment);
}
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..0f4fb91 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;
@@ -63,4 +64,17 @@
));
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());
+ }
+ List<DryEquipment> equipmentList = this.list(queryWrapper);
+ return equipmentList;
+ }
}
--
Gitblit v1.9.3