From 1f649d1864bc20ad4d6e59e2d7b75a7eaced8e5b Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Fri, 14 Oct 2022 09:56:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rseStudentSigninSettingQueryValidator.java | 31 +++++++++++++++++++ ...TeacherOpenCourseStudentSigninSetting.java | 15 --------- ...OpenCourseStudentSigninSettingService.java | 4 +++ 3 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 web/src/main/java/cn/jlw/validator/TeacherOpenCourseStudentSigninSettingQueryValidator.java diff --git a/web/src/main/java/cn/jlw/validator/TeacherOpenCourseStudentSigninSettingQueryValidator.java b/web/src/main/java/cn/jlw/validator/TeacherOpenCourseStudentSigninSettingQueryValidator.java new file mode 100644 index 00000000..a3e9dd72 --- /dev/null +++ b/web/src/main/java/cn/jlw/validator/TeacherOpenCourseStudentSigninSettingQueryValidator.java @@ -0,0 +1,31 @@ +package cn.jlw.validator; + +import cn.hutool.core.util.StrUtil; +import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninSettingQuery; +import org.springframework.stereotype.Component; + +import static cn.jlw.util.IpUtils.verifyIpRange; +import static com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogSigninDTO.TeacherOpenCourseStudentSigninLogTypeEnum.ip_signin; + +/** + * 签到配置Query验证类 + * + * @author mlx + **/ +@Component +public class TeacherOpenCourseStudentSigninSettingQueryValidator { + + /** + * 复杂验证 + * @param query + */ + public void validator(TeacherOpenCourseStudentSigninSettingQuery query) { + + // 如果是ip签到类型，验证IP区间字符 + if (StrUtil.isNotBlank(query.getTeacherOpenCourseStudentSigninSettingValue()) + && query.getTeacherOpenCourseStudentSigninSettingType().equals(ip_signin.name())) { + verifyIpRange(query.getTeacherOpenCourseStudentSigninSettingValue()); + } + } + +} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java index eaad62cc..9b3e1724 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java @@ -1,6 +1,5 @@ package com.ibeetl.jlw.entity; -import cn.hutool.core.util.StrUtil; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.annotation.DictEnum; import com.ibeetl.admin.core.entity.BaseEntity; @@ -13,9 +12,6 @@ import org.beetl.sql.fetch.annotation.FetchSql; import javax.validation.constraints.NotNull; import java.util.Date; -import static cn.jlw.util.IpUtils.verifyIpRange; -import static com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogSigninDTO.TeacherOpenCourseStudentSigninLogTypeEnum.ip_signin; - /* * 教师-我的课程-开课-学生签到-配置 * gen by Spring Boot2 Admin 2022-10-11 @@ -155,11 +151,6 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{ */ public void setTeacherOpenCourseStudentSigninSettingType(String teacherOpenCourseStudentSigninSettingType){ this.teacherOpenCourseStudentSigninSettingType = teacherOpenCourseStudentSigninSettingType; - // 如果是ip签到类型，验证IP区间字符 - if (StrUtil.isNotBlank(getTeacherOpenCourseStudentSigninSettingValue()) - && getTeacherOpenCourseStudentSigninSettingType().equals(ip_signin.name())) { - verifyIpRange(getTeacherOpenCourseStudentSigninSettingValue()); - } } /**设置的值：数据例子：IP: x.x.x.x-x.x.x.x，验证码：xxxx，手动签到：无需设置 @@ -173,12 +164,6 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{ */ public void setTeacherOpenCourseStudentSigninSettingValue(String teacherOpenCourseStudentSigninSettingValue){ this.teacherOpenCourseStudentSigninSettingValue = teacherOpenCourseStudentSigninSettingValue; - - // 如果是ip签到类型，验证IP区间字符 - if (StrUtil.isNotBlank(getTeacherOpenCourseStudentSigninSettingValue()) - && getTeacherOpenCourseStudentSigninSettingType().equals(ip_signin.name())) { - verifyIpRange(getTeacherOpenCourseStudentSigninSettingValue()); - } } /**签到开始日期 diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java index ab955619..b5cd59f4 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java @@ -1,6 +1,7 @@ package com.ibeetl.jlw.service; import cn.jlw.util.ToolUtils; +import cn.jlw.validator.TeacherOpenCourseStudentSigninSettingQueryValidator; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.ibeetl.admin.core.service.CoreBaseService; @@ -36,6 +37,7 @@ import java.util.List; public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseService{ @Resource private TeacherOpenCourseStudentSigninSettingDao teacherOpenCourseStudentSigninSettingDao; + @Resource private TeacherOpenCourseStudentSigninSettingQueryValidator settingQueryValidator; public PageQueryqueryByCondition(PageQuery query){ PageQuery ret = teacherOpenCourseStudentSigninSettingDao.queryByCondition(query); @@ -92,7 +94,9 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic public JsonResult add(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery){ String msg = ""; + settingQueryValidator.validator(teacherOpenCourseStudentSigninSettingQuery); TeacherOpenCourseStudentSigninSetting teacherOpenCourseStudentSigninSetting = teacherOpenCourseStudentSigninSettingQuery.pojo(); + // 默认是未开始的状态 teacherOpenCourseStudentSigninSetting.setTeacherOpenCourseStudentSigninSettingStartStatus(StartStatusEnum.READY); teacherOpenCourseStudentSigninSettingDao.insert(teacherOpenCourseStudentSigninSetting);