From 7c585586e9bea943161676bd9d127e81123891c3 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 11 十二月 2024 11:01:35 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into herb
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 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
old mode 100644
new mode 100755
index d75e3a4..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,11 +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.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* @Description: 骞茬嚗鏈�
@@ -16,4 +28,39 @@
@Service
public class DryEquipmentServiceImpl extends ServiceImpl<DryEquipmentMapper, DryEquipment> implements IDryEquipmentService {
+ @Autowired
+ private RedisUtil redisUtil;
+
+
+ @Override
+ public DryEquipment selectByTenantIdEquipmentId(String tenantId, String equipmentId) {
+ DryEquipment dryEquipment = (DryEquipment) redisUtil.hget(CacheConstants.RedisKeyEnum.EQP_MAP.getCode(), tenantId + equipmentId);
+ if (dryEquipment == null) {
+ 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;
+ }
+ }
+ }
+ 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