fix: 改变解码方式

guzijian
1 parent 5cc0a0c8
Showing 5 changed files with 70 additions and 30 deletions
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/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
@@ -71,7 +71,7 @@ public interface IDriverService
  
     AjaxResult getDriverSchedulingInfo(String schedulingDate,String jobCode);
  
-    void saveDriverScheduling(Map<String, List<ResponseScheduling>> driverSchedulingMap);
+    void saveDriverScheduling(List<ResponseScheduling> driverSchedulingMap);
  
     AjaxResult getDriverSchedulingAll();
  
@@ -4,9 +4,10 @@ import java.util.*;
  
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.pojo.response.ResponseScheduling;
+import com.ruoyi.utils.ConstDateUtil;
+import com.ruoyi.utils.ListUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.driver.mapper.DriverMapper;
@@ -115,18 +116,15 @@ public class DriverServiceImpl implements IDriverService {
     }
  
     @Override
-    public void saveDriverScheduling(Map<String, List<ResponseScheduling>> driverSchedulingMap) {
-        Collection<List<ResponseScheduling>> listCollection = driverSchedulingMap.values();
-        for (List<ResponseScheduling> responseSchedulings : listCollection) {
+    public void saveDriverScheduling(List<ResponseScheduling> schedulings) {
+        List<List<ResponseScheduling>> lists = ListUtils.splitList(schedulings, 1000);
+        for (List<ResponseScheduling> responseSchedulings : lists) {
             driverMapper.saveDriverScheduling(responseSchedulings);
         }
-
     }
  
     @Override
     public AjaxResult getDriverSchedulingAll() {
-//        Set yyyyMMdd = redisCache.redisTemplate.opsForHash().keys(DateUtils.getDate("yyyyMMdd"));
-//        return AjaxResult.success(yyyyMMdd);
-        return AjaxResult.success();
+        return AjaxResult.success(redisCache.getHashKeys(DRIVER_SCHEDULING_PRE + ConstDateUtil.formatDate("yyyyMMdd")));
     }
 }
@@ -25,6 +25,7 @@ import com.ruoyi.in.mapper.SignInMapper;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.service.ISignInService;
 import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Decoder;
  
 /**
  * 签到Service业务层处理
@@ -111,15 +112,20 @@ public class SignInServiceImpl implements ISignInService {
     @Override
     public int addSignIn(SignIn signIn) throws FileUploadException, IOException {
         // base64转图片
+
+        String base64 = signIn.getImage();
         // 图片路径
         String filePath = RuoYiConfig.getUploadPath();
         // 固定jpg文件
-        String fileName = extractFilename("jpg");
+        String fileName = "";
+        // 看是否带有base64前缀 有就判断文件类型 没有默认jpg
+        fileName = checkImageBase64Format(signIn.getImage());
+        fileName = extractFilename(fileName);
         // 获取相对路径
         String absPath = getAbsoluteFile(filePath, fileName).getAbsolutePath();
-        startUpload(absPath,signIn.getImage());
-
-        // 把上传的文件路径保存到服务器
+        // 上传文件
+        startUpload(absPath, base64);
+        // 获取文件上传路径
         String pathFileName = getPathFileName(filePath, fileName);
         signIn.setImage(pathFileName);
  
@@ -128,19 +134,17 @@ public class SignInServiceImpl implements ISignInService {
  
     /**
      * 获取相对路径名
+     *
      * @param uploadDir
      * @param fileName
      * @return
      * @throws IOException
      */
-    public  File getAbsoluteFile(String uploadDir, String fileName) throws IOException
-    {
+    public File getAbsoluteFile(String uploadDir, String fileName) throws IOException {
         File desc = new File(uploadDir + File.separator + fileName);
  
-        if (!desc.exists())
-        {
-            if (!desc.getParentFile().exists())
-            {
+        if (!desc.exists()) {
+            if (!desc.getParentFile().exists()) {
                 desc.getParentFile().mkdirs();
             }
         }
@@ -149,35 +153,43 @@ public class SignInServiceImpl implements ISignInService {
  
     /**
      * 获取扩展文件名
+     *
      * @param extendFileName
      * @return
      */
-    public   String extractFilename(String extendFileName)
-    {
+    public String extractFilename(String extendFileName) {
         return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
-                FilenameUtils.getBaseName(UUID.randomUUID().toString().replace("-","")), Seq.getId(Seq.uploadSeqType), extendFileName);
+                FilenameUtils.getBaseName(UUID.randomUUID().toString().replace("-", "")), Seq.getId(Seq.uploadSeqType), extendFileName);
     }
  
     /**
-     *
      * @param uploadDir
      * @param fileName
      * @return
      * @throws IOException
      */
-    public String getPathFileName(String uploadDir, String fileName) throws IOException
-    {
+    public String getPathFileName(String uploadDir, String fileName) throws IOException {
         int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
         String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
         return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
     }
  
-    public void startUpload(String url,String base64) throws FileUploadException {
+    public void startUpload(String url, String base64) throws FileUploadException, IOException {
         FileOutputStream outputStream = null;
-        byte[] imageBytes = Base64.getDecoder().decode(base64);
+        base64 = base64.replaceAll(" ", "");
+//        byte[] imageBytes = Base64.getDecoder().decode(base64);
+        BASE64Decoder decoder = new BASE64Decoder();
+        byte[] photoBase64 = decoder.decodeBuffer(base64);
+        for (int i = 0; i < photoBase64.length; ++i) {
+            //调整异常数据
+            if (photoBase64[i] < 0) {
+                photoBase64[i] += 256;
+            }
+        }
         try {
             outputStream = new FileOutputStream(url);
-            outputStream.write(imageBytes);
+            outputStream.write(photoBase64);
+            outputStream.flush();
         } catch (Exception e) {
             throw new FileUploadException("文件上传异常");
         } finally {
@@ -190,4 +202,26 @@ public class SignInServiceImpl implements ISignInService {
             }
         }
     }
+
+    /**
+     * 检查文件类型
+     *
+     * @param base64ImgData
+     * @return
+     */
+    public static String checkImageBase64Format(String base64ImgData) {
+        byte[] b = Base64.getDecoder().decode(base64ImgData);
+        String type = "";
+        if (0x424D == ((b[0] & 0xff) << 8 | (b[1] & 0xff))) {
+            type = "bmp";
+        } else if (0x8950 == ((b[0] & 0xff) << 8 | (b[1] & 0xff))) {
+            type = "png";
+        } else {
+            type = "jpg";
+        }
+//        else if (0xFFD8 == ((b[0] & 0xff) << 8 | (b[1] & 0xff))) {
+//            type = "jpg";
+//        }
+        return type;
+    }
 }
@@ -100,6 +100,11 @@ public class DriverJob implements InitializingBean {
  
         Map<String, List<ResponseScheduling>> driverSchedulingMap = new HashMap<>();
         // 按照员工工号来获取排班信息
+        originSchedulingList = originSchedulingList.stream()
+                .map(subItem->{
+                    subItem.setJobCode(subItem.getJsy().split("/")[0]);
+                    return subItem;
+                }).collect(Collectors.toList());
         originSchedulingList.stream().forEach(item -> {
             // 员工号为key
             String jobCode = item.getJsy().split("/")[0];
@@ -112,9 +117,8 @@ public class DriverJob implements InitializingBean {
                 driverSchedulingMap.get(jobCode).add(item);
             }
         });
-        originSchedulingList.clear();
         // 存入数据库
-        DRIVER_SERVICE.saveDriverScheduling(driverSchedulingMap);
+        DRIVER_SERVICE.saveDriverScheduling(originSchedulingList);
         // 存入redis
         REDIS_CACHE.setCacheMap(DRIVER_SCHEDULING_PRE + ConstDateUtil.formatDate("yyyyMMdd"), driverSchedulingMap, 1, TimeUnit.DAYS);
     }
@@ -272,4 +272,8 @@ public class RedisCache {
     public Collection<String> keys(final String pattern) {
         return redisTemplate.keys(pattern);
     }
+
+    public <T> Set<T> getHashKeys(String key){
+        return redisTemplate.opsForHash().keys(key);
+    }
 }