From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期一, 06 十一月 2023 23:40:59 +0800 Subject: [PATCH] 更新仓内抓拍2 --- igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java b/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java index 11ae2f6..33a9b22 100644 --- a/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java +++ b/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java @@ -9,7 +9,6 @@ import org.hibernate.Session; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; - import com.bstek.bdf2.core.orm.hibernate.HibernateDao; import com.bstek.dorado.data.entity.EntityState; import com.bstek.dorado.data.entity.EntityUtils; @@ -25,6 +24,8 @@ */ @Component public class BuildingService extends HibernateDao { + + String BEAN_ID = "core.buildingService"; @Autowired private RedisUtil redisUtil; @@ -111,7 +112,7 @@ } @SuppressWarnings("unchecked") - public List<Building> getCacheBuilding(String companyId,String deptId) { + public List<Building> getCacheBuilding(String companyId, String deptId) { if(StringUtils.isEmpty(companyId)){ companyId = ContextUtil.getCompanyId(); } @@ -127,10 +128,31 @@ } if(null == deptId) return result; - + return result.stream().filter(item -> item.getDeptId().equals(deptId)) .collect(Collectors.toList()); } + + @SuppressWarnings("unchecked") + public Building getCacheBuilding(String companyId, String deptId, String buildingId) { + if(StringUtils.isEmpty(companyId)){ + companyId = ContextUtil.getCompanyId(); + } + + List<Building> result = getCacheBuilding(companyId, deptId); + + if (null == result) { + refreshCache(companyId); + + return null; + } + for (Building building : result) { + if(buildingId.equals(building.getId())){ + return building; + } + } + return null; + } public void refreshCache(String companyId) { -- Gitblit v1.9.3