fix: 修改驾驶员上传图片接口逻辑

guzijian
1 parent 8f878e38
Showing 3 changed files with 60 additions and 12 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/domain/Driver.java
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
 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.ApiOperation;
@@ -18,6 +24,7 @@ import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.service.IDriverService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
  
 /**
  * 驾驶员信息Controller
@@ -32,6 +39,9 @@ public class DriverController extends BaseController {
     @Autowired
     private IDriverService driverService;
  
+    @Autowired
+    private ServerConfig serverConfig;
+
     /**
      * 获取驾驶员排班信息
      */
@@ -122,7 +132,7 @@ public class DriverController extends BaseController {
     /**
      * 校验工号
      *
-     * @param jobCode
+     * @param driver
      * @return
      */
     @GetMapping("/check")
@@ -131,6 +141,32 @@ public class DriverController extends BaseController {
         return driverService.checkJobCode(driver);
     }
  
+    @PostMapping("/upload")
+    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;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
  
 //    @ApiOperation("保存员工大头像")
 }
@@ -108,30 +108,34 @@ public class Driver extends BaseEntity {
     @Excel(name = "RFID 人卡ID号", readConverterExp = "1=0进制")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String idRfid;
-
     /**
      * RFID 标签号
      */
     @Excel(name = "RFID 标签号")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String tagRfid;
-
     /**
      * 线路名称
      */
     @Excel(name = "线路名称")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String lineName;
-
     /**
      * 线路编码
      */
     @Excel(name = "线路编码")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String lineCode;
-
-    @Excel(name = "人脸注册")
-    @ApiModelProperty("是否人脸注册 1 注册 2 未注册")
-    private Integer signIn;
+    /**
+     * 是否人脸注册
+     */
+    @Excel(name = "是否人脸注册")
+    @ApiModelProperty("是否人脸注册 0 注册 1 未注册 2 注册过期")
+    private Integer faceSignIn;
+    /**
+     * 大头像
+     */
+    @ApiModelProperty("头像")
+    private String image;
  
 }
@@ -42,12 +42,13 @@
                remark,
                line_name,
                line_code,
-               sign_in
+               face_sign_in,
+               image
         from driver
     </sql>
     <sql id="insertDriverVo">
         job_code
-        , company_code, branche_company_code, personnel_name, papers_code, ic_card_code, personnel_type, posts, card, telphone, ic_rfid, id_rfid, tag_rfid, remark, line_name, line_code,sign_in
+        , company_code, branche_company_code, personnel_name, papers_code, ic_card_code, personnel_type, posts, card, telphone, ic_rfid, id_rfid, tag_rfid, remark, line_name, line_code,face_sign_in,image
     </sql>
  
     <select id="selectDriverList" parameterType="Driver" resultMap="DriverResult">
@@ -72,6 +73,7 @@
             <if test="tagRfid != null  and tagRfid != ''">and tag_rfid = #{tagRfid}</if>
             <if test="lineName != null  and lineName != ''">and line_name like concat('%', #{lineName}, '%')</if>
             <if test="lineCode != null  and lineCode != ''">and line_code = #{lineCode}</if>
+            <if test="faceSignIn != null  and faceSignIn != ''">and face_sign_in = #{faceSignIn}</if>
         </where>
     </select>
  
@@ -127,6 +129,8 @@
             <if test="remark != null">remark,</if>
             <if test="lineName != null">line_name,</if>
             <if test="lineCode != null">line_code,</if>
+            <if test="faceSignIn != null">face_sign_in,</if>
+            <if test="image != null">image</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jobCode != null and jobCode != ''">#{jobCode},</if>
@@ -145,6 +149,8 @@
             <if test="remark != null">#{remark},</if>
             <if test="lineName != null">#{lineName},</if>
             <if test="lineCode != null">#{lineCode},</if>
+            <if test="faceSignIn != null">#{faceSignIn},</if>
+            <if test="image != null">#{image}</if>
         </trim>
     </insert>
  
@@ -167,7 +173,8 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="lineName != null">line_name = #{lineName},</if>
             <if test="lineCode != null">line_code = #{lineCode},</if>
-            <if test="signIn != null">sign_in = #{signIn}</if>
+            <if test="faceSignIn != null">face_sign_in = #{faceSignIn},</if>
+            <if test="image != null">image = #{image}</if>
         </trim>
         where id = #{id}
     </update>
@@ -253,7 +260,8 @@
             #{item.remark,jdbcType=VARCHAR},
             #{item.lineName,jdbcType=VARCHAR},
             #{item.lineCode,jdbcType=VARCHAR},
-            #{item.signIn}
+            #{item.faceSignIn},
+            #{item.image}
             )
         </foreach>
         on duplicate key update