代码提交

src/main/java/com/macro/mall/tiny/modules/business/controller/BLineUploadLogController.java

@@ -1,21 +1,38 @@
 package com.macro.mall.tiny.modules.business.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.macro.mall.tiny.common.api.CommonResult;
+import com.macro.mall.tiny.modules.business.model.BLine;
+import com.macro.mall.tiny.modules.business.model.BLineUploadLog;
+import com.macro.mall.tiny.modules.business.service.BLineUploadLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.websocket.server.PathParam;
+import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author macro
  * @since 2021-03-28
  */
 @RestController
+@Api(tags = "BLineUploadLogController", description = "提供上传日志相关API")
 @RequestMapping("/lineUploadLog")
 public class BLineUploadLogController {
+    @Autowired
+    private BLineUploadLogService lineUploadLogService;
 
+    @ApiOperation("获取最近N条上传记录")
+    @RequestMapping(method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<List<BLineUploadLog>> getItem(@RequestParam @PathParam(value = "limit") Integer limit) {
+        return CommonResult.success(lineUploadLogService.findLastUpload(limit));
+    }
 }
 

src/main/java/com/macro/mall/tiny/modules/business/controller/FileController.java

@@ -74,10 +74,11 @@ public class FileController {
         Integer chunks = fileUploadParam.getChunks();
         Integer chunk = fileUploadParam.getChunk();
         MultipartFile file = fileUploadParam.getFile();
+        String charset = fileUploadParam.getCharset();
         AdminUserDetails userDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
 
         if (chunks != null && chunks != 0) {
-            fileService.uploadWithBlock(name, lineName, provinceId, size, chunks, chunk, file, userDetails);
+            fileService.uploadWithBlock(name, lineName, provinceId, size, chunks, chunk, file, userDetails, charset);
         } else {
             fileService.upload(file);
         }

src/main/java/com/macro/mall/tiny/modules/business/dto/FileUploadParam.java

@@ -37,4 +37,7 @@ public class FileUploadParam {
     @NotNull
     @ApiModelProperty(value = "当前分块的文件", required = true)
     private MultipartFile file;
+
+    @ApiModelProperty(value = "编码方式")
+    private String charset = "gbk";
 }

src/main/java/com/macro/mall/tiny/modules/business/mapper/BLineUploadLogMapper.java

@@ -2,6 +2,9 @@ package com.macro.mall.tiny.modules.business.mapper;
 
 import com.macro.mall.tiny.modules.business.model.BLineUploadLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BLineUploadLogMapper extends BaseMapper<BLineUploadLog> {
 
+    List<BLineUploadLog> findLastUpload(@Param("limit") Integer limit);
+
 }

src/main/java/com/macro/mall/tiny/modules/business/model/BLine.java

@@ -40,6 +40,10 @@ public class BLine implements Serializable {
     @ApiModelProperty(value = "线路所属省份")
     private Long provinceId;
 
+    @ApiModelProperty(value = "所属省份")
+    @TableField(exist = false)
+    private String province;
+
     @ApiModelProperty(value = "创建者ID")
     private Long creatorId;
 
@@ -48,6 +52,10 @@ public class BLine implements Serializable {
     @TableField(exist = false)
     private List<BTower> towerList;
 
+    @ApiModelProperty(value = "匹配塔形关键字")
+    @TableField(exist = false)
+    private String matchShape;
+
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

src/main/java/com/macro/mall/tiny/modules/business/model/BLineUploadLog.java

@@ -1,10 +1,13 @@
 package com.macro.mall.tiny.modules.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -36,14 +39,23 @@ public class BLineUploadLog implements Serializable {
     @ApiModelProperty(value = "上传者ID")
     private Long uploaderId;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "上传日期")
     private Date uploadTime;
 
     @ApiModelProperty(value = "上传状态：0-失败，1-成功")
-    private Boolean status;
+    private Integer status;
 
     @ApiModelProperty(value = "警告信息")
     private String warnMsg;
 
+    @ApiModelProperty(value = "所属线路名称")
+    @TableField(exist = false)
+    private String lineName;
+
+    @ApiModelProperty(value = "上传者名称")
+    @TableField(exist = false)
+    private String uploaderName;
+
 
 }

src/main/java/com/macro/mall/tiny/modules/business/service/BLineUploadLogService.java

@@ -3,6 +3,8 @@ package com.macro.mall.tiny.modules.business.service;
 import com.macro.mall.tiny.modules.business.model.BLineUploadLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface BLineUploadLogService extends IService<BLineUploadLog> {
 
+    List<BLineUploadLog> findLastUpload(Integer limit);
 }

src/main/java/com/macro/mall/tiny/modules/business/service/FileService.java

@@ -18,7 +18,7 @@ public interface FileService {
 
     void upload(MultipartFile file) throws IOException;
 
-    void uploadWithBlock(String name, String lineName, Long provinceId, Long size, Integer chunks, Integer chunk, MultipartFile file, AdminUserDetails userDetails) throws IOException;
+    void uploadWithBlock(String name, String lineName, Long provinceId, Long size, Integer chunks, Integer chunk, MultipartFile file, AdminUserDetails userDetails, String charset) throws IOException;
 
     BDirectory getRootDirectory(AdminUserDetails userDetails);
 

src/main/java/com/macro/mall/tiny/modules/business/service/impl/AsyncHandler.java

@@ -15,15 +15,17 @@ import com.macro.mall.tiny.modules.ums.model.UmsAdmin;
 import com.macro.mall.tiny.modules.ums.service.UmsAdminService;
 import com.macro.mall.tiny.security.util.AuthUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.archivers.ArchiveEntry;
+import org.apache.commons.compress.archivers.ArchiveInputStream;
+import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
+import org.apache.commons.compress.utils.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.math.BigDecimal;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
@@ -45,9 +47,6 @@ import java.util.zip.ZipInputStream;
 @Slf4j
 public class AsyncHandler {
 
-    @Value("${system.charset:gbk}")
-    private String charset;
-
     @Autowired
     private UmsAdminService adminService;
 
@@ -71,8 +70,10 @@ public class AsyncHandler {
 
     @Async
     @Transactional
-    public void handleDocument(Long provinceId, String fileSource, String lineName, AdminUserDetails userDetails) {
+    public void handleDocument(Long provinceId, String fileSource, String lineName, AdminUserDetails userDetails, String charset) {
         StringBuilder warnMsg = new StringBuilder();
+        BLine line = null;
+        Long userId = null;
         try {
             if (provinceId == null) Asserts.fail("上传失败，省份不能为空，provinceId：" + provinceId);
             if (userDetails == null) Asserts.fail("上传失败，未获取到当前用户");
@@ -82,12 +83,12 @@ public class AsyncHandler {
 
             String username = userDetails.getUsername();
             UmsAdmin umsAdmin = adminService.getAdminByUsername(username);
-            Long userId = umsAdmin.getId();
+            userId = umsAdmin.getId();
             boolean canCover = AuthUtil.checkAccess(userDetails, AuthUtil.COVER);
             // 查看是否为线路创建者
             QueryWrapper<BLine> wrapper = new QueryWrapper<>();
             wrapper.lambda().eq(BLine::getName, lineName);
-            BLine line = lineService.getOne(wrapper);
+            line = lineService.getOne(wrapper);
             List<BTower> towerList = Lists.newArrayList();
             if (line == null) {
                 // 如果为空，则创建新线路
@@ -110,9 +111,6 @@ public class AsyncHandler {
                 Files.createDirectories(rootPath);
             }
 
-            // 获取暂存文件Path
-            Path filePath = Paths.get(fileSource);
-
             // 获取枚举类判断
             DirectoryEnum[] enums = DirectoryEnum.values();
             HashMap<String, Boolean> booleanHashMap = new HashMap<>();
@@ -120,70 +118,66 @@ public class AsyncHandler {
                 booleanHashMap.put(directory.getName(), false);
             }
 
-            try (ZipFile zipFile = new ZipFile(filePath.toFile(), Charset.forName(charset))) {
-                // 读取zip流
-                try (ZipInputStream zipInputStream = new ZipInputStream(Files.newInputStream(filePath), Charset.forName(charset))) {
-                    ZipEntry zipEntry;
-                    // 遍历每一个zip项
-                    while ((zipEntry = zipInputStream.getNextEntry()) != null) {
-                        // 获取zip项目名称
-                        String entryName = zipEntry.getName();
-
-                        // 解析各项路径
-                        String[] pathStr = entryName.split(UploadConfig.SEPARATOR);
-                        if (pathStr.length < 2) {
-                            continue;
-                        }
-                        String SecDirectoryName = pathStr[1].charAt(0) == UploadConfig.AUTH_STR ? pathStr[1].substring(1) : pathStr[1];
-                        if (booleanHashMap.get(SecDirectoryName) != null) {
-                            booleanHashMap.put(SecDirectoryName, true);
-                        } else if ("杆塔信息录入.xlsx".equals(SecDirectoryName) || "杆塔信息录入.xls".equals(SecDirectoryName)) {
-                            List<TowerExcelModel> modelArrayList = EasyExcel.read(zipFile.getInputStream(zipEntry), TowerExcelModel.class, null).sheet().doReadSync();
-                            BLine finalLine = line;
-                            towerList = modelArrayList.stream().map(model -> {
-                                BTower tower = new BTower();
-                                tower.setName(model.getName());
-                                tower.setShape(model.getShape());
-                                tower.setSort(model.getSort());
-                                tower.setHardwareType(model.getHardware());
-                                // 经纬度设置
-                                String lonLat = model.getLonLat();
-                                String[] lonLats = lonLat.split(",");
-                                BigDecimal lon = CommonUtils.Dms2D(lonLats[0]);
-                                BigDecimal lat = CommonUtils.Dms2D(lonLats[1]);
-                                tower.setLon(lon);
-                                tower.setLat(lat);
-                                tower.setLineId(finalLine.getId());
-                                tower.setHasFile(0);
-                                tower.setCreateTime(new Date());
-                                return tower;
-                            }).collect(Collectors.toList());
-//                            towerService.saveAndUpdate(towerList);
-                            continue;
-                        } else {
-                            warnMsg.append(entryName).append("第二层目录解析出错;");
-                            continue;
-                        }
+            try (InputStream fis = Files.newInputStream(Paths.get(fileSource));
+                 InputStream bis = new BufferedInputStream(fis);
+                 ArchiveInputStream ais = new ZipArchiveInputStream(bis, charset)) {
 
+                ArchiveEntry entry;
+                while (Objects.nonNull(entry = ais.getNextEntry())) {
+                    if (!ais.canReadEntryData(entry)) {
+                        continue;
+                    }
 
-                        // 构建绝对路径
-                        Path entryFile = rootPath.resolve(entryName);
-                        if (zipEntry.isDirectory()) {    // 文件夹
-                            if (!Files.isDirectory(entryFile)) {
-                                Files.createDirectories(entryFile);
-                            }
-                        } else if (!canCover && Files.exists(entryFile)) {
-                            warnMsg.append(entryName).append("已存在，无权覆盖;");
-                        } else {                            // 文件
-                            // 读取zip项数据流
-                            try (InputStream zipEntryInputStream = zipFile.getInputStream(zipEntry)) {
-                                try (OutputStream fileOutputStream = Files.newOutputStream(entryFile, StandardOpenOption.CREATE)) {
-                                    byte[] buffer = new byte[2048];
-                                    int length;
-                                    while ((length = zipEntryInputStream.read(buffer)) != -1) {
-                                        fileOutputStream.write(buffer, 0, length);
-                                    }
-                                }
+                    String entryName = entry.getName();
+                    // 解析各项路径
+                    String[] pathStr = entryName.split(UploadConfig.SEPARATOR);
+                    if (pathStr.length < 2) {
+                        continue;
+                    }
+                    String SecDirectoryName = pathStr[1].charAt(0) == UploadConfig.AUTH_STR ? pathStr[1].substring(1) : pathStr[1];
+                    if (booleanHashMap.get(SecDirectoryName) != null) {
+                        booleanHashMap.put(SecDirectoryName, true);
+                    } else if ("杆塔信息录入.xlsx".equals(SecDirectoryName) || "杆塔信息录入.xls".equals(SecDirectoryName)) {
+                        List<TowerExcelModel> modelArrayList = EasyExcel.read(ais, TowerExcelModel.class, null).sheet().doReadSync();
+                        BLine finalLine = line;
+                        towerList = modelArrayList.stream().map(model -> {
+                            BTower tower = new BTower();
+                            tower.setName(model.getName());
+                            tower.setShape(model.getShape());
+                            tower.setSort(model.getSort());
+                            tower.setHardwareType(model.getHardware());
+                            // 经纬度设置
+                            String lonLat = model.getLonLat();
+                            String[] lonLats = lonLat.split(",");
+                            BigDecimal lon = CommonUtils.Dms2D(lonLats[0]);
+                            BigDecimal lat = CommonUtils.Dms2D(lonLats[1]);
+                            tower.setLon(lon);
+                            tower.setLat(lat);
+                            tower.setLineId(finalLine.getId());
+                            tower.setHasFile(0);
+                            tower.setCreateTime(new Date());
+                            return tower;
+                        }).collect(Collectors.toList());
+//                            towerService.saveAndUpdate(towerList);
+                        continue;
+                    } else {
+                        warnMsg.append(entryName).append("第二层目录解析出错;");
+                        continue;
+                    }
+
+                    Path entryFile = rootPath.resolve(entryName);
+                    if (entry.isDirectory()) {
+                        if (!Files.isDirectory(entryFile)) {
+                            Files.createDirectories(entryFile);
+                        }
+                    } else {
+                        Path parent = entryFile.getParent();
+                        if (!canCover && Files.exists(entryFile)) {
+                            warnMsg.append(entryName).append(entryFile.getFileName().toString()).append("已存在，无权覆盖;");
+                        } else if (Files.isDirectory(parent)) {
+                            Files.createDirectories(parent);
+                            try (OutputStream o = Files.newOutputStream(entryFile)) {
+                                IOUtils.copy(ais, o);
                             }
                         }
                     }
@@ -197,7 +191,7 @@ public class AsyncHandler {
             // 存储上传记录
             BLineUploadLog lineUploadLog = new BLineUploadLog();
             lineUploadLog.setLineId(line.getId());
-            lineUploadLog.setStatus(true);
+            lineUploadLog.setStatus(1);
             lineUploadLog.setUploaderId(userId);
             lineUploadLog.setUploadTime(new Date());
             lineUploadLog.setWarnMsg(warnMsg.toString());
@@ -218,6 +212,16 @@ public class AsyncHandler {
             log.error("上传文件抛出业务异常", e);
         } catch (Exception e) {
             log.error("上传文件抛出异常", e);
+            if (line != null && userId != null) {
+                // 存储上传记录
+                BLineUploadLog lineUploadLog = new BLineUploadLog();
+                lineUploadLog.setLineId(line.getId());
+                lineUploadLog.setStatus(0);
+                lineUploadLog.setUploaderId(userId);
+                lineUploadLog.setUploadTime(new Date());
+                lineUploadLog.setWarnMsg(e.getMessage());
+                lineUploadLogService.save(lineUploadLog);
+            }
         } finally {
             File file = new File(fileSource);
             if (file.exists()) {

src/main/java/com/macro/mall/tiny/modules/business/service/impl/BLineServiceImpl.java

@@ -10,15 +10,18 @@ import com.macro.mall.tiny.modules.business.model.BFile;
 import com.macro.mall.tiny.modules.business.model.BLine;
 import com.macro.mall.tiny.modules.business.mapper.BLineMapper;
 import com.macro.mall.tiny.modules.business.model.BProvince;
+import com.macro.mall.tiny.modules.business.model.BTower;
 import com.macro.mall.tiny.modules.business.service.BLineCacheService;
 import com.macro.mall.tiny.modules.business.service.BLineService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.macro.mall.tiny.security.util.AuthUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Pattern;
 
 /**
  * <p>
@@ -57,7 +60,20 @@ public class BLineServiceImpl extends ServiceImpl<BLineMapper, BLine> implements
 
     @Override
     public List<BLine> findByKey(String key) {
-        return lineMapper.findListByKey(key);
+        List<BLine> lineList = lineMapper.findListByKey(key);
+        if (StringUtils.isNotBlank(key)) {
+            lineList.forEach(line -> {
+                if (!line.getProvince().contains(key) && !line.getName().contains(key)) {
+                    for (BTower tower : line.getTowerList()) {
+                        if (tower.getShape().contains(key)) {
+                            line.setMatchShape(tower.getShape());
+                            break;
+                        }
+                    }
+                }
+            });
+        }
+        return lineList;
     }
 
     @Override

src/main/java/com/macro/mall/tiny/modules/business/service/impl/BLineUploadLogServiceImpl.java

@@ -1,14 +1,18 @@
 package com.macro.mall.tiny.modules.business.service.impl;
 
+import com.macro.mall.tiny.common.exception.Asserts;
 import com.macro.mall.tiny.modules.business.model.BLineUploadLog;
 import com.macro.mall.tiny.modules.business.mapper.BLineUploadLogMapper;
 import com.macro.mall.tiny.modules.business.service.BLineUploadLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author macro
@@ -17,4 +21,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class BLineUploadLogServiceImpl extends ServiceImpl<BLineUploadLogMapper, BLineUploadLog> implements BLineUploadLogService {
 
+    @Autowired
+    private BLineUploadLogMapper lineUploadLogMapper;
+
+    @Override
+    public List<BLineUploadLog> findLastUpload(Integer limit) {
+        if (limit<1) Asserts.fail("请输入大于1的数");
+        return lineUploadLogMapper.findLastUpload(limit);
+    }
+
 }

src/main/java/com/macro/mall/tiny/modules/business/service/impl/FileServiceImpl.java

@@ -81,14 +81,15 @@ public class FileServiceImpl implements FileService {
                                 Integer chunks,
                                 Integer chunk,
                                 MultipartFile file,
-                                AdminUserDetails userDetails) throws IOException {
+                                AdminUserDetails userDetails,
+                                String charset) throws IOException {
         putChunkMap(name, chunks);
         String target = UploadConfig.tempPath + name;
         MyFileUtils.writeWithBlock(target, size, file.getInputStream(), file.getSize(), chunks, chunk);
         addChunk(name, chunk);
         if (isUploaded(name)) {
             removeKey(name);
-            asyncHandler.handleDocument(provinceId, target, lineName, userDetails);
+            asyncHandler.handleDocument(provinceId, target, lineName, userDetails, charset);
         }
     }
 

src/main/resources/application.yml

@@ -48,6 +48,9 @@ secure:
       - /**/*.css
       - /**/*.png
       - /**/*.ico
+      - /**/*.woff
+      - /**/*.ttf
+      - /**/*.map
       - /webjars/springfox-swagger-ui/**
       - /actuator/**
       - /druid/**
@@ -55,7 +58,8 @@ secure:
       - /admin/register
       - /admin/info
       - /admin/logout
-
+      - /
+      - /index.html
 upload:
   temp-path: ./temp/
   path: ./upload/ #文件上传路径

src/main/resources/mapper/business/BLineMapper.xml

@@ -6,6 +6,7 @@
         SELECT l.id,
                l.name,
                l.province_id,
+               p.province,
                l.creator_id,
                l.create_time,
                t.id            t_id,
@@ -19,6 +20,7 @@
                t.has_file      t_has_file,
                t.create_time   t_create_time
         FROM b_line l
+                 LEFT JOIN b_province p ON l.province_id = p.id
                  LEFT JOIN b_tower t ON l.id = t.line_id
         ORDER BY t_sort;
     </select>
@@ -27,6 +29,7 @@
         SELECT l.id,
                l.name,
                l.province_id,
+               p.province,
                l.creator_id,
                l.create_time,
                t.id            t_id,
@@ -44,6 +47,7 @@
                  LEFT JOIN b_province p on l.province_id = p.id
         WHERE l.name like concat('%', #{key}, '%')
            OR p.province like concat('%', #{key}, '%')
+           OR t.shape like concat('%', #{key}, '%')
         ORDER BY t_sort;
 
     </select>
@@ -53,7 +57,7 @@
         <id column="id" property="id"/>
         <result column="name" property="name"/>
         <result column="province_id" property="provinceId"/>
-        <result column="province_id" property="provinceId"/>
+        <result column="province" property="province"/>
         <result column="creator_id" property="creatorId"/>
         <result column="create_time" property="createTime"/>
         <collection property="towerList" ofType="com.macro.mall.tiny.modules.business.model.BTower" column="id">

src/main/resources/mapper/business/BLineUploadLogMapper.xml

@@ -2,6 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.macro.mall.tiny.modules.business.mapper.BLineUploadLogMapper">
 
+    <select id="findLastUpload" resultMap="BaseResultMap2" parameterType="integer">
+        SELECT ul.id,
+               ul.line_id,
+               l.name line_name,
+               ul.uploader_id,
+               a.username uploader_name,
+               ul.upload_time,
+               ul.status
+        FROM b_line_upload_log ul
+                 LEFT JOIN b_line l ON ul.line_id = l.id
+                 LEFT JOIN ums_admin a ON ul.uploader_id = a.id
+        ORDER BY ul.id DESC
+        LIMIT #{limit};
+    </select>
+
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.macro.mall.tiny.modules.business.model.BLineUploadLog">
         <id column="id" property="id" />
@@ -12,4 +27,16 @@
         <result column="warn_msg" property="warnMsg" />
     </resultMap>
 
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap2" type="com.macro.mall.tiny.modules.business.model.BLineUploadLog">
+        <id column="id" property="id" />
+        <result column="line_id" property="lineId" />
+        <result column="line_name" property="lineName" />
+        <result column="uploader_id" property="uploaderId" />
+        <result column="uploader_name" property="uploaderName" />
+        <result column="upload_time" property="uploadTime" />
+        <result column="status" property="status" />
+        <result column="warn_msg" property="warnMsg" />
+    </resultMap>
+
 </mapper>