fix: 新增异步上传

guzijian
1 parent 9c7fbffa
Showing 9 changed files with 206 additions and 35 deletions
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/in/domain/SignIn.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
ruoyi-admin/src/main/resources/mapper/in/SignInMapper.xml
@@ -125,4 +125,17 @@ public class DriverController extends BaseController {
     public AjaxResult remove(@ApiParam @PathVariable Long[] ids) {
         return toAjax(driverService.deleteDriverByIds(ids));
     }
+
+    /**
+     * 校验工号
+     * @param jobCode
+     * @return
+     */
+    @GetMapping("/check/{jobCode}")
+    @ApiOperation("校验jobCode是否存入当前系统")
+    public AjaxResult checkJobCode(@PathVariable("jobCode") String jobCode){
+        return driverService.checkJobCode(jobCode);
+    }
+
+//    @ApiOperation("保存员工大头像")
 }
@@ -85,4 +85,11 @@ public interface DriverMapper
      * @return
      */
     List<Driver> getNameByJobCode(@Param("jobCodes") Set<String> jobCodes);
+
+    /**
+     * 是否存在对应工号在数据库中
+     * @param jobCode
+     * @return
+     */
+    Integer jobCodeIsEmpty(@Param("jobCode") String jobCode);
 }
@@ -75,4 +75,5 @@ public interface IDriverService
     AjaxResult getDriverSchedulingAll();
+    AjaxResult checkJobCode(String jobCode);
 }
