From 1f61c06a1dd8343a14290c1f22788efd2a6ef2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 29 Aug 2020 18:37:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:Redis-find=E4=BC=98=E5=8C=96=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E9=98=BB=E5=A1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/base/CoreCommonController.java | 5 +---- .../core/apiservice/serviceimpl/busi/SysLocaleResourceService.java | 2 +- .../i3plus/core/apiservice/serviceimpl/busi/SysUserService.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java index d2dbe49..17d4360 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.core.apiservice.controller.base; import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.impp.framework.base.controller.BaseCommonController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -19,8 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; -import java.util.Map; /** * @Description :通用功能服务 @@ -46,7 +43,7 @@ public class CoreCommonController extends BaseCommonController { ValidatorBean.checkNotNull(softType,"不存在的产品信息"); String redisKey = CommonConstWords.REDIS_PREFIX_BEAN_INFO + ":" + softType.getCode(); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultList(redisRes.scan(redisKey + "*",Integer.MAX_VALUE)); + .setResultList(redisRes.findObject(redisKey + "*",Integer.MAX_VALUE)); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java index e413d37..9ecab39 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java @@ -233,7 +233,7 @@ public class SysLocaleResourceService implements ISysLocaleResourceService { @Override public List findMissResourceModelByTop(int num) { - List listStr = redisRes.scan(CommonConstWords.REDIS_PREFIX_CACHE_NO_RES + "*",num); + List listStr = redisRes.findObject(CommonConstWords.REDIS_PREFIX_CACHE_NO_RES + "*",num); MissResourceModel missResourceModel = null; List missResourceModelList = new ArrayList<>(listStr.size()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 9c4a170..49cd5c7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -172,7 +172,7 @@ public class SysUserService implements ISysUserService { return; } - List ds = redisSession.scan(redisKey); + List ds = redisSession.findObject(redisKey); if (CollectionUtils.isNotEmpty(ds)) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())