From 4c83236eef00527805819548f29811d77fd9d110 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Fri, 25 Apr 2025 13:51:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E6=8A=A5,=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/DailyInspectionReport.java | 15 +++++++ .../domain/bo/DailyInspectionReportBo.java | 17 ++++++++ .../domain/vo/DailyInspectionReportVo.java | 16 +++++++- .../DailyInspectionReportServiceImpl.java | 40 ++++++++++++++++++- 4 files changed, 85 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/DailyInspectionReport.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/DailyInspectionReport.java index 607de7a..e1b529c 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/DailyInspectionReport.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/DailyInspectionReport.java @@ -8,6 +8,7 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serial; +import java.util.List; /** * 巡检日报对象 daily_inspection_report @@ -44,6 +45,20 @@ public class DailyInspectionReport extends TenantEntity { */ private String type; + /** + * 附件 + */ + @TableField(exist = false) + private List attachments; + + + /** + * 巡检图片 + */ + @TableField(exist = false) + private List inspectionPhotos; + + /** * 巡检时间 */ diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java index 6b1fd19..3d8e03d 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java @@ -1,5 +1,7 @@ package org.dromara.platform.domain.bo; +import com.baomidou.mybatisplus.annotation.TableField; +import org.dromara.platform.domain.Attachment; import org.dromara.platform.domain.DailyInspectionReport; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; @@ -9,6 +11,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; /** @@ -71,6 +75,19 @@ public class DailyInspectionReportBo extends BaseEntity { //@NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class }) private String attachment; + /** + * 附件 + */ + @TableField(exist = false) + private List attachments; + + /** + * 巡检图片 + */ + @TableField(exist = false) + private List inspectionPhotos; + + /** * 运维单位 */ diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/DailyInspectionReportVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/DailyInspectionReportVo.java index 1780934..77bcaea 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/DailyInspectionReportVo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/DailyInspectionReportVo.java @@ -1,7 +1,10 @@ package org.dromara.platform.domain.vo; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.platform.domain.Attachment; import org.dromara.platform.domain.DailyInspectionReport; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -13,7 +16,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.util.Date; - +import java.util.List; /** @@ -110,4 +113,15 @@ public class DailyInspectionReportVo implements Serializable { private String inspectionPhoto; + /** + * 附件 + */ + @TableField(exist = false) + private List attachments; + + /** + * 巡检图片 + */ + @TableField(exist = false) + private List inspectionPhotos; } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/DailyInspectionReportServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/DailyInspectionReportServiceImpl.java index acead65..302fe23 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/DailyInspectionReportServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/DailyInspectionReportServiceImpl.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.platform.domain.Attachment; +import org.dromara.platform.domain.AttachmentSerializer; import org.springframework.stereotype.Service; import org.dromara.platform.domain.bo.DailyInspectionReportBo; import org.dromara.platform.domain.vo.DailyInspectionReportVo; @@ -39,7 +41,20 @@ public class DailyInspectionReportServiceImpl implements IDailyInspectionReportS */ @Override public DailyInspectionReportVo queryById(Long id){ - return baseMapper.selectVoById(id); + DailyInspectionReportVo dailyInspectionReportVo = baseMapper.selectVoById(id); + String attachment = dailyInspectionReportVo.getAttachment(); + if (StringUtils.isNotBlank(attachment)) { + AttachmentSerializer serializer = new AttachmentSerializer(); + List attachments = serializer.deserializeAttachments(attachment); + dailyInspectionReportVo.setAttachments(attachments); + } + String inspectionPhoto = dailyInspectionReportVo.getInspectionPhoto(); + if (StringUtils.isNotBlank(inspectionPhoto)) { + AttachmentSerializer serializer = new AttachmentSerializer(); + List inspectionPhotos = serializer.deserializeAttachments(inspectionPhoto); + dailyInspectionReportVo.setAttachments(inspectionPhotos); + } + return dailyInspectionReportVo; } /** @@ -98,6 +113,17 @@ public class DailyInspectionReportServiceImpl implements IDailyInspectionReportS add.setInspectionUnit("测试巡检单位"); add.setType("前端(默认)"); validEntityBeforeSave(add); + List attachments = bo.getAttachments(); + AttachmentSerializer serializer1 = new AttachmentSerializer(); + String serializedAttachment = serializer1.serializeAttachments(attachments); + add.setAttachment(serializedAttachment); + + List inspectionPhotos = bo.getInspectionPhotos(); + AttachmentSerializer serializer2 = new AttachmentSerializer(); + String serializedInspectionPhoto = serializer2.serializeAttachments(inspectionPhotos); + add.setInspectionPhoto(serializedInspectionPhoto); + + boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); @@ -114,7 +140,17 @@ public class DailyInspectionReportServiceImpl implements IDailyInspectionReportS @Override public Boolean updateByBo(DailyInspectionReportBo bo) { DailyInspectionReport update = MapstructUtils.convert(bo, DailyInspectionReport.class); - validEntityBeforeSave(update); + //validEntityBeforeSave(update); + List attachments = bo.getAttachments(); + AttachmentSerializer serializer1 = new AttachmentSerializer(); + String serializedAttachment = serializer1.serializeAttachments(attachments); + update.setAttachment(serializedAttachment); + + List inspectionPhotos = bo.getInspectionPhotos(); + AttachmentSerializer serializer2 = new AttachmentSerializer(); + String serializedInspectionPhoto = serializer2.serializeAttachments(inspectionPhotos); + update.setInspectionPhoto(serializedInspectionPhoto); + return baseMapper.updateById(update) > 0; }