优化lambda代码

src/main/java/com/aizuda/boot/modules/flw/service/impl/FlwProcessActorServiceImpl.java

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 流程定义参与者 服务实现类
@@ -26,7 +25,7 @@ public class FlwProcessActorServiceImpl extends BaseServiceImpl<FlwProcessActorM
         // 先删除流程定义ID历史数据
         this.removeByProcessId(processId);
         // 保存流程定义参与者列表
-        return super.saveBatch(dtoList.stream().map(t -> t.toFlwProcessActor(processId)).collect(Collectors.toList()));
+        return super.saveBatch(dtoList.stream().map(t -> t.toFlwProcessActor(processId)).toList());
     }
 
     @Override

src/main/java/com/aizuda/boot/modules/flw/service/impl/FlwProcessCategoryServiceImpl.java

@@ -11,7 +11,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 流程分类 服务实现类
@@ -43,6 +42,6 @@ public class FlwProcessCategoryServiceImpl extends BaseServiceImpl<FlwProcessCat
             fpc.setId(t.getId());
             fpc.setSort(t.getSort());
             return fpc;
-        }).collect(Collectors.toList()));
+        }).toList());
     }
 }

src/main/java/com/aizuda/boot/modules/flw/service/impl/FlwProcessPermissionServiceImpl.java

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 流程定义权限 服务实现类
@@ -26,7 +25,7 @@ public class FlwProcessPermissionServiceImpl extends BaseServiceImpl<FlwProcessP
         // 先删除流程定义ID历史数据
         this.removeByProcessId(processId);
         // 保存流程定义权限列表
-        return super.saveBatch(dtoList.stream().map(t -> t.toFlwProcessPermission(processId)).collect(Collectors.toList()));
+        return super.saveBatch(dtoList.stream().map(t -> t.toFlwProcessPermission(processId)).toList());
     }
 
     @Override

src/main/java/com/aizuda/boot/modules/flw/service/impl/FlwProcessServiceImpl.java

