From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java
index 510d2fa..02929fd 100644
--- a/ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.region.SccgRegion;
import com.ycl.mapper.region.SccgRegionMapper;
@@ -39,7 +40,6 @@
if (StringUtils.isBlank(result)) {
// 1.鏌ュ嚭鎵�鏈夌綉鏍�
List<SccgRegion> list = this.list();
-
// 2.缁勮鎴愮埗瀛愮殑鏍戝瀷缁撴瀯
// 2.1銆佹壘鍒版墍鏈夌殑涓�绾х綉鏍�:浣跨敤jdk8鐨剆tream娴佽繘琛岃繃婊�
List<SccgRegion> collect = list.stream().filter(griddingEntity -> {
@@ -51,7 +51,7 @@
return item;
}).collect(Collectors.toList());
List<SccgRegion> treeData = getTreeData(collect);
- redisService.set(RedisKey.SCCG_REGION, JSON.toJSONString(treeData), LiveTimeMillisecond.s5184000.time);
+ redisService.set(RedisKey.SCCG_REGION, JSON.toJSONString(treeData), LiveTimeMillisecond.s3600.time);
return treeData;
}
return JSON.parseArray(result, SccgRegion.class);
@@ -87,8 +87,11 @@
}
@Override
- public IPage<SccgRegion> list(SccgRegion sccgRegion) {
- return null;
+ public Page<SccgRegion> list(Integer pageSize, Integer pageNum) {
+ Page<SccgRegion> page = new Page<>();
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ return page(page);
}
@Override
--
Gitblit v1.8.0