diff --git a/continew-common/src/main/java/top/continew/admin/common/config/doc/GlobalAuthenticationCustomizer.java b/continew-common/src/main/java/top/continew/admin/common/config/doc/GlobalAuthenticationCustomizer.java index 5464f36a..0b0885eb 100644 --- a/continew-common/src/main/java/top/continew/admin/common/config/doc/GlobalAuthenticationCustomizer.java +++ b/continew-common/src/main/java/top/continew/admin/common/config/doc/GlobalAuthenticationCustomizer.java @@ -33,6 +33,7 @@ import org.springframework.util.AntPathMatcher; import org.springframework.web.bind.annotation.*; import top.continew.starter.apidoc.autoconfigure.SpringDocExtensionProperties; import top.continew.starter.auth.satoken.autoconfigure.SaTokenExtensionProperties; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; import java.lang.reflect.Method; @@ -103,7 +104,7 @@ public class GlobalAuthenticationCustomizer implements GlobalOpenApiCustomizer { return; } Map securitySchemes = components.getSecuritySchemes(); - List schemeNames = securitySchemes.values().stream().map(SecurityScheme::getName).toList(); + List schemeNames = CollUtils.mapToList(securitySchemes.values(), SecurityScheme::getName); pathItem.readOperations().forEach(operation -> { SecurityRequirement securityRequirement = new SecurityRequirement(); schemeNames.forEach(securityRequirement::addList); diff --git a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DefaultDataPermissionUserDataProvider.java b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DefaultDataPermissionUserDataProvider.java index ca0bd7db..2ca0d6ff 100644 --- a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DefaultDataPermissionUserDataProvider.java +++ b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DefaultDataPermissionUserDataProvider.java @@ -19,13 +19,12 @@ package top.continew.admin.common.config.mybatis; import cn.hutool.core.convert.Convert; import top.continew.admin.common.context.UserContext; import top.continew.admin.common.context.UserContextHolder; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.extension.datapermission.enums.DataScope; import top.continew.starter.extension.datapermission.filter.DataPermissionUserDataProvider; import top.continew.starter.extension.datapermission.model.RoleData; import top.continew.starter.extension.datapermission.model.UserData; -import java.util.stream.Collectors; - /** * 数据权限用户数据提供者 * @@ -45,10 +44,8 @@ public class DefaultDataPermissionUserDataProvider implements DataPermissionUser UserData userData = new UserData(); userData.setUserId(Convert.toStr(userContext.getId())); userData.setDeptId(Convert.toStr(userContext.getDeptId())); - userData.setRoles(userContext.getRoles() - .stream() - .map(r -> new RoleData(Convert.toStr(r.getId()), DataScope.valueOf(r.getDataScope().name()))) - .collect(Collectors.toSet())); + userData.setRoles(CollUtils.mapToSet(userContext.getRoles(), r -> new RoleData(Convert.toStr(r + .getId()), DataScope.valueOf(r.getDataScope().name())))); return userData; } } diff --git a/continew-common/src/main/java/top/continew/admin/common/context/UserContext.java b/continew-common/src/main/java/top/continew/admin/common/context/UserContext.java index e177315f..e4bfa342 100644 --- a/continew-common/src/main/java/top/continew/admin/common/context/UserContext.java +++ b/continew-common/src/main/java/top/continew/admin/common/context/UserContext.java @@ -20,12 +20,12 @@ import cn.hutool.core.collection.CollUtil; import lombok.Data; import lombok.NoArgsConstructor; import top.continew.admin.common.constant.SysConstants; +import top.continew.starter.core.util.CollUtils; import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; import java.util.Set; -import java.util.stream.Collectors; /** * 用户上下文 @@ -103,7 +103,7 @@ public class UserContext implements Serializable { public void setRoles(Set roles) { this.roles = roles; - this.roleCodes = roles.stream().map(RoleContext::getCode).collect(Collectors.toSet()); + this.roleCodes = CollUtils.mapToSet(roles, RoleContext::getCode); } /** diff --git a/continew-common/src/main/java/top/continew/admin/common/util/SecureUtils.java b/continew-common/src/main/java/top/continew/admin/common/util/SecureUtils.java index 2e247370..be0e7871 100644 --- a/continew-common/src/main/java/top/continew/admin/common/util/SecureUtils.java +++ b/continew-common/src/main/java/top/continew/admin/common/util/SecureUtils.java @@ -22,13 +22,13 @@ import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.extra.spring.SpringUtil; import top.continew.admin.common.config.RsaProperties; import top.continew.starter.core.exception.BusinessException; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.security.crypto.autoconfigure.CryptoProperties; import top.continew.starter.security.crypto.encryptor.AesEncryptor; import top.continew.starter.security.crypto.encryptor.IEncryptor; import java.util.List; -import java.util.stream.Collectors; /** * 加密/解密工具类 @@ -96,12 +96,12 @@ public class SecureUtils { public static List encryptFieldByAes(List values) { IEncryptor encryptor = new AesEncryptor(); CryptoProperties properties = SpringUtil.getBean(CryptoProperties.class); - return values.stream().map(value -> { + return CollUtils.mapToList(values, value -> { try { return encryptor.encrypt(value, properties.getPassword(), properties.getPublicKey()); } catch (Exception e) { throw new BusinessException("字段加密异常"); } - }).collect(Collectors.toList()); + }); } } diff --git a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java index f84a3d39..25d267b5 100644 --- a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java +++ b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java @@ -57,6 +57,7 @@ import top.continew.starter.core.autoconfigure.application.ApplicationProperties import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.enums.BaseEnum; import top.continew.starter.core.exception.BusinessException; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.core.util.validation.CheckUtils; import top.continew.starter.data.enums.DatabaseType; import top.continew.starter.data.util.MetaUtils; @@ -296,9 +297,8 @@ public class GeneratorServiceImpl implements GeneratorService { InnerGenConfigDO innerGenConfig = new InnerGenConfigDO(genConfig); List imports = new ArrayList<>(); // 处理枚举字段 - List fieldConfigRecords = fieldConfigList.stream() - .map(s -> convertToFieldConfigDO(s, imports)) - .toList(); + List fieldConfigRecords = CollUtils + .mapToList(fieldConfigList, s -> convertToFieldConfigDO(s, imports)); innerGenConfig.setImports(imports); // 渲染代码 diff --git a/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/handler/TenantDataHandlerForSystem.java b/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/handler/TenantDataHandlerForSystem.java index c6099a09..2b8f6b12 100644 --- a/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/handler/TenantDataHandlerForSystem.java +++ b/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/handler/TenantDataHandlerForSystem.java @@ -35,6 +35,7 @@ import top.continew.admin.system.mapper.user.UserMapper; import top.continew.admin.system.mapper.user.UserPasswordHistoryMapper; import top.continew.admin.system.mapper.user.UserSocialMapper; import top.continew.admin.system.model.entity.DeptDO; +import top.continew.admin.system.model.entity.FileDO; import top.continew.admin.system.model.entity.MenuDO; import top.continew.admin.system.model.entity.RoleDO; import top.continew.admin.system.model.entity.user.UserDO; @@ -47,6 +48,7 @@ import top.continew.admin.tenant.model.entity.TenantDO; import top.continew.admin.tenant.model.req.TenantReq; import top.continew.admin.tenant.service.PackageMenuService; import top.continew.starter.cache.redisson.util.RedisUtils; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.extension.crud.model.entity.BaseIdDO; @@ -121,7 +123,7 @@ public class TenantDataHandlerForSystem implements TenantDataHandler { // 部门清除 deptMapper.delete(dw); // 文件清除 - List fileIds = fileService.list().stream().map(BaseIdDO::getId).toList(); + List fileIds = CollUtils.mapToList(fileService.list(), FileDO::getId); if (!fileIds.isEmpty()) { fileService.delete(fileIds); } diff --git a/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/service/impl/PackageMenuServiceImpl.java b/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/service/impl/PackageMenuServiceImpl.java index 4c062492..32ea2eaa 100644 --- a/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/service/impl/PackageMenuServiceImpl.java +++ b/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/service/impl/PackageMenuServiceImpl.java @@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional; import top.continew.admin.tenant.mapper.PackageMenuMapper; import top.continew.admin.tenant.model.entity.PackageMenuDO; import top.continew.admin.tenant.service.PackageMenuService; +import top.continew.starter.core.util.CollUtils; import java.util.List; @@ -55,7 +56,7 @@ public class PackageMenuServiceImpl implements PackageMenuService { // 删除原有关联 baseMapper.lambdaUpdate().eq(PackageMenuDO::getPackageId, packageId).remove(); // 保存最新关联 - List newList = menuIds.stream().map(menuId -> new PackageMenuDO(packageId, menuId)).toList(); + List newList = CollUtils.mapToList(menuIds, menuId -> new PackageMenuDO(packageId, menuId)); return baseMapper.insertBatch(newList); } diff --git a/continew-server/src/main/java/top/continew/admin/job/NoticePublishJob.java b/continew-server/src/main/java/top/continew/admin/job/NoticePublishJob.java index 5db17f26..b70f317a 100644 --- a/continew-server/src/main/java/top/continew/admin/job/NoticePublishJob.java +++ b/continew-server/src/main/java/top/continew/admin/job/NoticePublishJob.java @@ -33,6 +33,7 @@ import top.continew.admin.system.mapper.NoticeMapper; import top.continew.admin.system.model.entity.NoticeDO; import top.continew.admin.system.service.NoticeService; import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.extension.tenant.annotation.TenantIgnore; import java.time.LocalDateTime; @@ -109,7 +110,7 @@ public class NoticePublishJob { // 更新状态 noticeMapper.lambdaUpdate() .set(NoticeDO::getStatus, NoticeStatusEnum.PUBLISHED) - .in(NoticeDO::getId, list.stream().map(NoticeDO::getId).toList()) + .in(NoticeDO::getId, CollUtils.mapToList(list, NoticeDO::getId)) .update(); } } diff --git a/continew-system/src/main/java/top/continew/admin/auth/config/AuthConfiguration.java b/continew-system/src/main/java/top/continew/admin/auth/config/AuthConfiguration.java index e773376e..5a2797d8 100644 --- a/continew-system/src/main/java/top/continew/admin/auth/config/AuthConfiguration.java +++ b/continew-system/src/main/java/top/continew/admin/auth/config/AuthConfiguration.java @@ -34,6 +34,10 @@ public class AuthConfiguration { */ @Bean public GroupedOpenApi authApi() { - return GroupedOpenApi.builder().group("auth").displayName("系统认证").pathsToMatch("/auth/**", "/monitor/online/**").build(); + return GroupedOpenApi.builder() + .group("auth") + .displayName("系统认证") + .pathsToMatch("/auth/**", "/monitor/online/**") + .build(); } } diff --git a/continew-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java b/continew-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java index 14053c06..fb6727f5 100644 --- a/continew-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java @@ -32,6 +32,7 @@ import top.continew.admin.system.mapper.StorageMapper; import top.continew.admin.system.model.entity.FileDO; import top.continew.admin.system.model.entity.StorageDO; import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.core.util.URLUtils; import java.util.List; @@ -128,7 +129,7 @@ public class FileRecorderImpl implements FileRecorder { return list.get(0); } // 结合存储配置进行匹配 - List storageList = storageMapper.selectByIds(list.stream().map(FileDO::getStorageId).toList()); + List storageList = storageMapper.selectByIds(CollUtils.mapToList(list, FileDO::getStorageId)); Map storageMap = storageList.stream() .collect(Collectors.toMap(StorageDO::getId, storage -> storage)); return list.stream().filter(file -> { diff --git a/continew-system/src/main/java/top/continew/admin/system/config/sms/SmsReadConfigDatabaseImpl.java b/continew-system/src/main/java/top/continew/admin/system/config/sms/SmsReadConfigDatabaseImpl.java index 12645cd1..ec7eb5bb 100644 --- a/continew-system/src/main/java/top/continew/admin/system/config/sms/SmsReadConfigDatabaseImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/config/sms/SmsReadConfigDatabaseImpl.java @@ -27,6 +27,7 @@ import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.model.query.SmsConfigQuery; import top.continew.admin.system.model.resp.SmsConfigResp; import top.continew.admin.system.service.SmsConfigService; +import top.continew.starter.core.util.CollUtils; import java.util.List; @@ -61,6 +62,6 @@ public class SmsReadConfigDatabaseImpl implements SmsReadConfig { if (CollUtil.isEmpty(list)) { return List.of(); } - return list.stream().map(SmsConfigUtil::from).toList(); + return CollUtils.mapToList(list, SmsConfigUtil::from); } } \ No newline at end of file diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/UserProfileController.java b/continew-system/src/main/java/top/continew/admin/system/controller/UserProfileController.java index 8782c414..deff3e28 100644 --- a/continew-system/src/main/java/top/continew/admin/system/controller/UserProfileController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/UserProfileController.java @@ -48,6 +48,7 @@ import top.continew.admin.system.service.UserService; import top.continew.admin.system.service.UserSocialService; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.exception.BadRequestException; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.util.validation.ValidationUtils; @@ -131,13 +132,13 @@ public class UserProfileController { @GetMapping("/social") public List listSocialBind() { List userSocialList = userSocialService.listByUserId(UserContextHolder.getUserId()); - return userSocialList.stream().map(userSocial -> { + return CollUtils.mapToList(userSocialList, userSocial -> { String source = userSocial.getSource(); UserSocialBindResp userSocialBind = new UserSocialBindResp(); userSocialBind.setSource(source); userSocialBind.setDescription(SocialSourceEnum.valueOf(source).getDescription()); return userSocialBind; - }).toList(); + }); } @Operation(summary = "绑定三方账号", description = "绑定三方账号") diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java index 1c01b748..8e278fe7 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java @@ -37,6 +37,7 @@ import top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonRes import top.continew.admin.system.service.DashboardService; import top.continew.admin.system.service.NoticeService; import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.util.CollUtils; import java.io.IOException; import java.math.BigDecimal; @@ -95,10 +96,10 @@ public class DashboardServiceImpl implements DashboardService { // 获取省份数据 String chinaJson = IoUtil.readUtf8(new ClassPathResource("china.json").getInputStream()); JSONArray jsonArr = JSONUtil.parseObj(chinaJson).getJSONArray("children"); - List provinceList = jsonArr.stream().map(item -> { + List provinceList = CollUtils.mapToList(jsonArr, item -> { JSONObject itemJsonObj = JSONUtil.parseObj(item); return "%s:%s".formatted(itemJsonObj.getStr("name"), itemJsonObj.getStr("fullname")); - }).toList(); + }); // 汇总各省份访问数据 for (String province : provinceList) { String[] split = province.split(StringConstants.COLON); @@ -124,10 +125,9 @@ public class DashboardServiceImpl implements DashboardService { .stream() .map(date -> date.toString(DatePattern.NORM_DATE_FORMAT)) .toList(); - Collection missings = CollUtil.disjunction(all, list.stream() - .map(DashboardAccessTrendResp::getDate) - .toList()); - list.addAll(missings.stream().map(missing -> new DashboardAccessTrendResp(missing, 0L, 0L)).toList()); + Collection missings = CollUtil.disjunction(all, CollUtils + .mapToList(list, DashboardAccessTrendResp::getDate)); + list.addAll(CollUtils.mapToList(missings, missing -> new DashboardAccessTrendResp(missing, 0L, 0L))); list.sort(Comparator.comparing(DashboardAccessTrendResp::getDate)); } return list; @@ -200,10 +200,9 @@ public class DashboardServiceImpl implements DashboardService { * @param list 待填充数据 */ private void fillMissingDateData(List all, List list) { - Collection missings = CollUtil.disjunction(all, list.stream() - .map(DashboardChartCommonResp::getName) - .toList()); - list.addAll(missings.stream().map(missing -> new DashboardChartCommonResp(missing, 0L)).toList()); + Collection missings = CollUtil.disjunction(all, CollUtils + .mapToList(list, DashboardChartCommonResp::getName)); + list.addAll(CollUtils.mapToList(missings, missing -> new DashboardChartCommonResp(missing, 0L))); list.sort(Comparator.comparing(DashboardChartCommonResp::getName)); } diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java index 1db3b443..0869b962 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java @@ -26,6 +26,7 @@ import top.continew.admin.system.model.req.DictReq; import top.continew.admin.system.model.resp.DictResp; import top.continew.admin.system.service.DictItemService; import top.continew.admin.system.service.DictService; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.core.util.validation.CheckUtils; import top.continew.starter.extension.crud.model.resp.LabelValueResp; @@ -75,7 +76,7 @@ public class DictServiceImpl extends BaseServiceImpl listEnumDict() { List enumDictNameList = dictItemService.listEnumDictNames(); - return enumDictNameList.stream().map(name -> new LabelValueResp(name, name)).toList(); + return CollUtils.mapToList(enumDictNameList, name -> new LabelValueResp(name, name)); } /** diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/MessageLogServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/MessageLogServiceImpl.java index 764c7315..1de1c685 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/MessageLogServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/MessageLogServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import top.continew.admin.system.mapper.MessageLogMapper; import top.continew.admin.system.model.entity.MessageLogDO; import top.continew.admin.system.service.MessageLogService; +import top.continew.starter.core.util.CollUtils; import java.time.LocalDateTime; import java.util.List; @@ -44,9 +45,8 @@ public class MessageLogServiceImpl implements MessageLogService { if (CollUtil.isEmpty(messageIds)) { return; } - List list = messageIds.stream() - .map(messageId -> new MessageLogDO(messageId, userId, LocalDateTime.now())) - .toList(); + List list = CollUtils + .mapToList(messageIds, messageId -> new MessageLogDO(messageId, userId, LocalDateTime.now())); baseMapper.insert(list); } diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java index dd699e59..72df01e2 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java @@ -37,6 +37,7 @@ import top.continew.admin.system.model.resp.message.MessageTypeUnreadResp; import top.continew.admin.system.model.resp.message.MessageUnreadResp; import top.continew.admin.system.service.MessageLogService; import top.continew.admin.system.service.MessageService; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.messaging.websocket.util.WebSocketUtils; @@ -75,7 +76,7 @@ public class MessageServiceImpl implements MessageService { public void readMessage(List ids, Long userId) { // 查询当前用户的未读消息 List list = baseMapper.selectUnreadListByUserId(userId); - List unreadIds = list.stream().map(MessageDO::getId).toList(); + List unreadIds = CollUtils.mapToList(list, MessageDO::getId); messageLogService.addWithUserId(CollUtil.isNotEmpty(ids) ? CollUtil.intersection(unreadIds, ids).stream().toList() : unreadIds, userId); diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/NoticeLogServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/NoticeLogServiceImpl.java index 70409a61..427743fd 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/NoticeLogServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/NoticeLogServiceImpl.java @@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional; import top.continew.admin.system.mapper.NoticeLogMapper; import top.continew.admin.system.model.entity.NoticeLogDO; import top.continew.admin.system.service.NoticeLogService; +import top.continew.starter.core.util.CollUtils; import java.time.LocalDateTime; import java.util.Collection; @@ -57,7 +58,7 @@ public class NoticeLogServiceImpl implements NoticeLogService { } // 新增没有关联的 LocalDateTime now = LocalDateTime.now(); - List list = subtract.stream().map(userId -> new NoticeLogDO(noticeId, userId, now)).toList(); + List list = CollUtils.mapToList(subtract, userId -> new NoticeLogDO(noticeId, userId, now)); return baseMapper.insertBatch(list); } diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java index 1d437657..eddfc787 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java @@ -37,6 +37,7 @@ import top.continew.admin.system.model.resp.OptionResp; import top.continew.admin.system.service.OptionService; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.core.util.validation.CheckUtils; import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.data.util.QueryWrapperHelper; @@ -75,7 +76,7 @@ public class OptionServiceImpl implements OptionService { @Override public void update(List options) { // 非空校验 - List idList = options.stream().map(OptionReq::getId).toList(); + List idList = CollUtils.mapToList(options, OptionReq::getId); List optionList = baseMapper.selectByIds(idList); Map optionMap = optionList.stream() .collect(Collectors.toMap(OptionDO::getCode, Function.identity(), (existing, replacement) -> existing)); diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleDeptServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleDeptServiceImpl.java index 1f64b4a3..cf30c672 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleDeptServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleDeptServiceImpl.java @@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional; import top.continew.admin.system.mapper.RoleDeptMapper; import top.continew.admin.system.model.entity.RoleDeptDO; import top.continew.admin.system.service.RoleDeptService; +import top.continew.starter.core.util.CollUtils; import java.util.List; @@ -55,7 +56,7 @@ public class RoleDeptServiceImpl implements RoleDeptService { // 删除原有关联 baseMapper.lambdaUpdate().eq(RoleDeptDO::getRoleId, roleId).remove(); // 保存最新关联 - List roleDeptList = deptIds.stream().map(deptId -> new RoleDeptDO(roleId, deptId)).toList(); + List roleDeptList = CollUtils.mapToList(deptIds, deptId -> new RoleDeptDO(roleId, deptId)); return baseMapper.insertBatch(roleDeptList); } diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleMenuServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleMenuServiceImpl.java index b593b0e7..cd117900 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleMenuServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleMenuServiceImpl.java @@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional; import top.continew.admin.system.mapper.RoleMenuMapper; import top.continew.admin.system.model.entity.RoleMenuDO; import top.continew.admin.system.service.RoleMenuService; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.data.service.impl.ServiceImpl; import java.util.ArrayList; @@ -58,7 +59,7 @@ public class RoleMenuServiceImpl extends ServiceImpl // 删除原有关联 baseMapper.lambdaUpdate().eq(RoleMenuDO::getRoleId, roleId).remove(); // 保存最新关联 - List roleMenuList = menuIds.stream().map(menuId -> new RoleMenuDO(roleId, menuId)).toList(); + List roleMenuList = CollUtils.mapToList(menuIds, menuId -> new RoleMenuDO(roleId, menuId)); return baseMapper.insertBatch(roleMenuList); } diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java index 412f7dbe..834e861e 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java @@ -39,13 +39,13 @@ import top.continew.admin.system.model.resp.MenuResp; import top.continew.admin.system.model.resp.role.RoleDetailResp; import top.continew.admin.system.model.resp.role.RoleResp; import top.continew.admin.system.service.*; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.core.util.validation.CheckUtils; import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; /** * 角色业务实现 @@ -150,7 +150,7 @@ public class RoleServiceImpl extends BaseServiceImpl list = menuService.listByRoleId(roleId); - List menuIds = list.stream().map(MenuResp::getId).toList(); + List menuIds = CollUtils.mapToList(list, MenuResp::getId); detail.setMenuIds(menuIds); } } @@ -172,7 +172,7 @@ public class RoleServiceImpl extends BaseServiceImpl roleList = baseMapper.lambdaQuery().select(RoleDO::getCode).in(RoleDO::getId, roleIdList).list(); - return roleList.stream().map(RoleDO::getCode).collect(Collectors.toSet()); + return CollUtils.mapToSet(roleList, RoleDO::getCode); } @Override @@ -185,9 +185,7 @@ public class RoleServiceImpl extends BaseServiceImpl new RoleContext(r.getId(), r.getCode(), r.getDataScope())) - .collect(Collectors.toSet()); + return CollUtils.mapToSet(roleList, r -> new RoleContext(r.getId(), r.getCode(), r.getDataScope())); } @Override diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java index a6f5ad2f..7e29f906 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import top.continew.admin.system.mapper.user.UserPasswordHistoryMapper; import top.continew.admin.system.model.entity.user.UserPasswordHistoryDO; import top.continew.admin.system.service.UserPasswordHistoryService; +import top.continew.starter.core.util.CollUtils; import java.util.List; @@ -73,7 +74,7 @@ public class UserPasswordHistoryServiceImpl implements UserPasswordHistoryServic return false; } // 校验是否重复使用历史密码 - List passwordList = list.stream().map(UserPasswordHistoryDO::getPassword).toList(); + List passwordList = CollUtils.mapToList(list, UserPasswordHistoryDO::getPassword); return passwordList.stream().anyMatch(p -> passwordEncoder.matches(password, p)); } } \ No newline at end of file diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java index b23de2ca..4c6c64c1 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java @@ -31,6 +31,7 @@ import top.continew.admin.system.model.entity.UserRoleDO; import top.continew.admin.system.model.query.RoleUserQuery; import top.continew.admin.system.model.resp.role.RoleUserResp; import top.continew.admin.system.service.UserRoleService; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.core.util.validation.CheckUtils; import top.continew.starter.data.util.QueryWrapperHelper; import top.continew.starter.extension.crud.model.query.PageQuery; @@ -85,13 +86,13 @@ public class UserRoleServiceImpl implements UserRoleService { // 删除原有关联 baseMapper.lambdaUpdate().eq(UserRoleDO::getUserId, userId).remove(); // 保存最新关联 - List userRoleList = roleIds.stream().map(roleId -> new UserRoleDO(userId, roleId)).toList(); + List userRoleList = CollUtils.mapToList(roleIds, roleId -> new UserRoleDO(userId, roleId)); return baseMapper.insertBatch(userRoleList); } @Override public boolean assignRoleToUsers(Long roleId, List userIds) { - List userRoleList = userIds.stream().map(userId -> new UserRoleDO(userId, roleId)).toList(); + List userRoleList = CollUtils.mapToList(userIds, userId -> new UserRoleDO(userId, roleId)); return baseMapper.insertBatch(userRoleList); } diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java index 9bd3dceb..9bd8c5f8 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java @@ -80,6 +80,7 @@ import top.continew.admin.system.service.*; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.exception.BusinessException; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.core.util.FileUploadUtils; import top.continew.starter.core.util.validation.CheckUtils; import top.continew.starter.extension.crud.model.query.PageQuery; @@ -202,7 +203,7 @@ public class UserServiceImpl extends BaseServiceImpl idList = list.stream().map(UserDO::getId).toList(); + List idList = CollUtils.mapToList(list, UserDO::getId); Collection subtractIds = CollUtil.subtract(ids, idList); CheckUtils.throwIfNotEmpty(subtractIds, "所选用户 [{}] 不存在", CollUtil.join(subtractIds, StringConstants.COMMA)); Optional isSystemData = list.stream().filter(UserDO::getIsSystem).findFirst(); @@ -278,7 +279,7 @@ public class UserServiceImpl extends BaseServiceImpl deptNames = validRowList.stream().map(UserImportRowReq::getDeptName).distinct().toList(); + List deptNames = CollUtils.mapToList(validRowList, UserImportRowReq::getDeptName); int existDeptCount = deptService.countByNames(deptNames); CheckUtils.throwIf(existDeptCount < deptNames.size(), "存在无效部门，请检查数据"); @@ -316,11 +317,9 @@ public class UserServiceImpl extends BaseServiceImpl existEmails = listExistByField(importUserList, UserImportRowReq::getEmail, UserDO::getEmail); List existPhones = listExistByField(importUserList, UserImportRowReq::getPhone, UserDO::getPhone); - List existUserList = listByUsernames(importUserList.stream() - .map(UserImportRowReq::getUsername) - .filter(Objects::nonNull) - .toList()); - List existUsernames = existUserList.stream().map(UserDO::getUsername).toList(); + List existUserList = listByUsernames(CollUtils + .mapToList(importUserList, UserImportRowReq::getUsername)); + List existUsernames = CollUtils.mapToList(existUserList, UserDO::getUsername); CheckUtils .throwIf(isExitImportUser(req, importUserList, existUsernames, existEmails, existPhones), "数据不符合导入策略，已退出导入"); @@ -519,10 +518,7 @@ public class UserServiceImpl extends BaseServiceImpl { - List deptIdList = deptService.listChildren(deptId) - .stream() - .map(DeptDO::getId) - .collect(Collectors.toList()); + List deptIdList = CollUtils.mapToList(deptService.listChildren(deptId), DeptDO::getId); deptIdList.add(deptId); q.in("t1.dept_id", deptIdList); }) @@ -543,7 +539,7 @@ public class UserServiceImpl extends BaseServiceImpl rowField, SFunction dbField, boolean fieldEncrypt) { - List fieldValues = userRowList.stream().map(rowField).filter(Objects::nonNull).toList(); + List fieldValues = CollUtils.mapToList(userRowList, rowField); if (fieldValues.isEmpty()) { return 0; } @@ -622,14 +618,14 @@ public class UserServiceImpl extends BaseServiceImpl listExistByField(List userRowList, Function rowField, SFunction dbField) { - List fieldValues = userRowList.stream().map(rowField).filter(Objects::nonNull).toList(); + List fieldValues = CollUtils.mapToList(userRowList, rowField); if (fieldValues.isEmpty()) { return Collections.emptyList(); } - List userDOList = baseMapper.selectList(Wrappers.lambdaQuery() + List userList = baseMapper.selectList(Wrappers.lambdaQuery() .in(dbField, SecureUtils.encryptFieldByAes(fieldValues)) .select(dbField)); - return userDOList.stream().map(dbField).filter(Objects::nonNull).toList(); + return CollUtils.mapToList(userList, dbField); } /** diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java index 2f27c34b..319aaaff 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java @@ -25,12 +25,12 @@ import top.continew.admin.system.enums.SocialSourceEnum; import top.continew.admin.system.mapper.user.UserSocialMapper; import top.continew.admin.system.model.entity.user.UserSocialDO; import top.continew.admin.system.service.UserSocialService; +import top.continew.starter.core.util.CollUtils; import top.continew.starter.core.util.validation.CheckUtils; import java.time.LocalDateTime; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; /** * 用户社会化关联业务实现 @@ -73,7 +73,7 @@ public class UserSocialServiceImpl implements UserSocialService { String source = authUser.getSource(); String openId = authUser.getUuid(); List userSocialList = this.listByUserId(userId); - Set boundSocialSet = userSocialList.stream().map(UserSocialDO::getSource).collect(Collectors.toSet()); + Set boundSocialSet = CollUtils.mapToSet(userSocialList, UserSocialDO::getSource); String description = SocialSourceEnum.valueOf(source).getDescription(); CheckUtils.throwIf(boundSocialSet.contains(source), "您已经绑定过了 [{}] 平台，请先解绑", description); UserSocialDO userSocial = this.getBySourceAndOpenId(source, openId);