【更新】表删除后更新代码结构

zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/SysFileInfo.java

@@ -0,0 +1,36 @@
+package com.bonus.zlpt.common.core.domain.equip;
+
+import com.bonus.zlpt.common.core.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class SysFileInfo {
+
+    @Excel(name = "id")
+    private Integer id;
+
+
+    @Excel(name = "设备id")
+    private Integer modelId;
+
+    @Excel(name = "文件名称")
+    private String fileName;
+
+
+    @Excel(name = "文件路径")
+    private String fileUrl;
+
+
+    @Excel(name = "字典id")
+    private Integer dicId;
+
+
+    @Excel(name = "创建人")
+    private String creator;
+
+
+    @Excel(name = "创建时间")
+    private String createTime;
+
+
+}

zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/enums/FileDictEnum.java

@@ -0,0 +1,18 @@
+package com.bonus.zlpt.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@AllArgsConstructor
+public enum FileDictEnum {
+
+    //检验信息
+    INSPECT_IMAGE_URL(28),
+    //保险信息
+    INSURE_IMAGE_URL(29);
+
+    private final Integer value;
+
+}

zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/SysFileInfoMapper.java

@@ -0,0 +1,14 @@
+package com.bonus.zlpt.equip.mapper;
+
+import com.bonus.zlpt.common.core.domain.equip.SysFileInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SysFileInfoMapper {
+
+
+    //根据设备id查询
+    List<SysFileInfo> selectByMaId(Long maId);
+}

zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/TypeInfoMapper.java

@@ -59,5 +59,9 @@ public interface TypeInfoMapper
      */
     public int deleteTypeInfoByTypeIds(Long[] typeIds);
 
+
     int selectCountByTypeId(Long typeId);
+
+
+
 }

zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java

@@ -5,9 +5,12 @@ import java.util.stream.Collectors;
 
 
 import com.bonus.zlpt.common.core.domain.equip.FileInfo;
+import com.bonus.zlpt.common.core.domain.equip.SysFileInfo;
 import com.bonus.zlpt.common.core.domain.equip.TypeInfo;
 import com.bonus.zlpt.common.core.domain.equip.dto.UpOffDto;
+import com.bonus.zlpt.common.core.enums.FileDictEnum;
 import com.bonus.zlpt.equip.mapper.FileInfoMapper;
+import com.bonus.zlpt.equip.mapper.SysFileInfoMapper;
 import com.bonus.zlpt.equip.mapper.TypeInfoMapper;
 import com.bonus.zlpt.common.core.domain.equip.vo.MaDevInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,8 +35,11 @@ public class UpOffServiceImpl implements IUpOffService
     @Autowired
     private TypeInfoMapper typeInfoMapper;
 
+//    @Autowired
+//    private FileInfoMapper fileInfoMapper;
+
     @Autowired
-    private FileInfoMapper fileInfoMapper;
+    private SysFileInfoMapper sysFileInfoMapper;
 
     /**
      * 查询设备上下架管理
@@ -163,12 +169,12 @@ public class UpOffServiceImpl implements IUpOffService
 
         for (MaDevInfoVo devInfoVo : devInfoVos) {
             //组装url
-            List<FileInfo> fileInfos = fileInfoMapper.selectByMaId(devInfoVo.getMaId());
+            List<SysFileInfo> fileInfos = sysFileInfoMapper.selectByMaId(devInfoVo.getMaId());
-            for (FileInfo fileInfo : fileInfos) {
+            for (SysFileInfo fileInfo : fileInfos) {
-                if("0".equals(fileInfo.getType())){
+                if(FileDictEnum.INSPECT_IMAGE_URL.getValue().equals(fileInfo.getDicId())){
                     devInfoVo.setInspectImageUrl(fileInfo.getFileUrl());
                 }
-                if("1".equals(fileInfo.getType())){
+                if(FileDictEnum.INSURE_IMAGE_URL.getValue().equals(fileInfo.getDicId())){
                     devInfoVo.setInsureImageUrl(fileInfo.getFileUrl());
                 }
             }

zlpt-modules/zlpt-equip/src/main/resources/mapper/SysFileInfoMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bonus.zlpt.equip.mapper.SysFileInfoMapper">
+
+
+    <select id="selectByMaId" resultType="com.bonus.zlpt.common.core.domain.equip.SysFileInfo">
+        select * from  sys_file_info where model_id = #{maId}
+    </select>
+</mapper>