补充 附件

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ContractInfoBo.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.ContractInfo;
 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;
 
 /**
@@ -29,6 +33,13 @@ public class ContractInfoBo extends BaseEntity {
     private String id;
 
 
+    /**
+     * 附件
+     */
+    @TableField(exist = false)
+    //@NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
+    private List<Attachment> attachments;
+
     /**
      * 项目名称
      */

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DocumentInfoBo.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.DocumentInfo;
 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.List;
+
 /**
  * 文档信息业务对象 document_info
  *
@@ -44,6 +48,13 @@ public class DocumentInfoBo extends BaseEntity {
     //@NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
     private String attachment;
 
+    /**
+     * 附件
+     */
+    @TableField(exist = false)
+    @NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
+    private List<Attachment> attachments;
+
     /**
      * 当前状态:0启用 1禁用
      */

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ProjectInfoBo.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.ProjectInfo;
 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.List;
+
 /**
  * 项目信息业务对象 project_info
  *
@@ -110,5 +114,10 @@ public class ProjectInfoBo extends BaseEntity {
     //@NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long status;
 
-
+    /**
+     * 附件
+     */
+    @TableField(exist = false)
+    //@NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
+    private List<Attachment> attachments;
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java

@@ -1,6 +1,7 @@
 package org.dromara.platform.domain.bo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
@@ -11,9 +12,11 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.platform.domain.Attachment;
 import org.dromara.platform.domain.WorkOrderInfo;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 工单信息业务对象 work_order_info
