从攀宝招生数据中同步新生数据

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

@@ -117,7 +117,13 @@ public class BaseNewStudentTask {
                 new QueryWrapper<BaseNewStudent>().lambda()
                         .eq(BaseNewStudent::getDeleteMark, DeleteMark.NODELETE.getCode())
         );
-        Map<String, BaseNewStudent> existsNewStudentMap = existsNewStudentList.stream().filter(x -> StrUtil.isEmpty(x.getDeleteReason())).collect(Collectors.toMap(BaseNewStudent::getCredentialNumber, x -> x));
+        Map<String, BaseNewStudent> existsNewStudentMap = existsNewStudentList.stream()
+                .filter(x -> StrUtil.isEmpty(x.getDeleteReason()))
+                .collect(Collectors.toMap(
+                        BaseNewStudent::getCredentialNumber,
+                        x -> x,
+                        (existing, replacement) -> existing
+                ));
 
         List<BaseMajorSet> majorSetList = majorSetService.list(
                 new QueryWrapper<BaseMajorSet>().lambda()
@@ -135,14 +141,14 @@ public class BaseNewStudentTask {
             BaseNewStudent existsNewStudent = existsNewStudentMap.get(feeobjupdate.getPersonalid());
             Long planId = planMap.get(feeobjupdate.getEnteryear() + feeobjupdate.getUserdef6());
             if (existsNewStudent != null) {
-                if(existsNewStudent.getStatus() != null && existsNewStudent.getStatus() == 1){
+                if (existsNewStudent.getStatus() != null && existsNewStudent.getStatus() == 1) {
                     continue;
                 }
                 existsNewStudent.setName(feeobjupdate.getFeeobjname());
                 existsNewStudent.setPaymnystate(feeobjupdate.getPaymnystate());
-                if("未交费".equals(feeobjupdate.getPaymnystate())){
+                if ("未交费".equals(feeobjupdate.getPaymnystate())) {
                     existsNewStudent.setIsCanBanding(0);
-                }else{
+                } else {
                     existsNewStudent.setIsCanBanding(1);
                 }
                 existsNewStudent.setPrevious(feeobjupdate.getPrevious());
@@ -172,14 +178,14 @@ public class BaseNewStudentTask {
                 existsNewStudent.setSecondAmbitionId(majorSetNameMap.get(feeobjupdate.getZytjspec()));
                 existsNewStudent.setGender(GenderDictionaryEnum.getCode(feeobjupdate.getSex()));
                 existsNewStudent.setModifyDate(new Date());
-                if(!planId.equals(existsNewStudent.getEnrollmentPlanId())){
+                if (!planId.equals(existsNewStudent.getEnrollmentPlanId())) {
                     existsNewStudent.setStatus(0);
                 }
                 existsNewStudent.setEnrollmentPlanId(planId);
                 updateList.add(existsNewStudent);
                 continue;
             }
-            if(insCredentialNumber.contains(feeobjupdate.getPersonalid())){
+            if (insCredentialNumber.contains(feeobjupdate.getPersonalid())) {
                 continue;
             }
             insertList.add(
@@ -216,9 +222,9 @@ public class BaseNewStudentTask {
                         setEnrollmentPlanId(planId);
                         setCreateDate(new Date());
                         setStatus(0);
-                        if("未交费".equals(feeobjupdate.getPaymnystate())){
+                        if ("未交费".equals(feeobjupdate.getPaymnystate())) {
                             setIsCanBanding(0);
-                        }else{
+                        } else {
                             setIsCanBanding(1);
                         }
                     }}

src/main/resources/application-dev.yml

@@ -5,12 +5,12 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.150.10.136:3308/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false&testWhileIdle=true
-    username: data_tl
-    password: qwe123QWE
-#    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
+#    url: jdbc:mysql://10.150.10.136:3308/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false&testWhileIdle=true
+#    username: data_tl
+#    password: qwe123QWE
+    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
     druid:
       # 验证连接的有效性
       test-while-idle: true
@@ -121,6 +121,7 @@ xjrsoft:
       - /student/basestudentinfo/studentinfoByKeyWord
       - /student/pbCseFeeobjupdate/enrollment-statistics-start
       - /student/basestudentinfo/studentinfoByKeyWordNotReading
+      - /student/baseNewStudent/basenewstudent-task-start
     approval-time: 300 # 审核超时时间 目前设为5分钟
   email:
     host:  #邮件服务器的SMTP地址，可选，默认为smtp.<发件人邮箱后缀>

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

@@ -81,8 +81,12 @@ class BaseNewStudentTaskTest {
 
     @Test
     public void execute(){
-        doExecute();
+        BaseNewStudentTask basenewstudenttask = new BaseNewStudentTask();
+        basenewstudenttask.doExecute(newStudentService, cseFeeobjupdateService, planService, gradeService, majorSetService);
     }
+
+
+
     void doExecute() {
         List<PbCseFeeobjupdate> dataList = cseFeeobjupdateService.list();