@@ -27,7 +27,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * 流程分类 服务实现类
@@ -53,22 +52,20 @@ public class FlwProcessServiceImpl extends ServiceImpl<FlwProcessMapper, FlwProc
             List<FlwProcessVO> flwProcessVOList = flowlongMapper.selectFlwProcessList();
             if (null == keyword) {
                 // 不存在关键词查询
-                voList = categoryList.stream().map(t -> FlwProcessCategoryVO.of(t)).collect(Collectors.toList());
+                voList = categoryList.stream().map(FlwProcessCategoryVO::of).toList();
                 if (CollectionUtils.isNotEmpty(flwProcessVOList)) {
-                    voList.forEach(t -> t.setProcessList(flwProcessVOList.stream().filter(f -> Objects.equals(t.getCategoryId(), f.getCategoryId()))
-                            .collect(Collectors.toList())));
+                    voList.forEach(t -> t.setProcessList(flwProcessVOList.stream().filter(f -> Objects.equals(t.getCategoryId(), f.getCategoryId())).toList()));
                 }
             } else {
                 // 关键词查询
                 for (FlwProcessCategory category : categoryList) {
                     FlwProcessCategoryVO vo = FlwProcessCategoryVO.of(category);
                     List<FlwProcessVO> processList = flwProcessVOList.stream().filter(t -> Objects.equals(t.getCategoryId(), category.getId())
-                            && t.getProcessName().contains(keyword)).collect(Collectors.toList());
+                            && t.getProcessName().contains(keyword)).toList();
                     if (category.getName().contains(keyword)) {
                         // 匹配分类名称
                         if (CollectionUtils.isEmpty(processList)) {
-                            vo.setProcessList(flwProcessVOList.stream().filter(f -> Objects.equals(f.getCategoryId(), category.getId()))
-                                    .collect(Collectors.toList()));
+                            vo.setProcessList(flwProcessVOList.stream().filter(f -> Objects.equals(f.getCategoryId(), category.getId())).toList());
                         } else {
                             vo.setProcessList(processList);
                         }
@@ -99,12 +96,12 @@ public class FlwProcessServiceImpl extends ServiceImpl<FlwProcessMapper, FlwProc
         // 流程参与者
         List<FlwProcessActor> flwProcessActors = flwProcessActorService.getByProcessId(id);
         if (CollectionUtils.isNotEmpty(flwProcessActors)) {
-            dto.setProcessActorList(flwProcessActors.stream().map(t -> FlwProcessActorDTO.of(t)).collect(Collectors.toList()));
+            dto.setProcessActorList(flwProcessActors.stream().map(FlwProcessActorDTO::of).toList());
         }
         // 流程权限
         List<FlwProcessPermission> flwProcessPermissions = flwProcessPermissionService.getByProcessId(id);
         if (CollectionUtils.isNotEmpty(flwProcessPermissions)) {
-            dto.setProcessPermissionList(flwProcessPermissions.stream().map(t -> FlwProcessPermissionDTO.of(t)).collect(Collectors.toList()));
+            dto.setProcessPermissionList(flwProcessPermissions.stream().map(FlwProcessPermissionDTO::of).toList());
         }
         // 流程配置
         FlwProcessConfigure configure = flwProcessConfigureService.getByProcessId(id);
@@ -208,6 +205,7 @@ public class FlwProcessServiceImpl extends ServiceImpl<FlwProcessMapper, FlwProc
         return super.updateById(flwProcess);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean cloneById(Long id) {
         FlwProcessDTO dto = this.getDtoById(id);

src/main/java/com/aizuda/boot/modules/system/service/impl/SysDepartmentServiceImpl.java

@@ -20,7 +20,6 @@ import org.springframework.stereotype.Service;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * 部门 服务实现类
@@ -60,7 +59,7 @@ public class SysDepartmentServiceImpl extends BaseServiceImpl<SysDepartmentMappe
             SysDepartmentVO vo = e.convert(SysDepartmentVO.class);
             vo.setChildren(this.getChild(vo.getId(), vo.getName(), sysDepartmentList));
             return vo;
-        }).collect(Collectors.toList());
+        }).toList();
     }
 
     /**
@@ -69,7 +68,7 @@ public class SysDepartmentServiceImpl extends BaseServiceImpl<SysDepartmentMappe
     protected List<SysDepartmentVO> getChild(Long id, String parentName, List<SysDepartment> sysDepartmentList) {
         // 遍历所有节点，将所有菜单的父id与传过来的根节点的id比较
         List<SysDepartment> childList = sysDepartmentList.stream().filter(e -> Objects.equals(id, e.getPid()))
-                .collect(Collectors.toList());
+                .toList();
         if (childList.isEmpty()) {
             // 没有子节点，返回一个空 List（递归退出）
             return null;
@@ -80,7 +79,7 @@ public class SysDepartmentServiceImpl extends BaseServiceImpl<SysDepartmentMappe
             vo.setParentName(parentName);
             vo.setChildren(this.getChild(vo.getId(), vo.getName(), sysDepartmentList));
             return vo;
-        }).collect(Collectors.toList());
+        }).toList();
     }
 
     @Override

src/main/java/com/aizuda/boot/modules/system/service/impl/SysRegionServiceImpl.java

@@ -5,12 +5,12 @@
  */
 package com.aizuda.boot.modules.system.service.impl;
 
+import com.aizuda.boot.modules.system.entity.SysRegion;
+import com.aizuda.boot.modules.system.entity.vo.SysRegionVO;
 import com.aizuda.boot.modules.system.mapper.SysRegionMapper;
 import com.aizuda.boot.modules.system.service.ISysRegionService;
 import com.aizuda.core.api.ApiAssert;
 import com.aizuda.service.service.BaseServiceImpl;
-import com.aizuda.boot.modules.system.entity.SysRegion;
-import com.aizuda.boot.modules.system.entity.vo.SysRegionVO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -19,7 +19,6 @@ import org.springframework.stereotype.Service;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * 行政区域 服务实现类
@@ -47,7 +46,7 @@ public class SysRegionServiceImpl extends BaseServiceImpl<SysRegionMapper, SysRe
             SysRegionVO vo = e.convert(SysRegionVO.class);
             vo.setChildren(this.getChild(vo.getId(), vo.getName(), sysRegionList));
             return vo;
