促销员打卡数据校验

src/main/java/com/wangxiaolu/promotion/controller/activity/temporary/TemporaryActivityCoreController.java

@@ -38,6 +38,7 @@ public class TemporaryActivityCoreController {
      */
     @PostMapping("/today/clock")
     public R clockInTodayActivity(@RequestBody @Validated TemporaryClockVo clockVo) {
+        clockVo.validate();
         Integer clockType = clockVo.getClockType();
         boolean isClockIn = ClockType.TEMPORARY_CLOCK_IN.equals(clockType);
         // 上班卡必需有店铺id

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/vo/TemporaryClockVo.java

 package com.wangxiaolu.promotion.pojo.activity.temporary.vo;
 
+import com.wangxiaolu.promotion.exception.ParamException;
+import com.wangxiaolu.promotion.result.basedata.RCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Objects;
 
 /**
  * @author : liqiulin
@@ -27,14 +31,14 @@ public class TemporaryClockVo {
     /**
      * 打卡类型：1、上班卡；2、午休下班卡；3、午休上班卡；4、下班卡
      */
-    @NotNull(message = "无打卡类型")
-    @Range(max = 4, min = 1, message = "超出状态")
+//    @NotNull(message = "无打卡类型")
+//    @Range(max = 4, min = 1, message = "超出状态")
     Integer clockType;
 
     /**
      * temporaryId
      */
-    @NotNull(message = "找不到打卡人")
+//    @NotNull(message = "找不到打卡人")
     Integer temporaryId;
 
     String temporaryName;
@@ -46,15 +50,28 @@ public class TemporaryClockVo {
     String storeName;
 
     // 上班打卡地点
-    @NotBlank(message = "请选择打卡地址")
+//    @NotBlank(message = "请选择打卡地址")
     String clockAddress;
 
     // 上班打卡经纬度
-    @NotBlank(message = "请选择打卡地点")
+//    @NotBlank(message = "请选择打卡地点")
     String clockCoordinates;
 
     // 上班打卡图片
-    @NotBlank(message = "请上传图片")
+//    @NotBlank(message = "请上传图片")
     String clockPhoto;
 
+    public void validate(){
+        if (Objects.isNull(clockType) || !(clockType >= 1 && clockType <= 4)){
+            throw new ParamException(RCode.CLOCK_DETAIL_ERROR, null);
+        }
+        if (Objects.isNull(temporaryId)){
+            throw new ParamException(RCode.LOGIN_PARAM_ERROR, null);
+        }
+        if (StringUtils.isBlank(clockAddress) || StringUtils.isBlank(clockPhoto)){
+            throw new ParamException(RCode.CLOCK_DETAIL_ERROR, null);
+        }
+
+    }
+
 }