diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionFile.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionFile.java index bbdcb1b8..cc8c7459 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionFile.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionFile.java @@ -58,4 +58,10 @@ public class InspectionFile extends TenantBaseDO @TableField(exist = false) private Map params; + + @TableField(exist = false) + private boolean IsImage; + + @TableField(exist = false) + private String fileType; } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java index 2c397a0c..3717204b 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java @@ -1420,6 +1420,9 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl { //检测工单id inspectionWorkNode.setInspectionInfoId(info.getId()); + //设置开始时间与更新时间为null + inspectionWorkNode.setCreateTime(null); + inspectionWorkNode.setUpdateTime(null); //将节点状态设置为未开始 inspectionWorkNode.setStatus("0"); }); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java index 7bf88b9f..33c358e5 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.constant.InspectionConstants; import cn.iocoder.yudao.module.inspection.entity.InspectionFile; @@ -15,6 +16,7 @@ import cn.iocoder.yudao.module.inspection.service.IInspectionFileService; import cn.iocoder.yudao.module.inspection.service.IWarnMessageService; import cn.iocoder.yudao.module.inspection.service.InspectionFileRecordService; import cn.iocoder.yudao.module.inspection.service.InspectionFileUserService; +import cn.iocoder.yudao.util.FileTypeUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -235,7 +237,17 @@ public class InspectionFileServiceImpl extends ServiceImpl fileList = this.list(queryWrapper); + //判断文件是否是图片 + fileList.forEach(file -> { + if (StrUtil.isNotEmpty(file.getFilePath())) { + boolean image = FileTypeUtils.isImage(file.getFilePath()); + String fileType = FileTypeUtils.getFileType(file.getFilePath()); + file.setIsImage(image); + file.setFileType(fileType); + } + }); + return fileList; } /** @@ -361,6 +373,16 @@ public class InspectionFileServiceImpl extends ServiceImpl file.getFileName().contains(inspectionFile.getFileName())).collect(Collectors.toSet()); } + + //判断文件是否是图片 + resultFiles.forEach(file -> { + if (StrUtil.isNotEmpty(file.getFilePath())) { + boolean image = FileTypeUtils.isImage(file.getFilePath()); + String fileType = FileTypeUtils.getFileType(file.getFilePath()); + file.setIsImage(image); + file.setFileType(fileType); + } + }); return resultFiles; } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java index a47dddde..21f873fd 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java @@ -322,6 +322,9 @@ public class InspectionInfoServiceImpl extends ServiceImpl { //检测工单id inspectionWorkNode.setInspectionInfoId(inspectionInfo.getId()); + //设置开始时间与更新时间为null + inspectionWorkNode.setCreateTime(null); + inspectionWorkNode.setUpdateTime(null); //将节点状态设置为未开始 inspectionWorkNode.setStatus("0"); }); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/util/FileTypeUtils.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/util/FileTypeUtils.java index c3cae7fd..91a082e7 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/util/FileTypeUtils.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/util/FileTypeUtils.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.util; import org.apache.commons.lang3.StringUtils; import java.io.File; +import java.net.URL; /** * 文件类型工具类 @@ -74,4 +75,20 @@ public class FileTypeUtils } return strFileExtendName; } + + public static boolean isImage(String fileUrl) { + // 常见的图片文件扩展名 + String[] imageExtensions = {".jpg", ".jpeg", ".png", ".gif", ".bmp", ".webp"}; + + // 将URL转换为小写以便比较 + fileUrl = fileUrl.toLowerCase(); + + // 检查URL是否以图片扩展名结尾 + for (String extension : imageExtensions) { + if (fileUrl.endsWith(extension)) { + return true; + } + } + return false; + } }