diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java index c9a1a16f4..a0da9661d 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java @@ -93,7 +93,7 @@ public class SysLoginService { remoteSocialService.insertByBo(bo); } else { // 更新用户信息 - bo.setId(list.get(0).getId()); + bo.setId(list.getFirst().getId()); remoteSocialService.updateByBo(bo); // 如果要绑定的平台账号已经被绑定过了 是否抛异常自行决断 // throw new ServiceException("此平台账号已经被绑定!"); diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java b/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java index e014909b9..fa3aa5aed 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java @@ -65,7 +65,7 @@ public class SocialAuthStrategy implements IAuthStrategy { if (CollUtil.isEmpty(list)) { throw new ServiceException("你还没有绑定第三方账号，绑定后才可以登录！"); } - RemoteSocialVo socialVo = list.get(0); + RemoteSocialVo socialVo = list.getFirst(); LoginUser loginUser = remoteUserService.getUserInfo(socialVo.getUserId()); loginUser.setClientKey(client.getClientKey()); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java index 189a2b695..450f49c41 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java @@ -62,7 +62,7 @@ public class TreeBuildUtils extends TreeUtil { if (CollUtil.isEmpty(list)) { return CollUtil.newArrayList(); } - K k = ReflectUtils.invokeGetter(list.get(0), "parentId"); + K k = ReflectUtils.invokeGetter(list.getFirst(), "parentId"); return TreeUtil.build(list, k, DEFAULT_CONFIG, nodeParser); } diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java index df5a11a6a..81b0abd9d 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java @@ -196,8 +196,8 @@ public class OpenApiHandler extends OpenAPIService { // 自定义部分 修改使用java注释当tag名 List list = IoUtil.readLines(new StringReader(description), new ArrayList<>()); // tag.setName(tagAutoName); - tag.setName(list.get(0)); - operation.addTagsItem(list.get(0)); + tag.setName(list.getFirst()); + operation.addTagsItem(list.getFirst()); tag.setDescription(description); if (openAPI.getTags() == null || !openAPI.getTags().contains(tag)) { diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java index 16b2e6b29..7466af4c6 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java @@ -49,7 +49,7 @@ public class CellMergeHandler { } // 获取有合并注解的字段 - Map mergeFields = getFieldColumnIndexMap(rows.get(0).getClass()); + Map mergeFields = getFieldColumnIndexMap(rows.getFirst().getClass()); // 如果没有需要合并的字段则返回空集 if (CollUtil.isEmpty(mergeFields)) { return Collections.emptyList(); diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java index 05b362ecf..eea7424b1 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java @@ -154,7 +154,7 @@ public class DropDownOptions { sonList.forEach(everySon -> { if (parentGroupByIdMap.containsKey(sonHowToGetParentIdFunction.apply(everySon))) { // 找到对应的上级 - T parentObj = parentGroupByIdMap.get(sonHowToGetParentIdFunction.apply(everySon)).get(0); + T parentObj = parentGroupByIdMap.get(sonHowToGetParentIdFunction.apply(everySon)).getFirst(); // 提取名称和ID作为Key String key = howToBuildEveryOption.apply(parentObj); // Key对应的Value diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java index e342dedfe..ecdf4f3a0 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java @@ -276,10 +276,10 @@ public class ExcelDownHandler implements SheetWriteHandler { continue; } // 取第一个 - String str = data.get(0); + String str = data.getFirst(); rowData.add(str); // 通过移除的方式避免重复 - data.remove(0); + data.removeFirst(); // 设置可以继续 flag = true; } diff --git a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java b/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java index 163e43f7b..490b48f79 100644 --- a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java +++ b/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java @@ -59,7 +59,7 @@ public class SnailJobConfig { if (StringUtils.isNotBlank(serverName)) { List instances = discoveryClient.getInstances(serverName); if (CollUtil.isNotEmpty(instances)) { - ServiceInstance instance = instances.get(0); + ServiceInstance instance = instances.getFirst(); System.setProperty("snail-job.server.host", instance.getHost()); System.setProperty("snail-job.server.port", properties.getPort()); } diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java index d04a8a66e..0957c57e5 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java @@ -108,7 +108,7 @@ public class PlusDataPermissionHandler { } Object defaultValue = "-1"; NullSafeStandardEvaluationContext context = new NullSafeStandardEvaluationContext(defaultValue); - context.addPropertyAccessor(new NullSafePropertyAccessor(context.getPropertyAccessors().get(0), defaultValue)); + context.addPropertyAccessor(new NullSafePropertyAccessor(context.getPropertyAccessors().getFirst(), defaultValue)); context.setBeanResolver(beanResolver); DataPermissionHelper.getContext().forEach(context::setVariable); Set conditions = new HashSet<>(); diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java index f28755a8b..bbfcd14d5 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java @@ -112,7 +112,7 @@ public class ExportExcelServiceImpl implements IExportExcelService { Map> groupByIdMap = cityDataList.stream().collect(Collectors.groupingBy(DemoCityData::getId)); if (groupByIdMap.containsKey(id)) { - DemoCityData demoCityData = groupByIdMap.get(id).get(0); + DemoCityData demoCityData = groupByIdMap.get(id).getFirst(); return DropDownOptions.createOptionValue(demoCityData.getName(), demoCityData.getId()); } else { return StrUtil.EMPTY; @@ -206,7 +206,7 @@ public class ExportExcelServiceImpl implements IExportExcelService { sonList.forEach(everySon -> { if (parentGroupByIdMap.containsKey(everySon.getPid())) { - everySon.setPData(parentGroupByIdMap.get(everySon.getPid()).get(0)); + everySon.setPData(parentGroupByIdMap.get(everySon.getPid()).getFirst()); } }); } diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java index 73df60d83..fbbd6029e 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java @@ -593,7 +593,7 @@ public class GenTableServiceImpl implements IGenTableService { } } if (ObjectUtil.isNull(table.getPkColumn())) { - table.setPkColumn(table.getColumns().get(0)); + table.setPkColumn(table.getColumns().getFirst()); } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java index 9ff775e73..bc121287f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java @@ -211,7 +211,7 @@ public class WorkflowGlobalListener implements GlobalListener { } if (!BusinessStatusEnum.initialState(instance.getFlowStatus())) { if (task != null && CollUtil.isNotEmpty(nextTasks) && nextTasks.size() == 1 - && flwCommonService.applyNodeCode(definition.getId()).equals(nextTasks.get(0).getNodeCode())) { + && flwCommonService.applyNodeCode(definition.getId()).equals(nextTasks.getFirst().getNodeCode())) { // 如果为画线指定驳回 线条指定为驳回 驳回得节点为申请人节点 则修改流程状态为退回 flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, BusinessStatusEnum.BACK.getStatus(), params, false); notifyInitiatorIfNeeded(definition, instance, BusinessStatusEnum.BACK.getStatus(), variable); @@ -266,7 +266,7 @@ public class WorkflowGlobalListener implements GlobalListener { return true; } String applyNodeCode = flwCommonService.applyNodeCode(definition.getId()); - return !StringUtils.equals(applyNodeCode, nextTasks.get(0).getNodeCode()); + return !StringUtils.equals(applyNodeCode, nextTasks.getFirst().getNodeCode()); } private void notifyInitiatorIfNeeded(Definition definition, Instance instance, String status, Map variable) { diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java index 81d71f0d8..68ae25fb0 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java @@ -165,7 +165,7 @@ public class FlwCommonServiceImpl implements IFlwCommonService { if (CollUtil.isEmpty(firstBetweenNode)) { throw new ServiceException("流程定义缺少申请人节点，请检查流程定义配置"); } - return firstBetweenNode.get(0).getNodeCode(); + return firstBetweenNode.getFirst().getNodeCode(); } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 9444dda4e..2069e7b35 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -136,8 +136,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService { taskService.mergeVariable(flowInstance, variables); insService.updateById(flowInstance); RemoteStartProcessReturn dto = new RemoteStartProcessReturn(); - dto.setProcessInstanceId(taskList.get(0).getInstanceId()); - dto.setTaskId(taskList.get(0).getId()); + dto.setProcessInstanceId(taskList.getFirst().getInstanceId()); + dto.setTaskId(taskList.getFirst().getId()); // 保存流程实例业务信息 this.buildFlowInstanceBizExt(flowInstance, bizExt); return dto; @@ -170,7 +170,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { } RemoteStartProcessReturn dto = new RemoteStartProcessReturn(); dto.setProcessInstanceId(instance.getId()); - dto.setTaskId(taskList.get(0).getId()); + dto.setTaskId(taskList.getFirst().getId()); return dto; } @@ -346,7 +346,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { if (CollUtil.isEmpty(flowHisTasks)) { throw new ServiceException("流程历史任务不存在，无法添加抄送记录"); } - FlowHisTask flowHisTask = flowHisTasks.get(0); + FlowHisTask flowHisTask = flowHisTasks.getFirst(); FlowNode flowNode = new FlowNode(); flowNode.setNodeCode(flowHisTask.getTargetNodeCode()); flowNode.setNodeName(flowHisTask.getTargetNodeName()); @@ -531,7 +531,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { return nodeCodes; } //判断是否配置了固定驳回节点 - Node node = nodeCodes.get(0); + Node node = nodeCodes.getFirst(); if (StringUtils.isNotBlank(node.getAnyNodeSkip())) { return nodeService.getByNodeCodes(Collections.singletonList(node.getAnyNodeSkip()), task.getDefinitionId()); }