-        }).collect(Collectors.toList());
+        }).toList();
     }
 
     /**
@@ -55,8 +54,7 @@ public class SysRegionServiceImpl extends BaseServiceImpl<SysRegionMapper, SysRe
      */
     protected List<SysRegionVO> getChild(Long id, String parentName, List<SysRegion> sysRegionList) {
         // 遍历所有节点，将所有菜单的父id与传过来的根节点的id比较
-        List<SysRegion> childList = sysRegionList.stream().filter(e -> Objects.equals(id, e.getPid()))
-                .collect(Collectors.toList());
+        List<SysRegion> childList = sysRegionList.stream().filter(e -> Objects.equals(id, e.getPid())).toList();
         if (childList.isEmpty()) {
             // 没有子节点，返回一个空 List（递归退出）
             return null;
@@ -67,7 +65,7 @@ public class SysRegionServiceImpl extends BaseServiceImpl<SysRegionMapper, SysRe
             vo.setParentName(parentName);
             vo.setChildren(this.getChild(vo.getId(), vo.getName(), sysRegionList));
             return vo;
-        }).collect(Collectors.toList());
+        }).toList();
     }
 
     @Override

src/main/java/com/aizuda/boot/modules/system/service/impl/SysResourceServiceImpl.java

@@ -5,17 +5,17 @@
  */
 package com.aizuda.boot.modules.system.service.impl;
 
+import com.aizuda.boot.modules.system.entity.SysResource;
+import com.aizuda.boot.modules.system.entity.SysResourceApi;
+import com.aizuda.boot.modules.system.entity.enums.ResourceType;
 import com.aizuda.boot.modules.system.entity.param.ResourceParam;
+import com.aizuda.boot.modules.system.entity.vo.MenuVO;
+import com.aizuda.boot.modules.system.entity.vo.ResourceTreeVO;
 import com.aizuda.boot.modules.system.mapper.SysResourceMapper;
 import com.aizuda.boot.modules.system.service.ISysResourceApiService;
 import com.aizuda.boot.modules.system.service.ISysResourceService;
 import com.aizuda.core.api.ApiAssert;
 import com.aizuda.service.service.BaseServiceImpl;
-import com.aizuda.boot.modules.system.entity.SysResource;
-import com.aizuda.boot.modules.system.entity.SysResourceApi;
-import com.aizuda.boot.modules.system.entity.enums.ResourceType;
-import com.aizuda.boot.modules.system.entity.vo.MenuVO;
-import com.aizuda.boot.modules.system.entity.vo.ResourceTreeVO;
 import com.aizuda.service.web.UserSession;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -27,7 +27,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 系统资源 服务实现类
@@ -63,7 +62,7 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, S
             ResourceTreeVO vo = e.convert(ResourceTreeVO.class);
             vo.setChildren(this.getChild(vo.getId(), vo.getTitle(), sysResourceList));
             return vo;
-        }).collect(Collectors.toList());
+        }).toList();
     }
 
     /**
@@ -71,8 +70,7 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, S
      */
     protected List<ResourceTreeVO> getChild(Long id, String parentName, List<SysResource> sysResourceList) {
         // 遍历所有节点，将所有菜单的父id与传过来的根节点的id比较
-        List<SysResource> childList = sysResourceList.stream().filter(e -> Objects.equals(id, e.getPid()))
-                .collect(Collectors.toList());
+        List<SysResource> childList = sysResourceList.stream().filter(e -> Objects.equals(id, e.getPid())).toList();
         if (childList.isEmpty()) {
             // 没有子节点，返回一个空 List（递归退出）
             return null;
@@ -83,7 +81,7 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, S
             vo.setParentName(parentName);
             vo.setChildren(this.getChild(vo.getId(), vo.getTitle(), sysResourceList));
             return vo;
-        }).collect(Collectors.toList());
+        }).toList();
     }
 
     @Override
