From 16d50e1fd871b2306e7beb650463bc76263e5e98 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 28 七月 2026 10:03:30 +0800
Subject: [PATCH] fix: 异常图片上传、bug修改
---
src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 119 insertions(+), 1 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 e11b3f9..b5301d6 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java
@@ -2,11 +2,27 @@
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.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.safe.pojo.SafeFacilityInspection;
+import com.ruoyi.safe.pojo.SafeFacilityLedger;
import com.ruoyi.safe.mapper.SafeFacilityInspectionMapper;
import com.ruoyi.safe.service.SafeFacilityInspectionService;
+import com.ruoyi.safe.service.SafeFacilityLedgerService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -19,13 +35,115 @@
@Service
public class SafeFacilityInspectionServiceImpl extends ServiceImpl<SafeFacilityInspectionMapper, SafeFacilityInspection> implements SafeFacilityInspectionService {
+ @Autowired
+ private SafeFacilityLedgerService safeFacilityLedgerService;
+ @Autowired
+ private SysUserMapper sysUserMapper;
+ @Autowired
+ private FileUtil fileUtil;
+
+ @Override
+ public SafeFacilityInspection getById(Serializable id) {
+ SafeFacilityInspection record = super.getById(id);
+ if (record != null) {
+ fillExtraInfo(Collections.singletonList(record));
+ }
+ return record;
+ }
+
@Override
public IPage<SafeFacilityInspection> pageSafeFacilityInspection(Page page, SafeFacilityInspection safeFacilityInspection) {
- return this.lambdaQuery()
+ IPage<SafeFacilityInspection> result = this.lambdaQuery()
.like(safeFacilityInspection.getInspectionCode() != null, SafeFacilityInspection::getInspectionCode, safeFacilityInspection.getInspectionCode())
.eq(safeFacilityInspection.getFacilityId() != null, SafeFacilityInspection::getFacilityId, safeFacilityInspection.getFacilityId())
.eq(safeFacilityInspection.getStatus() != null, 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) {
+ if (records == null || records.isEmpty()) {
+ return;
+ }
+
+ // 鏀堕泦鎵�鏈夎鏂絀D
+ List<Integer> facilityIds = records.stream()
+ .map(SafeFacilityInspection::getFacilityId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+
+ // 鏀堕泦鎵�鏈夊贰妫�浜篒D
+ List<Long> inspectorIds = records.stream()
+ .map(SafeFacilityInspection::getInspectorId)
+ .filter(Objects::nonNull)
+ .map(Integer::longValue)
+ .distinct()
+ .collect(Collectors.toList());
+
+ // 鎵归噺鏌ヨ璁炬柦淇℃伅
+ Map<Integer, SafeFacilityLedger> facilityMap = Map.of();
+ if (!facilityIds.isEmpty()) {
+ facilityMap = safeFacilityLedgerService.listByIds(facilityIds).stream()
+ .collect(Collectors.toMap(SafeFacilityLedger::getId, f -> f, (v1, _) -> v1));
+ }
+
+ // 鎵归噺鏌ヨ宸℃浜轰俊鎭�
+ Map<Long, String> userMap = Map.of();
+ if (!inspectorIds.isEmpty()) {
+ List<SysUser> users = sysUserMapper.selectUserByIds(inspectorIds);
+ userMap = users.stream()
+ .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName, (v1, _) -> v1));
+ }
+
+ // 濉厖瀛楁
+ for (SafeFacilityInspection record : records) {
+ if (record.getFacilityId() != null) {
+ SafeFacilityLedger facility = facilityMap.get(record.getFacilityId());
+ if (facility != null) {
+ record.setFacilityName(facility.getFacilityName());
+ record.setFacilityCode(facility.getFacilityCode());
+ }
+ }
+ 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