日期格式校验

scommons/src/main/java/com/xhkjedu/utils/DatesUtil.java

@@ -178,4 +178,20 @@ public class DatesUtil {
         return gtime;
     }
 
+    /**
+     * 日期不合法
+     *
+     * @return boolean
+     * @Param [date]
+     * @Author ywx
+     * @Date 2023/1/3 9:17
+     **/
+    public static boolean dateNan(String date) {
+        if (date != null && date.contains("NaN")) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
 }

sexam/src/main/java/com/xhkjedu/sexam/controller/exam/EBaseController.java

@@ -16,6 +16,7 @@ import com.xhkjedu.sexam.vo.exam.EBaseVo;
 import com.xhkjedu.sexam.vo.exam.ExamVo;
 import com.xhkjedu.sexam.vo.paper.EPaperVo;
 import com.xhkjedu.sexam.vo.system.UserVo;
+import com.xhkjedu.utils.DatesUtil;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
@@ -58,8 +59,8 @@ public class EBaseController {
     public ResultVo add(@RequestBody EBase eBase) {
         if (N_Utils.isListEmpty(eBase.getClassids())) return new ResultVo(1, "考试班级不能为空");
         if (N_Utils.isListEmpty(eBase.getSubjects())) return new ResultVo(1, "考试科目不能为空");
-        if ("NaN-aN-aN".equals(eBase.getExamdate())) {
-            return new ResultVo(1,"日期格式不正确");
+        if (DatesUtil.dateNan(eBase.getExamdate())) {
+            return new ResultVo(1, "日期格式不正确");
         }
         return eBaseService.save(eBase);
     }
@@ -84,8 +85,8 @@ public class EBaseController {
         EBaseVo vo = eBaseService.getExamStateAndMode(examid);
         if (2 <= vo.getExamstate()) return new ResultVo(1, "考试已结束禁止操作");
 
-        if (JSON.toJSONString(subjects).contains("NaN-aN-aN")) {
-            return new ResultVo(1,"日期格式不正确");
+        if (DatesUtil.dateNan(JSON.toJSONString(subjects))) {
+            return new ResultVo(1, "日期格式不正确");
         }
         if (vo.getExammode() == 1) {//线上的考试必须有时间
             for (ESubject es : subjects) {

slive/src/main/java/com/xhkjedu/slive/controller/liveplay/CourseController.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.xhkjedu.slive.model.liveplay.LCourse;
 import com.xhkjedu.slive.service.liveplay.CourseService;
 import com.xhkjedu.slive.vo.liveplay.*;
+import com.xhkjedu.utils.DatesUtil;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
@@ -33,8 +34,8 @@ public class CourseController {
     @PostMapping("/add")
     public ResultVo add(@RequestBody LCourse course) {
         N_Utils.validation(new Object[]{course.getSubjectid(),"科目id",2});
-        if ("NaN-aN-aN".equals(course.getBegindate()) || "NaN-aN-aN".equals(course.getEnddate())) {
-            return new ResultVo(1,"日期格式不正确");
+        if (DatesUtil.dateNan(course.getBegindate()) || DatesUtil.dateNan(course.getEnddate())) {
+            return new ResultVo(1, "日期格式不正确");
         }
         return courseService.save(course);
     }

slive/src/main/java/com/xhkjedu/slive/controller/liveplay/CourseSectionController.java

@@ -11,6 +11,7 @@ import com.xhkjedu.slive.vo.liveplay.CSVStudentVo;
 import com.xhkjedu.slive.vo.liveplay.CourseParams;
 import com.xhkjedu.slive.vo.liveplay.CourseSectionVo;
 import com.xhkjedu.slive.vo.liveplay.CourseVo;
+import com.xhkjedu.utils.DatesUtil;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
@@ -39,7 +40,7 @@ public class CourseSectionController {
     @PostMapping("/add")
     public ResultVo add(@RequestBody LCourseSection section) {
         N_Utils.validation(new Object[]{section.getCourseid(),"课程id",1,section.getTeacherid(),"教师id",1});
-        if ("NaN-aN-aN".equals(section.getSectiondate())) return new ResultVo(1,"日期格式不正确");
+        if (DatesUtil.dateNan(section.getSectiondate())) return new ResultVo(1, "日期格式不正确");
         return courseSectionService.save(section);
     }
 
@@ -58,7 +59,7 @@ public class CourseSectionController {
     @PostMapping("/update")
     public ResultVo update(@RequestBody LCourseSection section) {
         N_Utils.validation(new Object[]{section.getSectionid(),"课节id",1,section.getCreateid(),"用户id",1});
-        if ("NaN-aN-aN".equals(section.getSectiondate())) return new ResultVo(1,"日期格式不正确");
+        if (DatesUtil.dateNan(section.getSectiondate())) return new ResultVo(1, "日期格式不正确");
         return courseSectionService.update(section);
     }
 
@@ -384,9 +385,10 @@ public class CourseSectionController {
 
     @PostMapping("/myupdate")
     public ResultVo myUpdate(@RequestBody LCourseSection section) {
-        N_Utils.validation(new Object[]{section.getSectionid(),"课节id",1,section.getCreateid(),"用户id",1
-        ,section.getSectionname(),"课节名称",2,section.getPlanbegintime(),"计划开始时间",2,section.getPlanendtime(),"计划结束时间",2});
-        if ("NaN-aN-aN".equals(section.getSectiondate())) return new ResultVo(1,"日期格式不正确");
+        N_Utils.validation(new Object[]{section.getSectionid(), "课节id", 1, section.getCreateid(), "用户id", 1
+                , section.getSectionname(), "课节名称", 2, section.getPlanbegintime(), "计划开始时间", 2, section.getPlanendtime(),
+                "计划结束时间", 2});
+        if (DatesUtil.dateNan(section.getSectiondate())) return new ResultVo(1, " 日期格式不正确 ");
         return courseSectionService.myUpdate(section);
     }
 

slive/src/main/java/com/xhkjedu/slive/controller/liveplay/CsController.java

@@ -6,6 +6,7 @@ import com.xhkjedu.slive.model.liveplay.LCourse;
 import com.xhkjedu.slive.service.liveplay.CsService;
 import com.xhkjedu.slive.vo.liveplay.CourseParams;
 import com.xhkjedu.slive.vo.liveplay.CourseVo;
+import com.xhkjedu.utils.DatesUtil;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
@@ -34,7 +35,7 @@ public class CsController {
     @PostMapping("/add")
     public ResultVo add(@RequestBody LCourse course) {
         N_Utils.validation(new Object[]{course.getSubjectid(), "科目id", 2});
-        if ("NaN-aN-aN".equals(course.getBegindate()) || "NaN-aN-aN".equals(course.getEnddate())) {
+        if (DatesUtil.dateNan(course.getBegindate()) || DatesUtil.dateNan(course.getEnddate())) {
             return new ResultVo(1, "日期格式不正确");
         }
         return csService.save(course);

slive/src/main/java/com/xhkjedu/slive/controller/xz/XzController.java

@@ -4,9 +4,8 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.slive.model.xz.LXz;
 import com.xhkjedu.slive.service.xz.XzService;
-import com.xhkjedu.slive.utils.PoiUtils;
 import com.xhkjedu.slive.vo.xz.XzDateKjTeaVo;
-import com.xhkjedu.slive.vo.xz.XzDateVo;
+import com.xhkjedu.utils.DatesUtil;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
@@ -18,7 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -62,8 +60,8 @@ public class XzController {
     public ResultVo save(@RequestBody LXz xz){
         N_Utils.validation(new Object[]{xz.getXzname(),"名称",2,xz.getGradeid(),"年级",1,xz.getDaynum(),"课节数量",1,
         xz.getBegindate(),"开始日期",2,xz.getEnddate(),"结束日期",2,xz.getSchoolid(),"学校id",1});
-        if ("NaN-aN-aN".equals(xz.getBegindate()) || "NaN-aN-aN".equals(xz.getEnddate())) {
-            return new ResultVo(1,"日期格式不正确");
+        if (DatesUtil.dateNan(xz.getBegindate()) || DatesUtil.dateNan(xz.getEnddate())) {
+            return new ResultVo(1, "日期格式不正确");
         }
         return xzService.saveXz(xz);
     }

suser/src/main/java/com/xhkjedu/suser/service/gradeclass/ClassStudentService.java

@@ -16,6 +16,7 @@ import com.xhkjedu.suser.utils.UserUtil;
 import com.xhkjedu.suser.vo.gradeclass.ClassStudentVo;
 import com.xhkjedu.suser.vo.gradeclass.ClassVo;
 import com.xhkjedu.suser.vo.gradeclass.ImportStudentVo;
+import com.xhkjedu.utils.DatesUtil;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
@@ -395,7 +396,7 @@ public class ClassStudentService {
             }
         }
         user.setBindphoned(bindphoned);
-        if ("NaN-aN-aN".equals(user.getUsertime())) {//有效期异常值置空
+        if (DatesUtil.dateNan(user.getUsertime())) {//有效期异常值置空
             user.setUsertime(null);
         }
         user.setBindsecret(0);
@@ -483,7 +484,7 @@ public class ClassStudentService {
             bindphoned = 1;
         }
         user.setBindphoned(bindphoned);
-        if ("NaN-aN-aN".equals(user.getUsertime())) {//有效期异常值置空
+        if (DatesUtil.dateNan(user.getUsertime())) {//有效期异常值置空
             user.setUsertime(null);
         }
         user.setCreatetime(N_Utils.getSecondTimestamp());

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

@@ -417,7 +417,7 @@ public class UserService extends JedisUtil {
             }
         }
         user.setBindphoned(bindphoned);
-        if ("NaN-aN-aN".equals(user.getUsertime())) {//有效期异常值置空
+        if (DatesUtil.dateNan(user.getUsertime())) {//有效期异常值置空
             user.setUsertime(null);
         }
         user.setBindsecret(0);
@@ -459,7 +459,7 @@ public class UserService extends JedisUtil {
             bindphoned = 1;
         }
         user.setBindphoned(bindphoned);
-        if ("NaN-aN-aN".equals(user.getUsertime())) {//有效期异常值置空
+        if (DatesUtil.dateNan(user.getUsertime())) {//有效期异常值置空
             user.setUsertime(null);
         }
         user.setCreatetime(N_Utils.getSecondTimestamp());