refactor(domain):优化设备故障实例和知识库实体类

- 移除无用的注释导入语句
-为 DmsBillsFaultInstance 添加 EqualsAndHashCode 注解支持
- 为 DmsBillsFaultInstance 补充大量字段的 getter 和 setter 方法
- 更新 DmsKnowledgeLube、DmsKnowledgeMaint 和 DmsKnowledgeRepair  中的 SysFile 引用为 AttachFileDTO- 修改相关服务实现类使用 AttachFileDTO 替代 SysFile
- 启用并修正 DmsKnowledgeRepairServiceImpl 中的附件处理逻辑
- 统一附件文件处理方式，增强代码一致性与可维护性

aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseDeviceLedger.java

@@ -1,8 +1,5 @@
 package com.aucma.dms.domain;
 
-//import com.hw.common.core.annotation.Excel;
-//import com.hw.common.core.web.domain.DmsBaseEntity;
-
 import com.aucma.common.annotation.Excel;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsFaultInstance.java

@@ -4,6 +4,7 @@ import com.aucma.common.annotation.Excel;
 import com.aucma.framework.web.domain.server.SysFile;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -18,6 +19,7 @@ import java.util.List;
  * @author Open Platform
  * @date 2024-01-23
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class DmsBillsFaultInstance extends DmsBaseEntity
 {
@@ -409,6 +411,110 @@ public class DmsBillsFaultInstance extends DmsBaseEntity
         this.verifyMethod = verifyMethod;
     }
 
+    public String getConfirmer() {
+        return confirmer;
+    }
+
+    public void setConfirmer(String confirmer) {
+        this.confirmer = confirmer;
+    }
+
+    public String getApplyUserPhone() {
+        return applyUserPhone;
+    }
+
+    public void setApplyUserPhone(String applyUserPhone) {
+        this.applyUserPhone = applyUserPhone;
+    }
+
+    public String getFaultLevel() {
+        return faultLevel;
+    }
+
+    public void setFaultLevel(String faultLevel) {
+        this.faultLevel = faultLevel;
+    }
+
+    public List<DmsInstanceFile> getDmsInstanceFiles1() {
+        return dmsInstanceFiles1;
+    }
+
+    public void setDmsInstanceFiles1(List<DmsInstanceFile> dmsInstanceFiles1) {
+        this.dmsInstanceFiles1 = dmsInstanceFiles1;
+    }
+
+    public String getCheckedFault() {
+        return checkedFault;
+    }
+
+    public void setCheckedFault(String checkedFault) {
+        this.checkedFault = checkedFault;
+    }
+
+    public String getRepairContent() {
+        return repairContent;
+    }
+
+    public void setRepairContent(String repairContent) {
+        this.repairContent = repairContent;
+    }
+
+    public String getProtectedMethod() {
+        return protectedMethod;
+    }
+
+    public void setProtectedMethod(String protectedMethod) {
+        this.protectedMethod = protectedMethod;
+    }
+
+    public String getRepairer() {
+        return repairer;
+    }
+
+    public void setRepairer(String repairer) {
+        this.repairer = repairer;
+    }
+
+    public String getApproveStatus() {
+        return approveStatus;
+    }
+
+    public void setApproveStatus(String approveStatus) {
+        this.approveStatus = approveStatus;
+    }
+
+    public Integer getRepairConfirm() {
+        return repairConfirm;
+    }
+
+    public void setRepairConfirm(Integer repairConfirm) {
+        this.repairConfirm = repairConfirm;
+    }
+
+    public Date getConfirmTime() {
+        return confirmTime;
+    }
+
+    public void setConfirmTime(Date confirmTime) {
+        this.confirmTime = confirmTime;
+    }
+
+    public Long getComponentsPartsId() {
+        return componentsPartsId;
+    }
+
+    public void setComponentsPartsId(Long componentsPartsId) {
+        this.componentsPartsId = componentsPartsId;
+    }
+
+    public List<DmsFaultCompentsParts> getParts() {
+        return parts;
+    }
+
+    public void setParts(List<DmsFaultCompentsParts> parts) {
+        this.parts = parts;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -430,6 +536,38 @@ public class DmsBillsFaultInstance extends DmsBaseEntity
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
+                .append("fileUrls", getFileUrls())
+                .append("dmsFaultInstanceActivityList", getDmsFaultInstanceActivityList())
+                .append("dmsInstanceFiles", getDmsInstanceFiles())
+                .append("knowledgeRepairId", getKnowledgeRepairId())
+                .append("verifyMethod", getVerifyMethod())
+                .append("confirmer", getConfirmer())
+                .append("applyUserPhone", getApplyUserPhone())
+                .append("faultLevel", getFaultLevel())
+                .append("dmsInstanceFiles1", getDmsInstanceFiles1())
+                .append("checkedFault", getCheckedFault())
+                .append("repairContent", getRepairContent())
+                .append("protectedMethod", getProtectedMethod())
+                .append("repairer", getRepairer())
+                .append("approveStatus", getApproveStatus())
+                .append("repairConfirm", getRepairConfirm())
+                .append("confirmTime", getConfirmTime())
+                .append("componentsPartsId", getComponentsPartsId())
+                .append("parts", getParts())
+                .append("deviceCode", getDeviceCode())
+                .append("deviceName", getDeviceName())
+                .append("deviceLocation",  getDeviceLocation())
+                .append("deviceSpec", getDeviceSpec())
+                .append("imgUrl", getImgUrl() )
+                .append("instanceActivityId", getInstanceActivityId())
+                .append("faultType", getFaultType())
+                .append("faultDescription", getFaultDescription())
+                .append("designOperations", getDesignOperations())
+                .append("deviceId", getDeviceId())
+                .append("repairType", getRepairType())
+                .append("outsrcId", getOutsrcId())
+                .append("processHandleResolution", getProcessHandleResolution())
+                .append("sysFiles", getSysFiles())
             .toString();
     }
 }

