fix: 导出逻辑修改提供图片导出

guzijian
1 parent 001d2d5b
Showing 9 changed files with 114 additions and 20 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/converter/common/ImageConverter.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/request/ReportErrorRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportViewResponseVo.java
ruoyi-admin/src/main/resources/mapper/eexception/EquipmentExceptionMapper.xml
ruoyi-admin/src/main/resources/mapper/in/SignInMapper.xml
@@ -39,8 +39,6 @@ public class DriverController extends BaseController {
     @Autowired
     private IDriverService driverService;
  
-    @Autowired
-    private ServerConfig serverConfig;
  
     /**
      * 获取驾驶员排班信息
@@ -145,21 +143,7 @@ public class DriverController extends BaseController {
     public AjaxResult uploadImage(MultipartFile file) {
         try
         {
-            // 上传文件路径
-            String baseUrl = RuoYiConfig.getUploadPath() + "/head/image";
-            // 上传并返回新文件名称
-            FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
-            String fileName = file.getOriginalFilename();
-            String absPath = FileUploadUtils.getAbsoluteFile(baseUrl, fileName).getAbsolutePath();
-            fileName = FileUploadUtils.getPathFileName(baseUrl, fileName);
-            file.transferTo(Paths.get(absPath));
-            String url = serverConfig.getUrl() + fileName;
-            AjaxResult ajax = AjaxResult.success();
-            ajax.put("url", url);
-            ajax.put("fileName", fileName);
-            ajax.put("newFileName", FileUtils.getName(fileName));
-            ajax.put("originalFilename", file.getOriginalFilename());
-            return ajax;
+            return driverService.uploadImage(file);
         }
         catch (Exception e)
         {
@@ -167,6 +151,4 @@ public class DriverController extends BaseController {
         }
     }
  
-
-//    @ApiOperation("保存员工大头像")
 }
 package com.ruoyi.driver.service;
  
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
  
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.exception.file.InvalidExtensionException;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.pojo.response.ResponseScheduling;
+import org.springframework.web.multipart.MultipartFile;
  
 /**
  * 驾驶员信息Service接口
@@ -76,4 +79,6 @@ public interface IDriverService
     AjaxResult getDriverSchedulingAll();
  
     AjaxResult checkJobCode(Driver jobCode);
+
+    AjaxResult uploadImage(MultipartFile file) throws InvalidExtensionException, IOException;
 }
 package com.ruoyi.driver.service.impl;
  
+import java.io.IOException;
+import java.nio.file.Paths;
 import java.util.*;
  
+import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.exception.file.InvalidExtensionException;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.utils.file.MimeTypeUtils;
+import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.pojo.response.ResponseScheduling;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.ListUtils;
@@ -13,6 +21,7 @@ import org.springframework.stereotype.Service;
 import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.service.IDriverService;
+import org.springframework.web.multipart.MultipartFile;
  
 import static com.ruoyi.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
  
@@ -24,6 +33,10 @@ import static com.ruoyi.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
  */
 @Service
 public class DriverServiceImpl implements IDriverService {
+
+
+    @Autowired
+    private ServerConfig serverConfig;
     @Autowired
     private DriverMapper driverMapper;
  
@@ -143,4 +156,24 @@ public class DriverServiceImpl implements IDriverService {
         }
         return AjaxResult.success(resultMap);
     }
+
+    @Override
+    public AjaxResult uploadImage(MultipartFile file) throws InvalidExtensionException, IOException {
+
+        // 上传文件路径
+        String baseUrl = RuoYiConfig.getUploadPath() + "/head/image";
+        // 上传并返回新文件名称
+        FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+        String fileName = file.getOriginalFilename();
+        String absPath = FileUploadUtils.getAbsoluteFile(baseUrl, fileName).getAbsolutePath();
+        fileName = FileUploadUtils.getPathFileName(baseUrl, fileName);
+        file.transferTo(Paths.get(absPath));
+        String url = serverConfig.getUrl() + fileName;
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("url", url);
+        ajax.put("fileName", fileName);
+        ajax.put("newFileName", FileUtils.getName(fileName));
+        ajax.put("originalFilename", file.getOriginalFilename());
+        return ajax;
+    }
 }
