fix:

guzijian
1 parent 7b49ec2f
Showing 10 changed files with 104 additions and 26 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/SignInEnum.java
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.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/request/ReportViewRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/ReportService.java
ruoyi-admin/src/main/java/com/ruoyi/utils/ConstDateUtil.java
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
@@ -2,6 +2,10 @@ package com.ruoyi.common;
 public interface SignInEnum {
     /**
+     * 导出图片
+     */
+    Integer EXPORT = 1;
+    /**
      * 签到
      */
     Integer SIGN_IN = 1;
 package com.ruoyi.driver.controller;
-import java.nio.file.Paths;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.config.RuoYiConfig;
-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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -150,5 +143,13 @@ public class DriverController extends BaseController {
             return AjaxResult.error(e.getMessage());
         }
     }
+    /**
+     * 头像下载  根据 工号
+     */
+    @ApiModelProperty("头像下载")
+    @GetMapping("/download/{jobCode}")
+    public void downLoadHeadImage(@PathVariable("jobCode")String jobCode,HttpServletResponse response){
+        driverService.downloadHeadImage(jobCode,response);
+    }
 }
@@ -92,4 +92,6 @@ public interface DriverMapper
      * @return
      */
     Integer jobCodeIsEmpty(@Param("jobCode") String jobCode);
+
+    String getDriverInfoByJobCode(@Param("jobCode") String jobCode);
 }
@@ -2,7 +2,6 @@ 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;
@@ -10,6 +9,8 @@ import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.pojo.response.ResponseScheduling;
 import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 驾驶员信息Service接口
  * 
@@ -81,4 +82,7 @@ public interface IDriverService
     AjaxResult checkJobCode(Driver jobCode);
     AjaxResult uploadImage(MultipartFile file) throws InvalidExtensionException, IOException;
+
+    void downloadHeadImage(String jobCode, HttpServletResponse response);
+
 }
 package com.ruoyi.driver.service.impl;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.*;
@@ -13,16 +15,22 @@ 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.job.DriverJob;
 import com.ruoyi.pojo.response.ResponseScheduling;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.ListUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 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 javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+
 import static com.ruoyi.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
 /**
@@ -34,6 +42,14 @@ import static com.ruoyi.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
 @Service
 public class DriverServiceImpl implements IDriverService {
+    @Value("${api.url.getSchedulingInfo}")
+    private String schedulingInfoUrl;
+    @Value("${api.config.password}")
+    private String password;
+    @Value("${api.config.nonce}")
+    private String nonce;
+    @Autowired
+    private DriverJob driverJob;
     @Autowired
     private ServerConfig serverConfig;
@@ -127,9 +143,19 @@ public class DriverServiceImpl implements IDriverService {
         if (cacheMapValue != null && cacheMapValue.size() > 0) {
             return AjaxResult.success(cacheMapValue);
         }
+        // 没有再次请求地址获取值
+        long timestamp = System.currentTimeMillis();
+        // 请求资源地址格式化
+        String getSchedulingInfoUrl = null;
+        try {
+            getSchedulingInfoUrl = String.format(schedulingInfoUrl, "99", schedulingDate, timestamp, nonce, password, driverJob.getSHA1(driverJob.getStringStringMap(String.valueOf(timestamp))));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        Map<String, List<ResponseScheduling>> scheduling = driverJob.saveSchedulingToRedis(getSchedulingInfoUrl, Collections.emptyList(), schedulingDate);
         // 数据库中读取所有接收到的排班信息
-        List<ResponseScheduling> responseSchedulings = driverMapper.getDriverSchedulingList(schedulingDate, jobCode);
-        return AjaxResult.success(responseSchedulings);
+//        List<ResponseScheduling> responseSchedulings = driverMapper.getDriverSchedulingList(schedulingDate, jobCode);
+        return AjaxResult.success(scheduling.get(jobCode));
     }
     @Override
@@ -164,7 +190,8 @@ public class DriverServiceImpl implements IDriverService {
         String baseUrl = RuoYiConfig.getUploadPath() + "/head/image";
         // 上传并返回新文件名称
         FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
-        String fileName = file.getOriginalFilename();
+        // 后期可以通过请求头拿到对应的工号
+        String fileName = FilenameUtils.getBaseName(file.getOriginalFilename()) + "." + FileUploadUtils.getExtension(file);
         String absPath = FileUploadUtils.getAbsoluteFile(baseUrl, fileName).getAbsolutePath();
         fileName = FileUploadUtils.getPathFileName(baseUrl, fileName);
         file.transferTo(Paths.get(absPath));
@@ -176,4 +203,34 @@ public class DriverServiceImpl implements IDriverService {
         ajax.put("originalFilename", file.getOriginalFilename());
         return ajax;
     }
+
+    @Override
+    public void downloadHeadImage(String jobCode, HttpServletResponse response) {
+        File file = getLocationFile(jobCode);
+        ServletOutputStream ops = null;
+        try {
+            if (file.exists()) {
+                byte[] bytes = com.alibaba.excel.util.FileUtils.readFileToByteArray(file);
+                ops = response.getOutputStream();
+                ops.write(bytes);
+                ops.flush();
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("download fail cause:" + e.getMessage());
+        } finally {
+            try {
+                if (ops != null) {
+                    ops.close();
+                }
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    private File getLocationFile(String jobCode) {
+        String image = driverMapper.getDriverInfoByJobCode(jobCode);
+
+        return new File(RuoYiConfig.getProfile() + File.separator + image.replace("/profile", ""));
+    }
 }
@@ -76,7 +76,7 @@ public class DriverJob implements InitializingBean {
             // 格式化请求
             String getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", ConstDateUtil.formatDate("yyyyMMdd"), timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
             // 获取排班信息并存入redis
-            saveSchedulingToRedis(getSchedulingInfoUrl, drivers);
+            saveSchedulingToRedis(getSchedulingInfoUrl, drivers,ConstDateUtil.formatDate("yyyyMMdd"));
             // 分片插入
             List<List<Driver>> splitList = ListUtils.splitList(drivers, 1000);
             System.out.println("开始更新数据-----");
@@ -95,10 +95,10 @@ public class DriverJob implements InitializingBean {
      */
     public void importImages(){
         // TODO 获取用户列表 通过用户列表的jobCode来匹配对应的用户图像信息并保存到服务器
-        
+
     }
