From c2b8e4db9526ca795adfc8d64bf980a0e94e3a76 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 29 Jun 2023 14:31:03 +0800 Subject: [PATCH 1/2] add log --- .../java/com/cool/store/vo/OpenAreaTreeVO.java | 5 +++-- .../service/impl/OpenAreaServiceImpl.java | 18 ++++++++++++++---- .../cool/store/controller/TestController.java | 4 ++-- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java index 2869a4b4a..b0ffe2fc3 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java @@ -64,8 +64,9 @@ public class OpenAreaTreeVO { } log.info("1#耗时：{}", System.currentTimeMillis() - startTime); Map> childMap = allTree.stream().collect(Collectors.toMap(k -> k.getId(), v -> v.getChildNode())); - List filterList = allOpenArea.stream().filter(o -> StringUtils.isNotBlank(keyword) && o.getAreaPath().contains(keyword)) - .filter(o->Objects.nonNull(applyFlag) && AreaStatusEnum.OPEN.getCode().equals(o.getAreaStatus()) || AreaStatusEnum.OPEN.getCode().equals(o.getAreaStatus())).collect(Collectors.toList()); + List filterList = allOpenArea.stream().filter(o -> (StringUtils.isBlank(keyword) || o.getAreaPath().contains(keyword)) + && (Objects.isNull(applyFlag) || AreaStatusEnum.OPEN.getCode().equals(o.getAreaStatus()) || AreaStatusEnum.OPEN.getCode().equals(o.getAreaStatus()))) + .collect(Collectors.toList()); Map openAreaMap = allOpenArea.stream().collect(Collectors.toMap(k -> k.getId(), Function.identity())); List list = new ArrayList<>(); //向上处理节点 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java index b19459c29..f30f469c9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java @@ -8,6 +8,7 @@ import com.cool.store.dto.partner.ApplyReservationProvinceDTO; import com.cool.store.entity.HyOpenAreaInfoDO; import com.cool.store.request.OpenAreaRequest; import com.cool.store.service.OpenAreaService; +import com.cool.store.utils.RedisUtilPool; import com.cool.store.vo.OpenAreaTreeVO; import com.cool.store.vo.OpenAreaVO; import com.cool.store.vo.OpenProvinceVO; @@ -33,7 +34,9 @@ import java.util.stream.Collectors; public class OpenAreaServiceImpl implements OpenAreaService { @Resource - HyOpenAreaInfoDAO hyOpenAreaInfoDAO; + private HyOpenAreaInfoDAO hyOpenAreaInfoDAO; + @Resource + private RedisUtilPool redisUtilPool; @Override @@ -119,10 +122,17 @@ public class OpenAreaServiceImpl implements OpenAreaService { @Override public List searchOpenArea(String keyword,Boolean applyFlag, Boolean flag) { long startTime = System.currentTimeMillis(); - //先查出所有的一级菜单 - List allOpenArea = hyOpenAreaInfoDAO.getAllOpenArea(); + String cacheKey = "allOpenArea"; + String allOpenAreaCache = redisUtilPool.getString(cacheKey); + List allAreaList = null; + if(StringUtils.isBlank(allOpenAreaCache)){ + allAreaList = hyOpenAreaInfoDAO.getAllOpenArea(); + redisUtilPool.setString(cacheKey, JSONObject.toJSONString(allAreaList)); + }else{ + allAreaList = JSONObject.parseArray(allOpenAreaCache, HyOpenAreaInfoDO.class); + } log.info("11耗时：{}", System.currentTimeMillis() - startTime); - return OpenAreaTreeVO.convertTree(allOpenArea, keyword, applyFlag); + return OpenAreaTreeVO.convertTree(allAreaList, keyword, applyFlag); } @Override diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java index dc6be9f2e..ed583acda 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java @@ -247,8 +247,8 @@ public class TestController { } @GetMapping("/searchOpenArea") - public ResponseResult searchOpenArea(@RequestParam(value = "keyword",required = false)String keyword){ - return ResponseResult.success(openAreaService.searchOpenArea(keyword,null,Boolean.FALSE)); + public ResponseResult searchOpenArea(@RequestParam(value = "keyword",required = false)String keyword, @RequestParam(value = "applyFlag",required = false)Boolean applyFlag){ + return ResponseResult.success(openAreaService.searchOpenArea(keyword, applyFlag, Boolean.FALSE)); } } From 05739bed271c4084b767d81c7d515a032cc23553 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 29 Jun 2023 14:34:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/controller/OpenAreaController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java index 6a3d2c16e..cd2b641af 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java @@ -53,7 +53,7 @@ public class OpenAreaController { }) public ResponseResult> getOpenAreaList(@RequestParam(value = "keyword",required = false)String keyword, @RequestParam(value = "applyFlag",required = false)Boolean applyFlag){ - List openAreaTreeVOS = openAreaService.queryAllOpenAreaByKeyword(keyword,applyFlag,Boolean.FALSE); + List openAreaTreeVOS = openAreaService.searchOpenArea(keyword,applyFlag,Boolean.FALSE); return ResponseResult.success(openAreaTreeVOS); }