feat: 安全设施巡检调整

gongchunyi

5 天以前 64de92ae028b582b7fbe8d3c84eb568edf0d400f

 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;
@@ -35,6 +40,8 @@
    private SafeFacilityLedgerService safeFacilityLedgerService;
    @Autowired
    private SysUserMapper sysUserMapper;
    @Autowired
    private FileUtil fileUtil;

    @Override
    public SafeFacilityInspection getById(Serializable id) {
@@ -48,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) {
@@ -105,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()
        );
    }
}