fix: 人脸更新接口逻辑修改，增强校验规则

guzijian
1 parent 85dca651
Showing 4 changed files with 13 additions and 4 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.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
@@ -133,7 +133,7 @@ public class DriverController extends BaseController {
      */
     @ApiOperation("人脸数据更新接口")
     @PostMapping("/update/face")
-    public AjaxResult updateFaceByJob(HttpServletRequest request, @ApiParam @Validated @RequestBody List<FaceUpdateReqVo> vo){
+    public AjaxResult updateFaceByJob(HttpServletRequest request, @ApiParam @Validated @RequestBody FaceUpdateReqVo vo){
         // TODO 人脸数据更新接口
         driverService.updateFaceByJob(request,vo);
         return AjaxResult.success();
@@ -94,5 +94,5 @@ public interface IDriverService
     void updateDriverByComputed();
-    void updateFaceByJob(HttpServletRequest request, List<FaceUpdateReqVo> vo);
+    void updateFaceByJob(HttpServletRequest request, FaceUpdateReqVo vo);
 }
@@ -272,14 +272,14 @@ public class DriverServiceImpl implements IDriverService {
     }
     @Override
-    public void updateFaceByJob(HttpServletRequest request, List<FaceUpdateReqVo> faceDataList) {
+    public void updateFaceByJob(HttpServletRequest request, FaceUpdateReqVo vo) {
         // 获取校验
         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 -> {
+        List<Driver> drivers = vo.getFaceDataList().stream().map(item -> {
             Driver driver = new Driver();
             driver.setPosts(item.getPosts());
             driver.setJobCode(item.getJobCode());
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
@@ -15,6 +16,13 @@ import java.util.List;
 @Data
 @ApiModel("人脸更新数据")
 public class FaceUpdateReqVo {
+    @ApiModelProperty("人脸数据")
+    @NotEmpty(message = "人脸数据集合不能为空")
+    @Valid
+    List<FaceData> faceDataList;
+      @Data
+      @ApiModel("FaceData")
+      public static class FaceData{
           /**
            * 工号
            */
@@ -39,4 +47,5 @@ public class FaceUpdateReqVo {
           @ApiModelProperty("工种")
           @NotBlank(message = "工种不能为空")
           String posts;
+      }
 }