-    private static void saveSchedulingToRedis(String getSchedulingInfoUrl, List<Driver> drivers) {
+    public Map<String, List<ResponseScheduling>> saveSchedulingToRedis(String getSchedulingInfoUrl, List<Driver> drivers,String dateKey) {
         List<ResponseScheduling> originSchedulingList = RESTTEMPLATE.exchange(
                 getSchedulingInfoUrl,
                 HttpMethod.GET,
@@ -113,6 +113,7 @@ public class DriverJob implements InitializingBean {
                     subItem.setJobCode(subItem.getJsy().split("/")[0]);
                     return subItem;
                 }).collect(Collectors.toList());
+        // 以员工号为key存入排班集合
         originSchedulingList.stream().forEach(item -> {
             // 员工号为key
             String jobCode = item.getJsy().split("/")[0];
@@ -126,12 +127,13 @@ public class DriverJob implements InitializingBean {
             }
         });
         // 存入数据库
-        DRIVER_SERVICE.saveDriverScheduling(originSchedulingList);
+//        DRIVER_SERVICE.saveDriverScheduling(originSchedulingList);
         // 存入redis
-        REDIS_CACHE.setCacheMap(DRIVER_SCHEDULING_PRE + ConstDateUtil.formatDate("yyyyMMdd"), driverSchedulingMap, 1, TimeUnit.DAYS);
+        REDIS_CACHE.setCacheMap(DRIVER_SCHEDULING_PRE + dateKey, driverSchedulingMap, 1, TimeUnit.DAYS);
+        return driverSchedulingMap;
     }
-    private static List<Driver> getDrivers(String format, String timestamp) throws Exception {
+    private List<Driver> getDrivers(String format, String timestamp) throws Exception {
         Map<String, String> configMap = getStringStringMap(timestamp);
         String sign = getSHA1(configMap);
         String url = format
@@ -152,7 +154,7 @@ public class DriverJob implements InitializingBean {
         return drivers;
     }
-    private static Map<String, String> getStringStringMap(String timestamp) {
+    public Map<String, String> getStringStringMap(String timestamp) {
         Map<String, String> configMap = new HashMap<>(5);
         configMap.put("timestamp", String.valueOf(timestamp));
         configMap.put("nonce", NONCE);
@@ -168,7 +170,7 @@ public class DriverJob implements InitializingBean {
      * @return
      * @throws Exception
      */
-    public static String getSHA1(Map<String, String> map) throws Exception {
+    public String getSHA1(Map<String, String> map) throws Exception {
         try {
             String[] array = new String[map.size()];
             map.values().toArray(array);
@@ -42,4 +42,7 @@ public class ReportViewRequestVo {
     @ApiModelProperty("姓名")
     String name;
+    @ApiModelProperty("是否导出图片")
+    Integer exportFlag;
+
 }
@@ -18,6 +18,7 @@ import java.util.stream.Collectors;
 import static com.ruoyi.common.ErrorTypeProperties.EQUIPMENT_ERROR;
 import static com.ruoyi.common.ErrorTypeProperties.SIGN_IN_ERROR;
+import static com.ruoyi.common.SignInEnum.EXPORT;
 /**
  * @author 20412
@@ -38,7 +39,12 @@ public class ReportService {
      * 查询报表信息
      */
     public List<ReportViewResponseVo> getReportScrollViewTable(ReportViewRequestVo requestVo) {
-        return signInMapper.getReportScrollViewTable(requestVo);
+        List<ReportViewResponseVo> reportScrollViewTable = signInMapper.getReportScrollViewTable(requestVo);
+        // 不导出图片清空路径信息
+        if (!EXPORT.equals(requestVo.getExportFlag())){
+            reportScrollViewTable = reportScrollViewTable.stream().map(item->{item.setImage("");return item;}).collect(Collectors.toList());
+        }
+        return reportScrollViewTable;
     }
     public List<ReportErrorResponseVo> getErrorReportList(ReportErrorRequestVo request) {
@@ -8,9 +8,4 @@ public class ConstDateUtil {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(str);
         return simpleDateFormat.format(new Date());
     }
-
-    public static void main(String[] args) {
-        String formatDate = formatDate("yyyyMMdd");
-        System.out.println(formatDate);
-    }
 }
@@ -109,6 +109,10 @@
        from driver
         where job_code = #{jobCode}
     </select>
+    <select id="getDriverInfoByJobCode" resultType="String">
+        select image from driver
+        where job_code = #{jobCode}
+    </select>
     <insert id="insertDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">
         insert into driver