验证

web/src/main/java/com/ibeetl/jlw/validator/TeacherOpenCourseStudentSigninSettingQueryValidator.java

@@ -1,7 +1,6 @@
 package com.ibeetl.jlw.validator;
 
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.StrUtil;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninSettingQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -22,20 +21,20 @@ public class TeacherOpenCourseStudentSigninSettingQueryValidator {
      * @param query
      */
     public void validator(TeacherOpenCourseStudentSigninSettingQuery query) {
-
+        Assert.notNull(query, "传入参数不能为空！");
         final String signinSettingType = query.getTeacherOpenCourseStudentSigninSettingType();
-
-        String signinSettingValue = query.getTeacherOpenCourseStudentSigninSettingValue();
+        final String signinSettingValue = query.getTeacherOpenCourseStudentSigninSettingValue();
 
         // 如果是ip签到类型，验证IP区间字符
-        if (StrUtil.isNotBlank(query.getTeacherOpenCourseStudentSigninSettingValue())
-                && signinSettingType.equals(ip_signin.name())) {
-            verifyIpRange(query.getTeacherOpenCourseStudentSigninSettingValue());
+        if (signinSettingType.equals(ip_signin.name())) {
+            verifyIpRange(signinSettingValue);
         }
         else if(signinSettingType.equals(manual_signin.name())) {
+            Assert.notBlank(signinSettingValue, "配置参数值不能为空！");
             Assert.isTrue(StringUtils.isBlank(signinSettingValue), "手动签到，配置参数值必须为空！");
         }
         else if(signinSettingType.equals(code_signin.name())) {
+            Assert.notBlank(signinSettingValue, "配置参数值不能为空！");
             Assert.isTrue(signinSettingValue.length() == 6, "验证码签到，配置参数值长度必须是6位！");
         }
     }