From 64de92ae028b582b7fbe8d3c84eb568edf0d400f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 30 七月 2026 13:49:37 +0800
Subject: [PATCH] feat: 安全设施巡检调整
---
src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 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..7ef6490 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java
@@ -2,6 +2,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.StorageBlobVO;
+import com.ruoyi.basic.enums.ApplicationTypeEnum;
+import com.ruoyi.basic.enums.RecordTypeEnum;
+import com.ruoyi.basic.utils.FileUtil;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.safe.pojo.SafeFacilityInspection;
@@ -17,6 +22,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -34,6 +40,8 @@
private SafeFacilityLedgerService safeFacilityLedgerService;
@Autowired
private SysUserMapper sysUserMapper;
+ @Autowired
+ private FileUtil fileUtil;
@Override
public SafeFacilityInspection getById(Serializable id) {
@@ -47,14 +55,29 @@
@Override
public IPage<SafeFacilityInspection> pageSafeFacilityInspection(Page page, SafeFacilityInspection safeFacilityInspection) {
IPage<SafeFacilityInspection> result = this.lambdaQuery()
- .like(safeFacilityInspection.getInspectionCode() != null, SafeFacilityInspection::getInspectionCode, safeFacilityInspection.getInspectionCode())
+ .eq(safeFacilityInspection.getScheduleTaskId() != null, SafeFacilityInspection::getScheduleTaskId, safeFacilityInspection.getScheduleTaskId())
+ .like(StringUtils.isNotBlank(safeFacilityInspection.getInspectionCode()), SafeFacilityInspection::getInspectionCode, safeFacilityInspection.getInspectionCode())
.eq(safeFacilityInspection.getFacilityId() != null, SafeFacilityInspection::getFacilityId, safeFacilityInspection.getFacilityId())
- .eq(safeFacilityInspection.getStatus() != null, SafeFacilityInspection::getStatus, safeFacilityInspection.getStatus())
+ .eq(StringUtils.isNotBlank(safeFacilityInspection.getStatus()), SafeFacilityInspection::getStatus, safeFacilityInspection.getStatus())
.orderByDesc(SafeFacilityInspection::getCreateTime)
.page(page);
fillExtraInfo(result.getRecords());
return result;
+ }
+
+ @Override
+ public boolean save(SafeFacilityInspection entity) {
+ boolean saved = super.save(entity);
+ syncAttachments(saved, entity);
+ return saved;
+ }
+
+ @Override
+ public boolean updateById(SafeFacilityInspection entity) {
+ boolean updated = super.updateById(entity);
+ syncAttachments(updated, entity);
+ return updated;
}
private void fillExtraInfo(List<SafeFacilityInspection> records) {
@@ -65,14 +88,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 +104,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 +112,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));
}
// 濉厖瀛楁
@@ -104,6 +127,25 @@
if (record.getInspectorId() != null) {
record.setInspectorName(userMap.getOrDefault(record.getInspectorId().longValue(), "鏈煡鐢ㄦ埛"));
}
+ if (record.getId() != null) {
+ List<StorageBlobVO> attachments = fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(
+ RecordTypeEnum.SAFE_FACILITY_INSPECTION,
+ record.getId().longValue()
+ );
+ record.setStorageBlobVOs(attachments == null ? Collections.emptyList() : attachments);
+ }
}
}
+
+ private void syncAttachments(boolean success, SafeFacilityInspection entity) {
+ if (!success || entity == null || entity.getId() == null || entity.getStorageBlobDTOs() == null) {
+ return;
+ }
+ fileUtil.saveStorageAttachment(
+ ApplicationTypeEnum.IMAGE,
+ RecordTypeEnum.SAFE_FACILITY_INSPECTION,
+ entity.getId().longValue(),
+ entity.getStorageBlobDTOs()
+ );
+ }
}
--
Gitblit v1.9.3