提交设备新增及定义字段修改

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentDetail.java

@@ -179,4 +179,10 @@ public class EquipmentDetail extends BaseEntity {
 	@TableField(value = "latitude")
 	private Double latitude;
 
+	@TableField(exist = false)
+	private List<UploadFile> quality;
+
+	@TableField(exist = false)
+	private List<UploadFile> operation;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecific.java

@@ -4,6 +4,7 @@ import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
 
 import io.swagger.annotations.ApiModel;
@@ -159,4 +160,13 @@ public class EquipmentSpecific extends BaseEntity {
     @ApiModelProperty(value = "设备值说明")
     @TableField("value_label")
     private String valueLabel;
+
+    @ApiModelProperty(value = "质保信息")
+    @TableField("warranty_info")
+    private String warrantyInfo;
+
+    @ApiModelProperty(value = "质保周期")
+    @TableField("warranty_period")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date warrantyPeriod;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/FileTypeEnum.java

@@ -2,7 +2,8 @@ package com.yeejoin.equipmanage.common.enums;
 
 public enum FileTypeEnum {
 
-	image("图片"),video("视频"),instruction("说明"),certificate("资质"),face("平面图");
+	image("图片"),video("视频"),instruction("说明"),certificate("资质"),
+	face("平面图"),quality("合格证"),operation("操作说明");
 
 	String describe;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java

@@ -143,6 +143,8 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
         equipmentDetail.setVideo(getEquipFileList(id, FileTypeEnum.video.toString()));
         equipmentDetail.setCertification(getEquipFileList(id, FileTypeEnum.certificate.toString()));
         equipmentDetail.setInstruction(getEquipFileList(id, FileTypeEnum.instruction.toString()));
+        equipmentDetail.setQuality(getEquipFileList(id, FileTypeEnum.quality.toString()));
+        equipmentDetail.setOperation(getEquipFileList(id, FileTypeEnum.operation.toString()));
         if (equipmentDetail.getCountry() != null) {
             equipmentDetail.setCountryName(
                     iSystemDicService.getOne(new QueryWrapper<SystemDic>().eq("id", equipmentDetail.getCountry())).getName());
@@ -225,6 +227,8 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
         fileList.addAll(fillFileList(equipmentDetail.getVideo(), equipmentDetail.getId(), FileTypeEnum.video.toString()));
         fileList.addAll(fillFileList(equipmentDetail.getCertification(), equipmentDetail.getId(), FileTypeEnum.certificate.toString()));
         fileList.addAll(fillFileList(equipmentDetail.getInstruction(), equipmentDetail.getId(), FileTypeEnum.instruction.toString()));
+        fileList.addAll(fillFileList(equipmentDetail.getQuality(), equipmentDetail.getId(), FileTypeEnum.quality.toString()));
+        fileList.addAll(fillFileList(equipmentDetail.getOperation(), equipmentDetail.getId(), FileTypeEnum.operation.toString()));
         iUploadFileService.saveBatch(fileList);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -427,6 +427,8 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             fileList.addAll(fillFileList(equipmentDetail.getVideo(), equipmentDetail.getId(), FileTypeEnum.video.toString()));
             fileList.addAll(fillFileList(equipmentDetail.getCertification(), equipmentDetail.getId(), FileTypeEnum.certificate.toString()));
             fileList.addAll(fillFileList(equipmentDetail.getInstruction(), equipmentDetail.getId(), FileTypeEnum.instruction.toString()));
+            fileList.addAll(fillFileList(equipmentDetail.getQuality(), equipmentDetail.getId(), FileTypeEnum.quality.toString()));
+            fileList.addAll(fillFileList(equipmentDetail.getOperation(), equipmentDetail.getId(), FileTypeEnum.operation.toString()));
             iUploadFileService.saveBatch(fileList);
         }
         equipmentDetailService.saveOrUpdateBatch(equipmentDetails);