From 339515558253d776769dc2e2560bbb4a0450c989 Mon Sep 17 00:00:00 2001 From: zhuguifei <zhuguifei@zhuguifeideiMac.local> Date: 星期五, 29 十一月 2024 09:44:44 +0800 Subject: [PATCH] 将码云版本提交至gitlab -- 20241129 --- jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 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 old mode 100644 new mode 100755 index 794a923..93ff976 --- 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,17 +1,23 @@ package org.jeecg.modules.dry.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.jeecg.common.config.TenantContext; +import org.jeecg.common.constant.CommonCacheConstant; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.dry.common.CacheConstants; import org.jeecg.modules.dry.entity.DryEquipment; import org.jeecg.modules.dry.mapper.DryEquipmentMapper; import org.jeecg.modules.dry.service.IDryEquipmentService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; /** * @Description: 骞茬嚗鏈� @@ -24,6 +30,8 @@ @Autowired private RedisUtil redisUtil; + + @Override public DryEquipment selectByTenantIdEquipmentId(String tenantId, String equipmentId) { DryEquipment dryEquipment = (DryEquipment) redisUtil.hget(CacheConstants.RedisKeyEnum.EQP_MAP.getCode(), tenantId + equipmentId); @@ -31,6 +39,7 @@ List<DryEquipment> list = this.list(); for (DryEquipment equipment : list) { redisUtil.hset(CacheConstants.RedisKeyEnum.EQP_MAP.getCode(),equipment.getTenantId()+equipment.getCode(),equipment); + // 璁剧疆杩囨湡鏃堕棿 if ((equipment.getTenantId()+equipment.getCode()).equals(tenantId + equipmentId)) { dryEquipment = equipment; } @@ -38,4 +47,20 @@ } return dryEquipment; } + + @Override + @Cacheable(cacheNames = CommonCacheConstant.DRY_CACHE_TENANT_EQUS, key = "#tenantId" , unless = "#result == null " ) + public Map<String,DryEquipment> queryEquByTenantId(Integer tenantId) { + TenantContext.setTenant(tenantId +""); + QueryWrapper<DryEquipment> queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(DryEquipment::getTenantId,tenantId); + List<DryEquipment> equipmentList = this.list(queryWrapper); + Map<String, DryEquipment> userMap = equipmentList.stream() + .collect(Collectors.toMap( + DryEquipment::getCode, + Function.identity(), + (existingValue, newValue) -> existingValue // 濡傛灉閿啿绐侊紝淇濈暀鏃у�� + )); + return userMap; + } } -- Gitblit v1.9.3