@@ -108,7 +106,7 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, S
         }
         return sysResourceList.stream().filter(e -> Objects.equals(0L, e.getPid()))
                 .map(e -> this.getMenuVO(e, sysResourceList))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     protected MenuVO getMenuVO(SysResource sysResource, List<SysResource> sysResourceList) {
@@ -135,14 +133,13 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, S
      */
     protected List<MenuVO> getMenuChild(Long id, List<SysResource> sysResourceList) {
         // 遍历所有节点，将所有菜单的父id与传过来的根节点的id比较
-        List<SysResource> childList = sysResourceList.stream().filter(e -> Objects.equals(id, e.getPid()))
-                .collect(Collectors.toList());
+        List<SysResource> childList = sysResourceList.stream().filter(e -> Objects.equals(id, e.getPid())).toList();
         if (childList.isEmpty()) {
             // 没有子节点，返回一个空 List（递归退出）
             return null;
         }
         // 递归
-        return childList.stream().map(e -> this.getMenuVO(e, sysResourceList)).collect(Collectors.toList());
+        return childList.stream().map(e -> this.getMenuVO(e, sysResourceList)).toList();
     }
 
     @Override
@@ -162,8 +159,7 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, S
         List<SysResourceApi> apiList = param.getApiList();
         if (CollectionUtils.isNotEmpty(apiList)) {
             // 移除空字符串
-            apiList = apiList.stream().filter(t -> StringUtils.isNoneBlank(t.getUrl()) && StringUtils.isNoneBlank(t.getCode()))
-                    .collect(Collectors.toList());
+            apiList = apiList.stream().filter(t -> StringUtils.isNoneBlank(t.getUrl()) && StringUtils.isNoneBlank(t.getCode())).toList();
             if (CollectionUtils.isNotEmpty(apiList)) {
                 sysResourceApiService.removeByResourceId(param.getId());
                 apiList.forEach(t -> {

src/main/java/com/aizuda/boot/modules/system/service/impl/SysRoleResourceServiceImpl.java

@@ -5,19 +5,18 @@
  */
 package com.aizuda.boot.modules.system.service.impl;
 
+import com.aizuda.boot.modules.system.entity.SysRoleResource;
 import com.aizuda.boot.modules.system.entity.param.RoleResourceParam;
 import com.aizuda.boot.modules.system.mapper.SysRoleResourceMapper;
 import com.aizuda.boot.modules.system.service.ISysRoleResourceService;
 import com.aizuda.core.api.ApiAssert;
 import com.aizuda.service.service.BaseServiceImpl;
-import com.aizuda.boot.modules.system.entity.SysRoleResource;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 系统角色资源 服务实现类
@@ -50,15 +49,14 @@ public class SysRoleResourceServiceImpl extends BaseServiceImpl<SysRoleResourceM
             srr.setRoleId(param.getRoleId());
             srr.setResourceId(resourceId);
             return srr;
-        }).collect(Collectors.toList()));
+        }).toList());
     }
 
     @Override
     public List<Long> listByRoleId(Long roleId) {
         List<SysRoleResource> sysRoleResourceList = super.list(Wrappers.<SysRoleResource>lambdaQuery()
                 .select(SysRoleResource::getResourceId).eq(SysRoleResource::getRoleId, roleId));
-        return CollectionUtils.isEmpty(sysRoleResourceList) ? null : sysRoleResourceList.stream().map(t -> t.getResourceId())
-                .collect(Collectors.toList());
+        return CollectionUtils.isEmpty(sysRoleResourceList) ? null : sysRoleResourceList.stream().map(SysRoleResource::getResourceId).toList();
     }
 
     @Override

src/main/java/com/aizuda/boot/modules/system/service/impl/SysRoleServiceImpl.java

@@ -5,13 +5,13 @@
  */
 package com.aizuda.boot.modules.system.service.impl;
 
+import com.aizuda.boot.modules.system.entity.SysRole;
 import com.aizuda.boot.modules.system.mapper.SysRoleMapper;
 import com.aizuda.boot.modules.system.service.ISysRoleResourceService;
 import com.aizuda.boot.modules.system.service.ISysRoleService;
 import com.aizuda.boot.modules.system.service.ISysUserRoleService;
 import com.aizuda.core.api.ApiAssert;
 import com.aizuda.service.service.BaseServiceImpl;