aucma-dms/src/main/java/com/aucma/dms/domain/DmsKnowledgeLube.java

@@ -1,11 +1,7 @@
 package com.aucma.dms.domain;
 
-//import com.hw.common.core.annotation.Excel;
-//import com.hw.common.core.web.domain.DmsBaseEntity;
-//import com.hw.system.api.domain.SysFile;
-
 import com.aucma.common.annotation.Excel;
-import com.aucma.framework.web.domain.server.SysFile;
+import com.aucma.dms.domain.dto.AttachFileDTO;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -50,7 +46,7 @@ public class DmsKnowledgeLube extends DmsBaseEntity
 
     List<String> fileUrls;
 
-    List<SysFile> systemFiles;
+    List<AttachFileDTO> systemFiles;
 
     List<BaseAttachInfo> attachments;
 
@@ -62,11 +58,11 @@ public class DmsKnowledgeLube extends DmsBaseEntity
         this.attachments = attachments;
     }
 
-    public List<SysFile> getSystemFiles() {
+    public List<AttachFileDTO> getSystemFiles() {
         return systemFiles;
     }
 
-    public void setSystemFiles(List<SysFile> systemFiles) {
+    public void setSystemFiles(List<AttachFileDTO> systemFiles) {
         this.systemFiles = systemFiles;
     }
 

aucma-dms/src/main/java/com/aucma/dms/domain/DmsKnowledgeMaint.java

@@ -1,11 +1,8 @@
 package com.aucma.dms.domain;
 
-//import com.hw.common.core.annotation.Excel;
-//import com.hw.common.core.web.domain.DmsBaseEntity;
-//import com.hw.system.api.domain.SysFile;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.framework.web.domain.server.SysFile;
+import com.aucma.dms.domain.dto.AttachFileDTO;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -50,7 +47,7 @@ public class DmsKnowledgeMaint extends DmsBaseEntity
 
     List<String> fileUrls;
 
-    List<SysFile> systemFiles;
+    List<AttachFileDTO> systemFiles;
 
     public List<String> getFileUrls() {
         return fileUrls;
@@ -60,11 +57,11 @@ public class DmsKnowledgeMaint extends DmsBaseEntity
         this.fileUrls = fileUrls;
     }
 
-    public List<SysFile> getSystemFiles() {
+    public List<AttachFileDTO> getSystemFiles() {
         return systemFiles;
     }
 
-    public void setSystemFiles(List<SysFile> systemFiles) {
+    public void setSystemFiles(List<AttachFileDTO> systemFiles) {
         this.systemFiles = systemFiles;
     }
 

aucma-dms/src/main/java/com/aucma/dms/domain/DmsKnowledgeRepair.java

@@ -1,11 +1,8 @@
 package com.aucma.dms.domain;
 
-//import com.hw.common.core.annotation.Excel;
-//import com.hw.common.core.web.domain.DmsBaseEntity;
-//import com.hw.system.api.domain.SysFile;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.framework.web.domain.server.SysFile;
+import com.aucma.dms.domain.dto.AttachFileDTO;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -50,7 +47,7 @@ public class DmsKnowledgeRepair extends DmsBaseEntity
 
     List<String> fileUrls;
 
-    List<SysFile> systemFiles;
+    List<AttachFileDTO> systemFiles;
 
     public List<String> getFileUrls() {
         return fileUrls;
@@ -60,11 +57,11 @@ public class DmsKnowledgeRepair extends DmsBaseEntity
         this.fileUrls = fileUrls;
     }
 
-    public List<SysFile> getSystemFiles() {
+    public List<AttachFileDTO> getSystemFiles() {
         return systemFiles;
     }
 
-    public void setSystemFiles(List<SysFile> systemFiles) {
+    public void setSystemFiles(List<AttachFileDTO> systemFiles) {
         this.systemFiles = systemFiles;
     }
 

aucma-dms/src/main/java/com/aucma/dms/mapper/BaseAttachInfoMapper.java

@@ -1,6 +1,5 @@
 package com.aucma.dms.mapper;
 
-//import com.aucma.dms.domain.BaseAttachInfo;
 
 import com.aucma.dms.domain.BaseAttachInfo;
 import org.apache.ibatis.annotations.Param;

aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsKnowledgeLubeServiceImpl.java

@@ -1,26 +1,15 @@
 package com.aucma.dms.service.impl;
 
-//import com.hw.common.core.constant.DmsConstants;
-//import com.hw.common.core.exception.ServiceException;
-//import com.hw.common.core.utils.DateUtils;
-//import com.aucma.dms.domain.BaseAttachInfo;
-//import com.aucma.dms.domain.DmsKnowledgeLube;
-//import com.aucma.dms.mapper.BaseAttachInfoMapper;
-//import com.aucma.dms.mapper.DmsBaseLubeStationMapper;
-//import com.aucma.dms.mapper.DmsKnowledgeLubeMapper;
-//import com.aucma.dms.service.IDmsKnowledgeLubeService;
-//import com.hw.system.api.domain.SysFile;
-
 import com.aucma.common.constant.DmsConstants;
 import com.aucma.common.exception.ServiceException;
 import com.aucma.common.utils.DateUtils;
 import com.aucma.dms.domain.BaseAttachInfo;
 import com.aucma.dms.domain.DmsKnowledgeLube;
 import com.aucma.dms.mapper.BaseAttachInfoMapper;
+import com.aucma.dms.domain.dto.AttachFileDTO;
 import com.aucma.dms.mapper.DmsBaseLubeStationMapper;
 import com.aucma.dms.mapper.DmsKnowledgeLubeMapper;
 import com.aucma.dms.service.IDmsKnowledgeLubeService;
-import com.aucma.framework.web.domain.server.SysFile;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -54,14 +43,13 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService
     {
         DmsKnowledgeLube dmsKnowledgeLube = dmsKnowledgeLubeMapper.selectDmsKnowledgeLubeByKnowledgeLubeId(knowledgeLubeId);
         List<String> baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGELUBE,dmsKnowledgeLube.getKnowledgeLubeId());
-        List<SysFile> sysFiles = new ArrayList<SysFile>();
+        List<AttachFileDTO> attachFiles = new ArrayList<AttachFileDTO>();
 
-//        for (String string:baseAttachInfos){
+        for (String url : baseAttachInfos){
-//            SysFile sysFile = new SysFile();
+            AttachFileDTO attachFile = new AttachFileDTO(url);
-//            sysFile.setUrl(string);
+            attachFiles.add(attachFile);
-//            sysFiles.add(sysFile);
+        }
-//        }
+        dmsKnowledgeLube.setSystemFiles(attachFiles);
-        dmsKnowledgeLube.setSystemFiles(sysFiles);
         return dmsKnowledgeLube;
     }
 

aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsKnowledgeMaintServiceImpl.java

@@ -1,15 +1,5 @@
 package com.aucma.dms.service.impl;
 
-//import com.hw.common.core.constant.DmsConstants;
-//import com.hw.common.core.exception.ServiceException;
-//import com.hw.common.core.utils.DateUtils;
-//import com.aucma.dms.domain.BaseAttachInfo;
-//import com.aucma.dms.domain.DmsKnowledgeMaint;
-//import com.aucma.dms.mapper.BaseAttachInfoMapper;
-//import com.aucma.dms.mapper.DmsBaseMaintStationMapper;
-//import com.aucma.dms.mapper.DmsKnowledgeMaintMapper;
-//import com.aucma.dms.service.IDmsKnowledgeMaintService;
-//import com.hw.system.api.domain.SysFile;
 
 import com.aucma.common.constant.DmsConstants;
 import com.aucma.common.exception.ServiceException;
@@ -17,10 +7,10 @@ import com.aucma.common.utils.DateUtils;
 import com.aucma.dms.domain.BaseAttachInfo;
 import com.aucma.dms.domain.DmsKnowledgeMaint;
 import com.aucma.dms.mapper.BaseAttachInfoMapper;
+import com.aucma.dms.domain.dto.AttachFileDTO;
 import com.aucma.dms.mapper.DmsBaseMaintStationMapper;
 import com.aucma.dms.mapper.DmsKnowledgeMaintMapper;
 import com.aucma.dms.service.IDmsKnowledgeMaintService;
-import com.aucma.framework.web.domain.server.SysFile;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -55,14 +45,13 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService
     {
         DmsKnowledgeMaint dmsKnowledgeMaint = dmsKnowledgeMaintMapper.selectDmsKnowledgeMaintByKnowledgeMaintId(knowledgeMaintId);
         List<String> baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEMAINT,dmsKnowledgeMaint.getKnowledgeMaintId());
-        List<SysFile> sysFiles = new ArrayList<SysFile>();
+        List<AttachFileDTO> attachFiles = new ArrayList<AttachFileDTO>();
 
-//        for (String string:baseAttachInfos){
+        for (String url : baseAttachInfos){
-//            SysFile sysFile = new SysFile();
+            AttachFileDTO attachFile = new AttachFileDTO(url);
-//            sysFile.setUrl(string);
+            attachFiles.add(attachFile);
-//            sysFiles.add(sysFile);
+        }
-//        }
+        dmsKnowledgeMaint.setSystemFiles(attachFiles);
-        dmsKnowledgeMaint.setSystemFiles(sysFiles);
         return dmsKnowledgeMaint;
     }
 

aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsKnowledgeRepairServiceImpl.java

@@ -1,14 +1,20 @@
 package com.aucma.dms.service.impl;
 
 
+import com.aucma.common.constant.DmsConstants;
 import com.aucma.common.exception.ServiceException;
 import com.aucma.common.utils.DateUtils;
+import com.aucma.dms.domain.BaseAttachInfo;
 import com.aucma.dms.domain.DmsKnowledgeRepair;
+import com.aucma.dms.domain.dto.AttachFileDTO;
+import com.aucma.dms.mapper.BaseAttachInfoMapper;
 import com.aucma.dms.mapper.DmsKnowledgeRepairMapper;
 import com.aucma.dms.service.IDmsKnowledgeRepairService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -23,8 +29,8 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
     @Autowired
     private DmsKnowledgeRepairMapper dmsKnowledgeRepairMapper;
 
-/*    @Autowired
+    @Autowired
-    private BaseAttachInfoMapper baseAttachInfoMapper;*/
+    private BaseAttachInfoMapper baseAttachInfoMapper;
 
     /**
      * 查询维修知识库
@@ -36,15 +42,14 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
     public DmsKnowledgeRepair selectDmsKnowledgeRepairByKnowledgeRepairId(Long knowledgeRepairId)
     {
         DmsKnowledgeRepair dmsKnowledgeRepair = dmsKnowledgeRepairMapper.selectDmsKnowledgeRepairByKnowledgeRepairId(knowledgeRepairId);
-/*        List<String> baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId());
+        List<String> baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId());
-        List<SysFile> sysFiles = new ArrayList<SysFile>();
+        List<AttachFileDTO> attachFiles = new ArrayList<AttachFileDTO>();
 
-//        for (String string:baseAttachInfos){
+        for (String url : baseAttachInfos){
-//            SysFile sysFile = new SysFile();
+            AttachFileDTO attachFile = new AttachFileDTO(url);
-//            sysFile.setUrl(string);
+            attachFiles.add(attachFile);
-//            sysFiles.add(sysFile);
+        }
-//        }
+        dmsKnowledgeRepair.setSystemFiles(attachFiles);
-        dmsKnowledgeRepair.setSystemFiles(sysFiles);*/
         return dmsKnowledgeRepair;
     }
 
@@ -78,9 +83,9 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
         dmsKnowledgeRepair.setIsFlag("1");
         int i = dmsKnowledgeRepairMapper.insertDmsKnowledgeRepair(dmsKnowledgeRepair);
 
-/*        //存储图片
+        //存储图片
         List<String> fileUrls = dmsKnowledgeRepair.getFileUrls();
-        batchInsertInstanceFiles(fileUrls, dmsKnowledgeRepair.getKnowledgeRepairId());*/
+        batchInsertInstanceFiles(fileUrls, dmsKnowledgeRepair.getKnowledgeRepairId());
 
         return i;
     }
@@ -105,12 +110,12 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
         dmsKnowledgeRepair.setUpdateTime(DateUtils.getNowDate());
         int i = dmsKnowledgeRepairMapper.updateDmsKnowledgeRepair(dmsKnowledgeRepair);
 
-//        baseAttachInfoMapper.deleteListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId());
+        baseAttachInfoMapper.deleteListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId());
         //存储图片
-/*        List<String> fileUrls = dmsKnowledgeRepair.getFileUrls();
+        List<String> fileUrls = dmsKnowledgeRepair.getFileUrls();
         if(fileUrls!=null) {
             batchInsertInstanceFiles(fileUrls, dmsKnowledgeRepair.getKnowledgeRepairId());
-        }*/
+        }
 
         return i;
     }
