分班调整

src/main/java/com/xjrsoft/module/job/BaseNewStudentTask.java

@@ -20,6 +20,7 @@ import com.xjrsoft.module.student.service.IBaseNewStudentService;
 import com.xjrsoft.module.student.service.IEnrollmentPlanService;
 import com.xjrsoft.module.student.service.IPbCseFeeobjupdateService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -135,8 +136,16 @@ public class BaseNewStudentTask {
                 existsNewStudent.setProvince(feeobjupdate.getProvince());
                 existsNewStudent.setCity(feeobjupdate.getCity());
                 existsNewStudent.setMyarea(feeobjupdate.getMyarea());
-                existsNewStudent.setHeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getSg())));
-                existsNewStudent.setWeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getTz())));
+                if(StrUtil.isNotEmpty(feeobjupdate.getSg())){
+                    if(StringUtils.isNumeric(feeobjupdate.getSg())){
+                        existsNewStudent.setHeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getSg())));
+                    }
+                }
+                if(StrUtil.isNotEmpty(feeobjupdate.getTz())){
+                    if(StringUtils.isNumeric(feeobjupdate.getTz())){
+                        existsNewStudent.setWeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getTz())));
+                    }
+                }
                 existsNewStudent.setGraduateSchool(feeobjupdate.getGraduations());
                 existsNewStudent.setStduyStatus(StudyStatusEnum.getCode(feeobjupdate.getQuartername()));
                 existsNewStudent.setSource(StudentTypeEnum.getCode(feeobjupdate.getResourcename()));
@@ -164,8 +173,16 @@ public class BaseNewStudentTask {
                         setProvince(feeobjupdate.getProvince());
                         setCity(feeobjupdate.getCity());
                         setMyarea(feeobjupdate.getMyarea());
-                        setHeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getSg())));
-                        setWeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getTz())));
+                        if(StrUtil.isNotEmpty(feeobjupdate.getSg())){
+                            if(StringUtils.isNumeric(feeobjupdate.getSg())){
+                                setHeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getSg())));
+                            }
+                        }
+                        if(StrUtil.isNotEmpty(feeobjupdate.getTz())){
+                            if(StringUtils.isNumeric(feeobjupdate.getTz())){
+                                setWeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getTz())));
+                            }
+                        }
                         setGraduateSchool(feeobjupdate.getGraduations());
                         setStduyStatus(StudyStatusEnum.getCode(feeobjupdate.getQuartername()));
                         setSource(StudentTypeEnum.getCode(feeobjupdate.getResourcename()));

src/test/java/com/xjrsoft/module/job/BaseNewStudentTaskTest.java

@@ -20,6 +20,7 @@ import com.xjrsoft.module.student.entity.PbCseFeeobjupdate;
 import com.xjrsoft.module.student.service.IBaseNewStudentService;
 import com.xjrsoft.module.student.service.IEnrollmentPlanService;
 import com.xjrsoft.module.student.service.IPbCseFeeobjupdateService;
+import org.apache.commons.lang.StringUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -139,8 +140,16 @@ class BaseNewStudentTaskTest {
                 existsNewStudent.setProvince(feeobjupdate.getProvince());
                 existsNewStudent.setCity(feeobjupdate.getCity());
                 existsNewStudent.setMyarea(feeobjupdate.getMyarea());
-                existsNewStudent.setHeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getSg())));
-                existsNewStudent.setWeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getTz())));
+                if(StrUtil.isNotEmpty(feeobjupdate.getSg())){
+                    if(StringUtils.isNumeric(feeobjupdate.getSg())){
+                        existsNewStudent.setHeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getSg())));
+                    }
+                }
+                if(StrUtil.isNotEmpty(feeobjupdate.getTz())){
+                    if(StringUtils.isNumeric(feeobjupdate.getTz())){
+                        existsNewStudent.setWeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getTz())));
+                    }
+                }
                 existsNewStudent.setGraduateSchool(feeobjupdate.getGraduations());
                 existsNewStudent.setStduyStatus(StudyStatusEnum.getCode(feeobjupdate.getQuartername()));
                 existsNewStudent.setSource(StudentTypeEnum.getCode(feeobjupdate.getResourcename()));
@@ -169,10 +178,14 @@ class BaseNewStudentTaskTest {
                         setCity(feeobjupdate.getCity());
                         setMyarea(feeobjupdate.getMyarea());
                         if(StrUtil.isNotEmpty(feeobjupdate.getSg())){
-                            setHeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getSg())));
+                            if(StringUtils.isNumeric(feeobjupdate.getSg())){
+                                setHeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getSg())));
+                            }
                         }
                         if(StrUtil.isNotEmpty(feeobjupdate.getTz())){
-                            setWeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getTz())));
+                            if(StringUtils.isNumeric(feeobjupdate.getTz())){
+                                setWeight(BigDecimal.valueOf(Double.parseDouble(feeobjupdate.getTz())));
+                            }
                         }
 
                         setGraduateSchool(feeobjupdate.getGraduations());

src/test/java/com/xjrsoft/xjrsoftboot/IdCreateTest.java

@@ -1,8 +1,11 @@
 package com.xjrsoft.xjrsoftboot;
 
 import cn.hutool.core.util.IdUtil;
+import org.apache.commons.lang.StringUtils;
 import org.junit.jupiter.api.Test;
 
+import java.math.BigDecimal;
+
 /**
  * @author dzx
  * @date 2024/3/12
@@ -10,6 +13,10 @@ import org.junit.jupiter.api.Test;
 public class IdCreateTest {
     @Test
     void test(){
-        System.out.println(IdUtil.getSnowflakeNextId());
+        String sg = "1米7";
+        System.out.println(StringUtils.isNumeric(sg));
+
+        String sg2 = "170";
+        System.out.println(StringUtils.isNumeric(sg2));
     }
 }