From 160f973ce4eb04e690c396ebd45bffbc6fb99961 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 28 十一月 2022 15:43:18 +0800
Subject: [PATCH] fix: 预警研判报警事间未显示
---
ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java | 25 +++++++++++++++++++++----
1 files changed, 21 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 b0ddd36..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
@@ -1,12 +1,14 @@
package com.ycl.service.region.impl;
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.depart.UmsDepart;
import com.ycl.entity.region.SccgRegion;
import com.ycl.mapper.region.SccgRegionMapper;
-import com.ycl.service.region.ISccgRegionService;
import com.ycl.service.redis.RedisService;
+import com.ycl.service.region.ISccgRegionService;
import com.ycl.utils.common.LiveTimeMillisecond;
import com.ycl.utils.redis.RedisKey;
import org.apache.commons.lang3.StringUtils;
@@ -38,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 -> {
@@ -50,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);
@@ -84,4 +85,20 @@
}
return e;
}
+
+ @Override
+ public Page<SccgRegion> list(Integer pageSize, Integer pageNum) {
+ Page<SccgRegion> page = new Page<>();
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ return page(page);
+ }
+
+ @Override
+ public List<SccgRegion> getChildren(Long parentId) {
+ LambdaQueryWrapper<SccgRegion> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SccgRegion::getParentId, parentId);
+ List<SccgRegion> regions = baseMapper.selectList(wrapper);
+ return regions;
+ }
}
--
Gitblit v1.8.0