-import com.aizuda.boot.modules.system.entity.SysRole;
 import com.aizuda.service.vo.TreeVO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -20,8 +20,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
 /**
  * 系统角色 服务实现类
@@ -43,9 +41,8 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleMapper, SysRole>
 
     @Override
     public List<TreeVO> listTree() {
-        return Optional.ofNullable(super.list(null)).orElse(null).stream()
-                .map(t -> new TreeVO(t.getId(), t.getName(), null))
-                .collect(Collectors.toList());
+        return super.list(null).stream().map(t -> new TreeVO(t.getId(),
+                t.getName(), null)).toList();
     }
 
     @Override

src/main/java/com/aizuda/boot/modules/system/service/impl/SysUserDepartmentServiceImpl.java

@@ -18,7 +18,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 系统用户部门 服务实现类
@@ -48,7 +47,7 @@ public class SysUserDepartmentServiceImpl extends BaseServiceImpl<SysUserDepartm
                     sysUserDepartment.setUserId(userId);
                     sysUserDepartment.setDepartmentId(DepartmentId);
                     return sysUserDepartment;
-                }).collect(Collectors.toList())));
+                }).toList()));
         return super.saveBatch(sysUserDepartmentList);
     }
 
@@ -66,8 +65,7 @@ public class SysUserDepartmentServiceImpl extends BaseServiceImpl<SysUserDepartm
     public List<Long> listDepartmentIdsByUserId(Long userId) {
         List<SysUserDepartment> sysUserDepartmentList = super.list(Wrappers.<SysUserDepartment>lambdaQuery()
                 .select(SysUserDepartment::getDepartmentId).eq(SysUserDepartment::getUserId, userId));
-        return CollectionUtils.isEmpty(sysUserDepartmentList) ? null : sysUserDepartmentList.stream().map(t -> t.getDepartmentId())
-                .collect(Collectors.toList());
+        return CollectionUtils.isEmpty(sysUserDepartmentList) ? null : sysUserDepartmentList.stream().map(SysUserDepartment::getDepartmentId).toList();
     }
 
     @Override

src/main/java/com/aizuda/boot/modules/system/service/impl/SysUserRoleServiceImpl.java

@@ -5,12 +5,12 @@
  */
 package com.aizuda.boot.modules.system.service.impl;
 
-import com.aizuda.core.api.ApiAssert;
-import com.aizuda.service.service.BaseServiceImpl;
 import com.aizuda.boot.modules.system.entity.SysUserRole;
 import com.aizuda.boot.modules.system.entity.param.AssignRolesParam;
 import com.aizuda.boot.modules.system.mapper.SysUserRoleMapper;
 import com.aizuda.boot.modules.system.service.ISysUserRoleService;
+import com.aizuda.core.api.ApiAssert;
+import com.aizuda.service.service.BaseServiceImpl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -18,7 +18,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 系统用户角色 服务实现类
@@ -48,7 +47,7 @@ public class SysUserRoleServiceImpl extends BaseServiceImpl<SysUserRoleMapper, S
                     sysUserRole.setUserId(userId);
                     sysUserRole.setRoleId(roleId);
                     return sysUserRole;
-                }).collect(Collectors.toList())));
+                }).toList()));
         return super.saveBatch(sysUserRoleList);
     }
 
@@ -66,8 +65,7 @@ public class SysUserRoleServiceImpl extends BaseServiceImpl<SysUserRoleMapper, S
     public List<Long> listRoleIdsByUserId(Long userId) {
         List<SysUserRole> sysUserRoleList = super.list(Wrappers.<SysUserRole>lambdaQuery()
                 .select(SysUserRole::getRoleId).eq(SysUserRole::getUserId, userId));
-        return CollectionUtils.isEmpty(sysUserRoleList) ? null : sysUserRoleList.stream().map(t -> t.getRoleId())
-                .collect(Collectors.toList());
+        return CollectionUtils.isEmpty(sysUserRoleList) ? null : sysUserRoleList.stream().map(SysUserRole::getRoleId).toList();
     }
 
     @Override