@@ -108,6 +111,10 @@ public class WorkOrderInfoBo extends BaseEntity {
     //@NotBlank(message = "故障图片不能为空", groups = { AddGroup.class, EditGroup.class })
     private String faultImage;
 
+    @TableField(exist = false)
+    //@NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
+    private List<Attachment> attachments;
+
     /**
      * 维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他)
      */

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ContractInfoVo.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.ContractInfo;
 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;
 
 
 /**
@@ -36,6 +39,13 @@ public class ContractInfoVo implements Serializable {
     @ExcelProperty(value = "唯一标识符")
     private String id;
 
+    /**
+     * 附件
+     */
+    @TableField(exist = false)
+    //@NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
+    private List<Attachment> attachments;
+
     /**
      * 合同名称
      */

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/DocumentInfoVo.java

@@ -2,6 +2,7 @@ package org.dromara.platform.domain.vo;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import org.dromara.platform.domain.Attachment;
 import org.dromara.platform.domain.DocumentInfo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -13,7 +14,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -54,6 +55,13 @@ public class DocumentInfoVo implements Serializable {
     @ExcelProperty(value = "附件")
     private String attachment;
 
+
+    /**
+     * 附件
+     */
+    @TableField(exist = false)
+    private List<Attachment> attachments;
+
     /**
      * 当前状态:0启用 1禁用
      */

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ProjectInfoVo.java

@@ -1,5 +1,7 @@
 package org.dromara.platform.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import org.dromara.platform.domain.Attachment;
 import org.dromara.platform.domain.ProjectInfo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -11,7 +13,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -118,5 +120,10 @@ public class ProjectInfoVo implements Serializable {
     @ExcelProperty(value = "当前状态")
     private Long status;
 
-
+    /**
+     * 附件
+     */
+    @TableField(exist = false)
+    //@NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
+    private List<Attachment> attachments;
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java

@@ -1,8 +1,10 @@
 package org.dromara.platform.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.platform.domain.Attachment;
 import org.dromara.platform.domain.WorkOrderInfo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -14,7 +16,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -37,6 +39,10 @@ public class WorkOrderInfoVo implements Serializable {
     @ExcelProperty(value = "工单ID")
     private String id;
 
+    @TableField(exist = false)
+    //@NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
+    private List<Attachment> attachments;
+
     /**
      * 所属项目
      */

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ContractInfoServiceImpl.java

@@ -10,6 +10,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.dromara.platform.domain.ProjectInfo;
 import org.dromara.platform.domain.vo.ContractSelectVo;
 import org.dromara.platform.domain.vo.ProjectInfoVo;
@@ -50,7 +52,14 @@ public class ContractInfoServiceImpl implements IContractInfoService {
      */
     @Override
     public ContractInfoVo queryById(String id){
-        return baseMapper.selectVoById(id);
+        ContractInfoVo contractInfoVo = baseMapper.selectVoById(id);
+        String attachment = contractInfoVo.getAttachment();
+        if (StringUtils.isNotBlank(attachment)) {
+            AttachmentSerializer serializer = new AttachmentSerializer();
+            List<Attachment> attachments = serializer.deserializeAttachments(attachment);
+            contractInfoVo.setAttachments(attachments);
+        }
+        return contractInfoVo;
     }
 
     /**
@@ -113,6 +122,12 @@ public class ContractInfoServiceImpl implements IContractInfoService {
     public Boolean insertByBo(ContractInfoBo bo) {
         ContractInfo add = MapstructUtils.convert(bo, ContractInfo.class);
         validEntityBeforeSave(add);
+
+        List<Attachment> attachments = bo.getAttachments();
+        AttachmentSerializer serializer = new AttachmentSerializer();
+        String serializedAttachment = serializer.serializeAttachments(attachments);
+        add.setAttachment(serializedAttachment);
+
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -130,6 +145,10 @@ public class ContractInfoServiceImpl implements IContractInfoService {
     public Boolean updateByBo(ContractInfoBo bo) {
         ContractInfo update = MapstructUtils.convert(bo, ContractInfo.class);
         validEntityBeforeSave(update);
+        List<Attachment> attachments = bo.getAttachments();
+        AttachmentSerializer serializer = new AttachmentSerializer();
+        String serializedAttachment = serializer.serializeAttachments(attachments);
+        update.setAttachment(serializedAttachment);
         return baseMapper.updateById(update) > 0;
     }
 

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/DocumentInfoServiceImpl.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.DocumentInfoBo;
 import org.dromara.platform.domain.vo.DocumentInfoVo;
@@ -39,7 +41,14 @@ public class DocumentInfoServiceImpl implements IDocumentInfoService {
      */
     @Override
     public DocumentInfoVo queryById(String id){
-        return baseMapper.selectVoById(id);
+        DocumentInfoVo documentInfoVo = baseMapper.selectVoById(id);
+        String attachment = documentInfoVo.getAttachment();
+        if (StringUtils.isNotBlank(attachment)) {
+            AttachmentSerializer serializer = new AttachmentSerializer();
+            List<Attachment> attachments = serializer.deserializeAttachments(attachment);
+            documentInfoVo.setAttachments(attachments);
+        }
+        return documentInfoVo;
     }
 
     /**
@@ -88,6 +97,11 @@ public class DocumentInfoServiceImpl implements IDocumentInfoService {
     public Boolean insertByBo(DocumentInfoBo bo) {
         DocumentInfo add = MapstructUtils.convert(bo, DocumentInfo.class);
         validEntityBeforeSave(add);
+        List<Attachment> attachments = bo.getAttachments();
+        AttachmentSerializer serializer = new AttachmentSerializer();
+        String serializedAttachment = serializer.serializeAttachments(attachments);
+        add.setAttachment(serializedAttachment);
+
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -105,6 +119,10 @@ public class DocumentInfoServiceImpl implements IDocumentInfoService {
     public Boolean updateByBo(DocumentInfoBo bo) {
         DocumentInfo update = MapstructUtils.convert(bo, DocumentInfo.class);
         validEntityBeforeSave(update);
+        List<Attachment> attachments = bo.getAttachments();
+        AttachmentSerializer serializer = new AttachmentSerializer();
+        String serializedAttachment = serializer.serializeAttachments(attachments);
+        update.setAttachment(serializedAttachment);
         return baseMapper.updateById(update) > 0;
     }
 

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectInfoServiceImpl.java

@@ -10,6 +10,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.dromara.platform.domain.ContractInfo;
 import org.dromara.platform.domain.vo.ProjectSelectVo;
 import org.dromara.platform.mapper.ContractInfoMapper;
@@ -49,7 +51,14 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
      */
     @Override
     public ProjectInfoVo queryById(String id){
-        return baseMapper.selectVoById(id);
+        ProjectInfoVo projectInfoVo = baseMapper.selectVoById(id);
+        String attachment = projectInfoVo.getAttachment();
+        if (StringUtils.isNotBlank(attachment)) {
+            AttachmentSerializer serializer = new AttachmentSerializer();
+            List<Attachment> attachments = serializer.deserializeAttachments(attachment);
+            projectInfoVo.setAttachments(attachments);
+        }
+        return projectInfoVo;
     }
 
     /**
@@ -108,6 +117,12 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
     public Boolean insertByBo(ProjectInfoBo bo) {
         ProjectInfo add = MapstructUtils.convert(bo, ProjectInfo.class);
         validEntityBeforeSave(add);
+        // 序列化处理 附件
+        List<Attachment> attachments = bo.getAttachments();
+        AttachmentSerializer serializer = new AttachmentSerializer();
+        String serializedAttachment = serializer.serializeAttachments(attachments);
+        add.setAttachment(serializedAttachment);
+
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -125,6 +140,10 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
     public Boolean updateByBo(ProjectInfoBo bo) {
         ProjectInfo update = MapstructUtils.convert(bo, ProjectInfo.class);
         validEntityBeforeSave(update);
+        List<Attachment> attachments = bo.getAttachments();
+        AttachmentSerializer serializer = new AttachmentSerializer();
+        String serializedAttachment = serializer.serializeAttachments(attachments);
+        update.setAttachment(serializedAttachment);
         return baseMapper.updateById(update) > 0;
     }
 

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java

@@ -10,6 +10,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.dromara.platform.domain.InspectionPlanInfo;
 import org.springframework.stereotype.Service;
 import org.dromara.platform.domain.bo.WorkOrderInfoBo;
@@ -41,7 +43,14 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
      */
     @Override
     public WorkOrderInfoVo queryById(String id){
-        return baseMapper.selectVoById(id);
+        WorkOrderInfoVo workOrderInfoVo = baseMapper.selectVoById(id);
+        String attachment = workOrderInfoVo.getFaultImage();
+        if (StringUtils.isNotBlank(attachment)) {
+            AttachmentSerializer serializer = new AttachmentSerializer();
+            List<Attachment> attachments = serializer.deserializeAttachments(attachment);
+            workOrderInfoVo.setAttachments(attachments);
+        }
+        return workOrderInfoVo;
     }
 
     /**
@@ -108,6 +117,10 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
         WorkOrderInfo add = MapstructUtils.convert(bo, WorkOrderInfo.class);
         add.setRepairTime(DateUtil.date());
         validEntityBeforeSave(add);
+        List<Attachment> attachments = bo.getAttachments();
+        AttachmentSerializer serializer = new AttachmentSerializer();
+        String serializedAttachment = serializer.serializeAttachments(attachments);
+        add.setFaultImage(serializedAttachment);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -125,6 +138,12 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
     public Boolean updateByBo(WorkOrderInfoBo bo) {
         WorkOrderInfo update = MapstructUtils.convert(bo, WorkOrderInfo.class);
         validEntityBeforeSave(update);
+
+        List<Attachment> attachments = bo.getAttachments();
+        AttachmentSerializer serializer = new AttachmentSerializer();
+        String serializedAttachment = serializer.serializeAttachments(attachments);
+        update.setFaultImage(serializedAttachment);
+
         return baseMapper.updateById(update) > 0;
     }