@@ -139,20 +144,20 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
         return dmsKnowledgeRepairMapper.deleteDmsKnowledgeRepairByKnowledgeRepairId(knowledgeRepairId);
     }
 
-/*    public void batchInsertInstanceFiles(List<String> fileUrls, Long knowledgeLubeId ) {
+    public void batchInsertInstanceFiles(List<String> fileUrls, Long knowledgeRepairId ) {
         if (fileUrls != null && !fileUrls.isEmpty()) {
 
             List<BaseAttachInfo> baseAttachInfos = new ArrayList<>();
             for (String fileUrl : fileUrls){
                 BaseAttachInfo baseAttachInfo = new BaseAttachInfo();
                 baseAttachInfo.setAttachType(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR);
-                baseAttachInfo.setAttachName("name");
+                baseAttachInfo.setAttachName("维修知识库附件");
                 baseAttachInfo.setAttachPath(fileUrl);
-                baseAttachInfo.setProcessId(knowledgeLubeId);
+                baseAttachInfo.setProcessId(knowledgeRepairId);
                 baseAttachInfo.setCreateTime(new Date());
                 baseAttachInfos.add(baseAttachInfo);
             }
             baseAttachInfoMapper.batchDmsKnowLedgeLubeFile(baseAttachInfos);
         }
-    }*/
+    }
 }