fix: 新增验证功能

guzijian
1 parent 52e50152
Showing 7 changed files with 38 additions and 13 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/in/controller/SignInController.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/pojo/request/FaceUpdateReqVo.java
@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
  
 import com.ruoyi.pojo.request.FaceRegistrationFeedbackVo;
+import com.ruoyi.pojo.request.FaceUpdateReqVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -122,6 +123,18 @@ public class DriverController extends BaseController {
         return toAjax(driverService.updateDriver(driver) + 1);
     }
  
+
+    /**
+     *  人脸数据更新接口
+     * @param vo 更新实际数据
+     */
+    @PostMapping("/update/face")
+    public AjaxResult updateFaceByJob(List<FaceUpdateReqVo> vo){
+        // TODO 人脸数据更新接口
+        driverService.updateFaceByJob(vo);
+        return AjaxResult.success();
+    }
+
     /**
      * 删除驾驶员信息
      */
@@ -6,6 +6,7 @@ import java.util.List;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.file.InvalidExtensionException;
 import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.pojo.request.FaceUpdateReqVo;
 import com.ruoyi.pojo.response.ResponseScheduling;
 import org.springframework.web.multipart.MultipartFile;
  
@@ -91,4 +92,6 @@ public interface IDriverService
     AjaxResult faceRegistrationFeedback(String deviceId, List<String> jobCode);
  
     void updateDriverByComputed();
+
+    void updateFaceByJob(List<FaceUpdateReqVo> vo);
 }
@@ -17,6 +17,7 @@ import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.job.DriverJob;
 import com.ruoyi.pojo.domain.EquipmentDriverExpand;
+import com.ruoyi.pojo.request.FaceUpdateReqVo;
 import com.ruoyi.pojo.response.ResponseScheduling;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
@@ -262,6 +263,11 @@ public class DriverServiceImpl implements IDriverService {
         driverMapper.updateDriverByComputed(count);
     }
  
+    @Override
+    public void updateFaceByJob(List<FaceUpdateReqVo> vo) {
+//        if ()
+    }
+
     private File getLocationFile(String jobCode) {
         String image = driverMapper.getDriverImageByJobCode(jobCode);
  
@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -67,15 +68,6 @@ public class SignInController extends BaseController {
     }
  
     /**
-     *  人脸数据更新接口
-     */
-    @PostMapping("/update/face")
-    public AjaxResult updateFaceByJob(FaceUpdateReqVo vo){
-        // TODO 人脸数据更新接口
-        return AjaxResult.success("签到成功");
-    }
-
-    /**
      * 获取签到详细信息
      */
 //    @PreAuthorize("@ss.hasPermi('in:in:query')")
@@ -106,7 +98,7 @@ public class SignInController extends BaseController {
      */
     @PostMapping("/newAdd")
     @ApiOperation("新增签到（设备传入）")
-    public AjaxResult addSignIn(@ApiParam @RequestBody SignIn signIn) throws FileUploadException, IOException {
+    public AjaxResult addSignIn(@ApiParam @RequestBody @Validated SignIn signIn) throws FileUploadException, IOException {
         return signInService.addSignIn(signIn);
     }
  
@@ -11,6 +11,9 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
  
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * 签到对象 sign_in
  * 
@@ -33,10 +36,12 @@ public class SignIn extends BaseEntity {
      */
     @Excel(name = "工号")
     @ApiModelProperty("工号")
+    @NotBlank(message = "工号不能为空")
     private String jobCode;
  
     @Excel(name = "设备号")
     @ApiModelProperty("设备号")
+    @NotBlank(message = "设备号不能为空")
     private String deviceId;
     /**
      * 设备地址
@@ -49,6 +54,7 @@ public class SignIn extends BaseEntity {
      */
     @Excel(name = "图片")
     @ApiModelProperty("图片信息")
+    @NotBlank(message = "图片信息不能为空")
     private String image;
     /**
      * 签到结果
@@ -61,12 +67,14 @@ public class SignIn extends BaseEntity {
      */
     @Excel(name = "签到类型")
     @ApiModelProperty("签到类型  1 人脸 2 刷卡 3 其他 4 酒精 用可以多选 用,拼接 如 1,2,3,4")
+    @NotBlank(message = "签到类型不能为空")
     private String singnIn;
     /**
      * 酒精测试
      */
     @Excel(name = "酒精测试")
     @ApiModelProperty("酒精测试 1 已测试 2 未测试")
+    @NotNull(message = "酒精测试标识不能为空")
     private Integer alcoholFlag;
  
     /**
@@ -74,6 +82,7 @@ public class SignIn extends BaseEntity {
      */
     @Excel(name = "签到签退")
     @ApiModelProperty("签到签退 1 签到成功 2 签退成功")
+    @NotNull(message = "签到类型不能为空")
     private Integer type;
  
     /**
@@ -218,8 +218,7 @@ public class SignInServiceImpl implements ISignInService {
             count = redisCache.setIncrementMapValue(key, signIn.getJobCode(), 1);
         }
         if (SIGN_IN_ERROR_COUNT.compareTo(count) <= 0) {
-            // TODO
-            return AjaxResult.warn(SIGN_IN_ERROR + signIn.getRemark() + "，酒精测试不通过" + count + "次请更换车辆驾驶员", vo);
+            return AjaxResult.warn(SIGN_IN_ERROR + signIn.getRemark() + "酒精测试不通过" + count + "次请更换车辆驾驶员", vo);
         }
         return null;
     }
@@ -2,6 +2,8 @@ package com.ruoyi.pojo.request;
  
 import lombok.Data;
  
+import javax.validation.constraints.NotBlank;
+
 /**
  * 人脸更新数据
  * @author 20412
@@ -11,11 +13,12 @@ public class FaceUpdateReqVo {
     /**
      * 工号
      */
+    @NotBlank
     String jobCode;
     /**
      * 图片base64
      */
-    String imageBase64;
+    String imageUrl;
     /**
      * 姓名
      */