diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueSysConfigMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueSysConfigMapper.java index b15e07c4..4540b8ee 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueSysConfigMapper.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueSysConfigMapper.java @@ -37,7 +37,15 @@ public interface RescueSysConfigMapper { * @param config 参数配置信息 * @return 参数配置集合 */ - public IPage selectConfigList(Page page, @Param("vo") SysConfig config); + public List selectConfigList(SysConfig config); + + /** + * 查询参数配置列表 + * + * @param config 参数配置信息 + * @return 参数配置集合 + */ + public IPage selectConfigListIPage(Page page, @Param("vo") SysConfig config); /** * 根据键名查询参数配置信息 diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/SysConfigServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/SysConfigServiceImpl.java index 5f073972..6724d5f2 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/SysConfigServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/SysConfigServiceImpl.java @@ -102,7 +102,7 @@ public class SysConfigServiceImpl implements ISysConfigService { */ @Override public IPage selectConfigList(Page page, SysConfig config) { - return configMapper2.selectConfigList(page,config); + return configMapper2.selectConfigListIPage(page,config); } /** @@ -162,8 +162,8 @@ public class SysConfigServiceImpl implements ISysConfigService { */ @Override public void loadingConfigCache() { - IPage configsList = configMapper2.selectConfigList(null,new SysConfig()); - for (SysConfig config : configsList.getRecords()) { + List configsList = configMapper2.selectConfigList(new SysConfig()); + for (SysConfig config : configsList) { redisCache2.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); } } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java index 0f31807a..4cf692c9 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java @@ -1,18 +1,13 @@ package cn.iocoder.yudao.module.rescue.utils; -import cn.hutool.extra.spring.SpringUtil; import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; import cn.iocoder.yudao.module.appBase.domain.SysAnnouncement; import cn.iocoder.yudao.module.appBase.service.ISysAnnouncementService; import cn.iocoder.yudao.module.constant.UserConstants; import cn.iocoder.yudao.module.rescue.dto.TaskDto; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; -import cn.iocoder.yudao.module.system.api.permission.RoleApi; -import cn.iocoder.yudao.module.system.api.permission.dto.RoleReqDTO; import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.service.permission.PermissionService; import cn.iocoder.yudao.module.system.service.permission.RoleService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml index 6f265a4c..ecbe8e2b 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml @@ -33,20 +33,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + +