fix: 更新人脸数据接口

guzijian
1 parent e195407a
Showing 8 changed files with 142 additions and 24 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/ApiProperties.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/pojo/request/FaceUpdateReqVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
+package com.ruoyi.common;
+
+/**
+ * @author 20412
+ */
+public interface ApiProperties {
+    /**
+     * 人事系统访问更新数据 途径 api key
+     */
+    String PERSONNEL_API_KEY = "signInCheckKey-qinputbashifaceupdate";
+}
 package com.ruoyi.driver.controller;
  
 import java.util.List;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
  
 import com.ruoyi.pojo.request.FaceRegistrationFeedbackVo;
@@ -9,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -126,12 +128,14 @@ public class DriverController extends BaseController {
  
     /**
      *  人脸数据更新接口
+     * @param request 请求头
      * @param vo 更新实际数据
      */
+    @ApiOperation("人脸数据更新接口")
     @PostMapping("/update/face")
-    public AjaxResult updateFaceByJob(List<FaceUpdateReqVo> vo){
+    public AjaxResult updateFaceByJob(HttpServletRequest request, @ApiParam @Validated @RequestBody List<FaceUpdateReqVo> vo){
         // TODO 人脸数据更新接口
-        driverService.updateFaceByJob(vo);
+        driverService.updateFaceByJob(request,vo);
         return AjaxResult.success();
     }
  
@@ -102,4 +102,8 @@ public interface DriverMapper
     Integer insertDriverFace(@Param("deviceId") String deviceId, @Param("jobCodes")List<String> jobCodes);
  
     void updateDriverByComputed(@Param("count")Integer count);
+
+    void updateDriversByJobCodes(@Param("list") List<Driver> list);
+
+    void deleteDeviceIdAssociatedJobCode(@Param("jobCodes") List<String> jobCodes);
 }
@@ -10,6 +10,7 @@ import com.ruoyi.pojo.request.FaceUpdateReqVo;
 import com.ruoyi.pojo.response.ResponseScheduling;
 import org.springframework.web.multipart.MultipartFile;
  
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
  
 /**
@@ -93,5 +94,5 @@ public interface IDriverService
  
     void updateDriverByComputed();
  
-    void updateFaceByJob(List<FaceUpdateReqVo> vo);
+    void updateFaceByJob(HttpServletRequest request, List<FaceUpdateReqVo> vo);
 }
@@ -2,6 +2,7 @@ package com.ruoyi.driver.service.impl;
  
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Paths;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -21,9 +22,12 @@ import com.ruoyi.pojo.request.FaceUpdateReqVo;
 import com.ruoyi.pojo.response.ResponseScheduling;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
+import com.ruoyi.utils.HttpUtils;
 import com.ruoyi.utils.ListUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.tomcat.util.buf.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -33,8 +37,10 @@ import com.ruoyi.driver.service.IDriverService;
 import org.springframework.web.multipart.MultipartFile;
  
 import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
  
+import static com.ruoyi.common.ApiProperties.PERSONNEL_API_KEY;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
  
 /**
@@ -46,6 +52,8 @@ import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE
 @Service
 public class DriverServiceImpl implements IDriverService {
  
+    private Logger log = LoggerFactory.getLogger(DriverServiceImpl.class);
+
     @Autowired
     private EquipmentMapper equipmentMapper;
     @Value("${api.url.getSchedulingInfo}")
@@ -264,8 +272,64 @@ public class DriverServiceImpl implements IDriverService {
     }
  
     @Override
-    public void updateFaceByJob(List<FaceUpdateReqVo> vo) {
-//        if ()
+    public void updateFaceByJob(HttpServletRequest request, List<FaceUpdateReqVo> faceDataList) {
+        // 获取校验
+        String header = request.getHeader("X-TOKEN-AUTHORIZATION");
+        if (!PERSONNEL_API_KEY.equals(header)){
+            throw new RuntimeException("X-TOKEN-AUTHORIZATION value error");
+        }
+        Date date = new Date();
+        List<Driver> drivers = faceDataList.stream().map(item -> {
+            Driver driver = new Driver();
+            driver.setPosts(item.getPosts());
+            driver.setJobCode(item.getJobCode());
+            try {
+                driver.setImage(getNewImageUrl(item.getJobCode(),item.getImageUrl()));
+            } catch (IOException e) {
+                log.info(e.getMessage());
+                throw new RuntimeException(e);
+            }
+            driver.setPersonnelName(item.getName());
+            driver.setUpdateTime(date);
+            return driver;
+        }).collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(s -> s.getJobCode()))), ArrayList::new));
+        List<List<Driver>> lists = ListUtils.splitList(drivers, 400);
+        log.info("开始人脸数据更新");
+        // 数据更新 更新人脸注册标识 更新基本数据
+        for (List<Driver> list : lists) {
+            driverMapper.updateDriversByJobCodes(list);
+        }
+        log.info("人脸数据更新完成");
+        // 删除注册表中对应工号的数据
+        List<String> jobCodes = drivers.stream().map(Driver::getJobCode).collect(Collectors.toList());
+        log.info("开始删除注册表中对应工号的数据");
+        driverMapper.deleteDeviceIdAssociatedJobCode(jobCodes);
+        log.info("删除注册表中对应工号的数据结束");
+    }
+
+    /**
+     * 获取新的imageUrl
+     *
+     * @param jobCode
+     * @param url
+     * @return
+     */
+    private String getNewImageUrl(String jobCode,String url) throws IOException {
+        // 生成文件路径
+        String fileName = jobCode + ".png";
+        String filePath = RuoYiConfig.getUploadPath() + headImagePre + "/" + fileName;
+        try {
+            fileName = FileUploadUtils.getPathFileName(RuoYiConfig.getUploadPath() + headImagePre, fileName);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        log.debug("图片开始上传");
+        // 获取图片数据
+        InputStream is = HttpUtils.doGet(url, new HashMap<>());
+        // 上传图片
+        ThreadJobService.uploadImage(is, filePath);
+        log.debug("图片上传完毕");
+        return fileName;
     }
  
     private File getLocationFile(String jobCode) {
 package com.ruoyi.pojo.request;
  
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
  
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
  
 /**
  * 人脸更新数据
  * @author 20412
  */
 @Data
+@ApiModel("人脸更新数据")
 public class FaceUpdateReqVo {
-    /**
-     * 工号
-     */
-    @NotBlank
-    String jobCode;
-    /**
-     * 图片base64
-     */
-    String imageUrl;
-    /**
-     * 姓名
-     */
-    String name;
-    /**
-     * 工种
-     */
-    String posts;
+          /**
+           * 工号
+           */
+          @ApiModelProperty("工号")
+          @NotBlank(message = "工号不能为空")
+          String jobCode;
+          /**
+           * 图片url不能为空
+           */
+          @ApiModelProperty("图片url")
+          @NotBlank(message = "图片url不能为空")
+          String imageUrl;
+          /**
+           * 姓名
+           */
+          @ApiModelProperty("姓名")
+          @NotBlank(message = "姓名不能为空")
+          String name;
+          /**
+           * 工种
+           */
+          @ApiModelProperty("工种")
+          @NotBlank(message = "工种不能为空")
+          String posts;
 }
@@ -126,14 +126,22 @@ public class ThreadJobService {
             // 获取图片数据
             InputStream is = HttpUtils.doGet(imageUrl, new HashMap<>());
             // 上传图片
-            uploadImage(is, filePath);
+            try {
+                uploadImage(is, filePath);
+            } catch (IOException e) {
+                log.error(e.getMessage());
+                throw new RuntimeException(e);
+            }
             log.debug("图片上传完毕");
         }
  
  
     }
  
-    private void uploadImage(InputStream is, String filePath) {
+    public static void uploadImage(InputStream is, String filePath) throws IOException {
+        if (Objects.isNull(is)){
+            throw new IOException("图片数据不存在");
+        }
         File file = new File(filePath + File.separator);
         log.info("文件路径:{}",file.getPath());
         if (!file.exists()) {
@@ -245,6 +245,13 @@
             HAVING COUNT(*) = #{count}
         );
     </update>
+    <update id="updateDriversByJobCodes">
+        <foreach collection="list" item="item" separator=";">
+            update driver set face_sign_in = 1,
+                              personnel_name = #{item.personnelName,jdbcType=VARCHAR},posts = #{item.posts,jdbcType=VARCHAR},image = #{item.image,jdbcType=VARCHAR},update_time = #{item.updateTime}
+            where job_code = #{item.jobCode,jdbcType=VARCHAR}
+        </foreach>
+    </update>
     <insert id="saveDriverScheduling">
         INSERT INTO driver_scheduling (
         id, scheduleDate, lineName, lineCode, lpName,
@@ -301,6 +308,13 @@
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteDeviceIdAssociatedJobCode">
+        delete from driver where
+   job_code in
+   ( <foreach collection="jobCodes" item="item" separator=",">
+        #{item}
+    </foreach> )
+    </delete>
  
  
     <insert id="saveDrivers">