@@ -109,7 +109,7 @@ public class DriverServiceImpl implements IDriverService {
     @Override
     public AjaxResult getDriverSchedulingInfo(String schedulingDate, String jobCode) {
         String key = DRIVER_SCHEDULING_PRE + schedulingDate;
-        List<ResponseScheduling> cacheMapValue = redisCache.getCacheMapValue(key , jobCode);
+        List<ResponseScheduling> cacheMapValue = redisCache.getCacheMapValue(key, jobCode);
         // 优先从缓存中读取
         if (cacheMapValue != null && cacheMapValue.size() > 0) {
             return AjaxResult.success(cacheMapValue);
@@ -131,4 +131,16 @@ public class DriverServiceImpl implements IDriverService {
     public AjaxResult getDriverSchedulingAll() {
         return AjaxResult.success(redisCache.getHashKeys(DRIVER_SCHEDULING_PRE + ConstDateUtil.formatDate("yyyyMMdd")));
     }
+
+    @Override
+    public AjaxResult checkJobCode(String jobCode) {
+        Integer result = driverMapper.jobCodeIsEmpty(jobCode);
+        Map<String, Boolean> resultMap = new HashMap<>();
+        if (result > 0) {
+            resultMap.put("result", true);
+        } else {
+            resultMap.put("result", false);
+        }
+        return AjaxResult.success(resultMap);
+    }
 }
@@ -30,6 +30,18 @@ public class SignIn extends BaseEntity
     @ApiModelProperty("工号")
     private String jobCode;
+    @Excel(name = "设备号")
+    @ApiModelProperty("设备号")
+    private String deviceId;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
     /** 设备地址 */
     @Excel(name = "设备地址")
     @ApiModelProperty("设备ip 不用填写")
@@ -17,6 +17,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.service.ThreadJobService;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +26,8 @@ import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.service.ISignInService;
 import sun.misc.BASE64Decoder;
+import javax.annotation.Resource;
+
 /**
  * 签到Service业务层处理
  *
@@ -36,6 +39,9 @@ public class SignInServiceImpl implements ISignInService {
     @Autowired
     private SignInMapper signInMapper;
+    @Resource
+    private ThreadJobService threadJobConfig;
+
     /**
      * 查询签到
      *
@@ -123,12 +129,12 @@ public class SignInServiceImpl implements ISignInService {
         fileName = extractFilename(fileName);
         // 获取相对路径
         String absPath = getAbsoluteFile(filePath, fileName).getAbsolutePath();
-        // 上传文件
-        startUpload(absPath, base64);
+
         // 获取文件上传路径
         String pathFileName = getPathFileName(filePath, fileName);
         signIn.setImage(pathFileName);
-
+        // 异步上传文件
+        threadJobConfig.startUpload(absPath,base64);
         return signInMapper.insertSignIn(signIn);
     }
@@ -174,35 +180,6 @@ public class SignInServiceImpl implements ISignInService {
         return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
     }
-    public void startUpload(String url, String base64) throws FileUploadException, IOException {
-        FileOutputStream outputStream = null;
-        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(photoBase64);
-            outputStream.flush();
-        } catch (Exception e) {
-            throw new FileUploadException("文件上传异常");
-        } finally {
-            try {
-                if (!Objects.isNull(outputStream)) {
-                    outputStream.close();
-                }
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
     /**
      * 检查文件类型
      *
+package com.ruoyi.service;
+
+
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.exception.file.FileUploadException;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.uuid.Seq;
+import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.in.mapper.SignInMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.stereotype.Component;
+import sun.misc.BASE64Decoder;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Base64;
+import java.util.Objects;
+
+
+/**
+ * 多线程任务
+ *
+ * @author 20412
+ */
+@EnableAsync
+@Component
+@Slf4j
+public class ThreadJobService {
+
+
+    /**
+     * 异步上传图片
+     *
+     * @param url
+     * @param base64
+     * @throws FileUploadException
+     * @throws IOException
+     */
+    @Async
+    public void startUpload(String url, String base64) {
+        FileOutputStream outputStream = null;
+        base64 = base64.replaceAll(" ", "");
+//        byte[] imageBytes = Base64.getDecoder().decode(base64);
+        BASE64Decoder decoder = new BASE64Decoder();
+        try {
+            byte[] photoBase64 = decoder.decodeBuffer(base64);
+            for (int i = 0; i < photoBase64.length; ++i) {
+                //调整异常数据
+                if (photoBase64[i] < 0) {
+                    photoBase64[i] += 256;
+                }
+            }
+            outputStream = new FileOutputStream(url);
+            outputStream.write(photoBase64);
+            outputStream.flush();
+        } catch (Exception e) {
+            log.error("文件上传异常:{}", e.getMessage());
+        } finally {
+            try {
+                if (!Objects.isNull(outputStream)) {
+                    outputStream.close();
+                }
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    /**
+     * 检查文件类型
+     *
+     * @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;
+    }
+
+    /**
+     * 获取相对路径名
+     *
+     * @param uploadDir
+     * @param fileName
+     * @return
+     * @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()) {
+                desc.getParentFile().mkdirs();
+            }
+        }
+        return desc;
+    }
+
+    /**
+     * 获取扩展文件名
+     *
+     * @param extendFileName
+     * @return
+     */
+    public String extractFilename(String extendFileName) {
+        return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
+                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 {
+        int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
+        String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
+        return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
+    }
+
+}
@@ -99,6 +99,11 @@
         </where>
     </select>
+    <select id="jobCodeIsEmpty" resultType="java.lang.Integer">
+        select count(*)
+       from driver
+        where job_code = #{jobCode}
+    </select>
     <insert id="insertDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">
         insert into driver
@@ -8,6 +8,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="id"    column="id"    />
         <result property="createTime"    column="create_time"    />
         <result property="jobCode"    column="jobCode"    />
+        <result property="deviceId"    column="device_id"    />
         <result property="ip"    column="ip"    />
         <result property="image"    column="image"    />
         <result property="status"    column="status"    />
@@ -21,7 +22,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </resultMap>
     <sql id="selectSignInVo">
-        select id, create_time, jobCode, ip,image, status, update_by, singn_in, alcohol_flag, type, update_time, alcohol_intake, remark from sign_in
+        select id, create_time, jobCode, device_id,ip,image, status, update_by, singn_in, alcohol_flag, type, update_time, alcohol_intake, remark from sign_in
     </sql>
     <select id="selectSignInList" parameterType="SignIn" resultMap="SignInResult">
@@ -92,12 +93,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="createTime != null">create_time,</if>
             <if test="jobCode != null">jobCode,</if>
             <if test="ip != null">ip,</if>
+            <if test="deviceId != null">device_id,</if>
             <if test="image != null">image,</if>
             <if test="status != null">status,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="singnIn != null">singn_in,</if>
             <if test="alcoholFlag != null">alcohol_flag,</if>
-            <if test="type != null">type,</if>
+            <if test="type != null">`type`,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="alcoholIntake != null">alcohol_intake,</if>
             <if test="remark != null">remark,</if>
@@ -106,6 +108,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="createTime != null">#{createTime},</if>
             <if test="jobCode != null">#{jobCode},</if>
             <if test="ip != null">#{ip},</if>
+            <if test="deviceId != null">#{deviceId},</if>
             <if test="image != null">#{image},</if>
             <if test="status != null">#{status},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -124,6 +127,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="jobCode != null">jobCode = #{jobCode},</if>
             <if test="ip != null">ip = #{ip},</if>
+            <if test="deviceId != null">device_id = #{deviceId},</if>
             <if test="image != null">image = #{image},</if>
             <if test="status != null">status = #{status},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>