推送测试代码

src/main/resources/application-prod.yml

@@ -5,16 +5,21 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://219.153.208.35:3306/smart_campus?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false
+#    url: jdbc:mysql://219.153.208.35:3306/smart_campus?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false
+    url: jdbc:mysql://219.153.208.37:53256/smart_campus?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false
     username: smart_campus
     password: W2Xk@8QFe3hYR7QZ?-yY
 
 
   redis:
-    database: 10
-    host: 219.153.208.35
+#    database: 10
+#    host: 219.153.208.35
+#    port: 6379
+#    password: huHJMucfC!tJ59Ri   # 密码（默认为空）
+    database: 6
+    host: 10.150.10.136
     port: 6379
-    password: huHJMucfC!tJ59Ri   # 密码（默认为空）
+    password: 9mwar,BNq}oMa63cUd?R   # 密码（默认为空）
     timeout: 6000ms  # 连接超时时长（毫秒）
     jedis:
       pool:

src/test/java/com/xjrsoft/module/student/service/impl/StudentReportRecordServiceImplTest.java

@@ -132,6 +132,7 @@ class StudentReportRecordServiceImplTest {
     }
 
     @Test
+    @Transactional(rollbackFor = Exception.class)
     void tryReadingSign() {
         LocalDateTime now = LocalDateTime.now();
         // 查出所有有分班存在的新生信息
@@ -204,15 +205,61 @@ class StudentReportRecordServiceImplTest {
             //根据身份证号查询这个学生是否存在
             User user = userService.getOne(
                     new MPJLambdaWrapper<User>()
-                            .disableLogicDel()
                             .select(User::getId)
                             .select(User.class, x -> VoToColumnUtil.fieldsToColumns(User.class).contains(x.getProperty()))
                             .eq(User::getCredentialNumber, student.getCredentialNumber())
+                            .eq(User::getEnabledMark, EnabledMark.ENABLED.getCode())
             );
             if(ObjectUtils.isNotEmpty(user)){
+                BaseStudentSchoolRoll isSchoolRoll = rollService.getOne(
+                        new MPJLambdaWrapper<BaseStudentSchoolRoll>()
+                                .disableLogicDel()
+                                .select(BaseStudentSchoolRoll::getId)
+                                .select(BaseStudentSchoolRoll.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentSchoolRoll.class).contains(x.getProperty()))
+                                .eq(BaseStudentSchoolRoll::getUserId, user.getId())
+                );
+                if(ObjectUtils.isEmpty(isSchoolRoll)){
+                    BaseStudentSchoolRoll schoolRoll = new BaseStudentSchoolRoll();
+                    schoolRoll.setUserId(user.getId());
+                    if(student.getScore() != null){
+                        schoolRoll.setGraduatedScore(student.getScore().doubleValue());
+                    }
+                    schoolRoll.setInternshipState("IT_0001");
+                    schoolRoll.setGraduatedUniversity(student.getGraduateSchool());
+                    schoolRoll.setClassId(baseClass.getId());
+                    schoolRoll.setMajorSetId(baseClass.getMajorSetId());
+                    schoolRoll.setStduyStatus(student.getStduyStatus());
+                    schoolRoll.setDeleteMark(DeleteMark.NODELETE.getCode());
+                    schoolRoll.setEnrollType(baseClass.getEnrollType());
+                    schoolRoll.setStudentType(student.getSource());
+                    schoolRoll.setGradeId(baseClass.getGradeId());
+                    schoolRoll.setArchivesStatus(ArchivesStatusEnum.FB2901.getCode());
+                    schoolRoll.setCreateDate(now);
+                    rollService.save(schoolRoll);
+                }
+
+                BaseStudent isBaseStudent = studentService.getOne(
+                        new QueryWrapper<BaseStudent>().lambda()
+                                .eq(BaseStudent::getUserId, user.getId())
+                );
+                if(ObjectUtils.isEmpty(isBaseStudent)){
+                    BaseStudent baseStudent = new BaseStudent() {{
+                        setUserId(user.getId());
+                        setCreateDate(now);
+                        setStudentId(student.getCredentialNumber());
+                        if(student.getHeight() != null){
+                            setHeight(student.getHeight().doubleValue());
+                        }
+                        if(student.getWeight() != null){
+                            setWeight(student.getWeight().doubleValue());
+                        }
+                        setIsNormal(1);
+                    }};
+                    studentService.save(baseStudent);
+                }
+
                 // 学生已存在，则修改班级信息
                 rollService.updateStudentClass(baseClass.getId(), user.getId());
-
                 // 激活学生
                 rollService.activateStudent(user.getId());
             }else{