@@ -90,6 +90,14 @@ public class DriverJob implements InitializingBean {
         System.out.println("执行结束");
     }
  
+    /**
+     * 导入图片任务
+     */
+    public void importImages(){
+        // TODO 获取用户列表 通过用户列表的jobCode来匹配对应的用户图像信息并保存到服务器
+        
+    }
+
     private static void saveSchedulingToRedis(String getSchedulingInfoUrl, List<Driver> drivers) {
         List<ResponseScheduling> originSchedulingList = RESTTEMPLATE.exchange(
                 getSchedulingInfoUrl,
+package com.ruoyi.pojo.converter.common;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.alibaba.excel.util.FileUtils;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author 20412
+ */
+public class ImageConverter implements Converter<String> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return String.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.IMAGE;
+    }
+
+    @Override
+    public String convertToJavaData(CellData cellData, ExcelContentProperty contentProperty,
+                                    GlobalConfiguration globalConfiguration) {
+        throw new UnsupportedOperationException("Cannot convert images to string");
+    }
+
+    @Override
+    public CellData convertToExcelData(String value, ExcelContentProperty contentProperty,
+                                       GlobalConfiguration globalConfiguration) throws IOException {
+        String path = RuoYiConfig.getProfile()  + value.replace("/profile","");
+        System.out.println(path);
+        File file = new File(path + File.separator);
+        if (!file.exists()){
+            return new CellData("没有图片");
+        }
+        return new CellData(FileUtils.readFileToByteArray(file));
+    }
+}
@@ -18,6 +18,11 @@ import java.util.List;
 @Data
 public class ReportErrorRequestVo {
     /**
+     * 工号
+     */
+    @ApiModelProperty("工号")
+    private String jobCode;
+    /**
      * 错误类型
      */
     @ApiModelProperty("错误类型")
@@ -2,17 +2,22 @@ package com.ruoyi.pojo.response;
  
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.converters.string.StringImageConverter;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.pojo.converter.AlcoholFlagConverter;
 import com.ruoyi.pojo.converter.SignInConvert;
 import com.ruoyi.pojo.converter.SignInStatusConverter;
 import com.ruoyi.pojo.converter.SignInTypeConverter;
+import com.ruoyi.pojo.converter.common.ImageConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
  
 import java.math.BigDecimal;
+import java.net.URL;
 import java.util.Date;
  
 /**
@@ -20,6 +25,8 @@ import java.util.Date;
  */
 @ApiModel("滚动大屏响应体数据")
 @Data
+@ContentRowHeight(100)
+@ColumnWidth(100 / 8)
 public class ReportViewResponseVo {
     @ApiModelProperty("id")
     @ExcelIgnore
@@ -65,10 +72,12 @@ public class ReportViewResponseVo {
     @ApiModelProperty("酒精含量")
     private BigDecimal alcoholIntake;
  
-    @ExcelProperty(value = "头像")
+    @ExcelProperty(value = "头像",converter = ImageConverter.class)
     @ApiModelProperty("头像")
     private String image;
  
+//    private URL url;
+
     @ExcelProperty(value = "备注")
     @ApiModelProperty("备注")
     private String remark;
@@ -42,6 +42,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             and DATE_FORMAT(create_time,'%Y-%m-%d') >= #{startTime}
             and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{endTime}
         </if>
+        <if test="jobCode != '' and jobCode != null">
+            and job_code = #{jobCode}
+        </if>
     </select>
  
     <insert id="insertEquipmentException" parameterType="EquipmentException" useGeneratedKeys="true" keyProperty="id">
@@ -90,6 +90,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             and DATE_FORMAT(create_time,'%Y-%m-%d') >= #{startTime}
             and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{endTime}
         </if>
+        <if test="jobCode != '' and jobCode != null">
+            and jobCode = #{jobCode}
+        </if>
  
     </select>