From e237862aa7204822a89340fc28e8613f993bb9ce Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 27 七月 2026 15:35:43 +0800
Subject: [PATCH] fix: 代码格式化,安全生产数据倒序
---
src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java
index f3f83f7..a8e2b85 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java
@@ -17,6 +17,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -65,14 +66,14 @@
// 鏀堕泦鎵�鏈夎鏂絀D
List<Integer> facilityIds = records.stream()
.map(SafeFacilityInspection::getFacilityId)
- .filter(id -> id != null)
+ .filter(Objects::nonNull)
.distinct()
.collect(Collectors.toList());
// 鏀堕泦鎵�鏈夊贰妫�浜篒D
List<Long> inspectorIds = records.stream()
.map(SafeFacilityInspection::getInspectorId)
- .filter(id -> id != null)
+ .filter(Objects::nonNull)
.map(Integer::longValue)
.distinct()
.collect(Collectors.toList());
@@ -81,7 +82,7 @@
Map<Integer, SafeFacilityLedger> facilityMap = Map.of();
if (!facilityIds.isEmpty()) {
facilityMap = safeFacilityLedgerService.listByIds(facilityIds).stream()
- .collect(Collectors.toMap(SafeFacilityLedger::getId, f -> f, (v1, v2) -> v1));
+ .collect(Collectors.toMap(SafeFacilityLedger::getId, f -> f, (v1, _) -> v1));
}
// 鎵归噺鏌ヨ宸℃浜轰俊鎭�
@@ -89,7 +90,7 @@
if (!inspectorIds.isEmpty()) {
List<SysUser> users = sysUserMapper.selectUserByIds(inspectorIds);
userMap = users.stream()
- .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName, (v1, v2) -> v1));
+ .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName, (v1, _) -> v1));
}
// 濉厖瀛楁
--
Gitblit v1.9.3