夏文涛 2 anos atrás
pai
commit
940fddb2db

+ 73 - 73
src/main/java/com/template/controller/SmartUserController.java

@@ -662,7 +662,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     String endTime = queryGraduationYear(gradeData.getGradeNo());
                     String endTime = queryGraduationYear(gradeData.getGradeNo());
                     CommonResult<String> insertBsStudent = bsInsertStudent(student.getName(), student.getCardNo(), student.getSexId(), student.getHeadImage(), student.getTimeGroupId(), classData.getBsClassNo(), startTime, endTime, student.getIdCard());
                     CommonResult<String> insertBsStudent = bsInsertStudent(student.getName(), student.getCardNo(), student.getSexId(), student.getHeadImage(), student.getTimeGroupId(), classData.getBsClassNo(), startTime, endTime, student.getIdCard());
                     if (!insertBsStudent.isSuccess()) {
                     if (!insertBsStudent.isSuccess()) {
-                        return CommonResult.fail(insertBsStudent.getMessage());
+                        return CommonResult.fail("百胜平台:" + insertBsStudent.getMessage());
                     }
                     }
                     student.setBsStudentNo(insertBsStudent.getData());
                     student.setBsStudentNo(insertBsStudent.getData());
                 }
                 }
@@ -679,7 +679,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     String classUid = entry.getKey();
                     String classUid = entry.getKey();
                     CommonResult<List<StudentServiceBatchSaveClassStudentsResult.StudentInfoDto>> insertStudents = SeewoInsertBatchStudent(seewoClient, entry.getValue(), classUid);
                     CommonResult<List<StudentServiceBatchSaveClassStudentsResult.StudentInfoDto>> insertStudents = SeewoInsertBatchStudent(seewoClient, entry.getValue(), classUid);
                     if (!insertStudents.isSuccess()) {
                     if (!insertStudents.isSuccess()) {
-                        return CommonResult.fail(insertStudents.getMessage());
+                        return CommonResult.fail("希沃平台:" + insertStudents.getMessage());
                     }
                     }
                     seewoResultDatas.addAll(insertStudents.getData());
                     seewoResultDatas.addAll(insertStudents.getData());
                 }
                 }
@@ -776,7 +776,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         }
                         }
 
 
                         if (!parentResult.getResponseBody().getCode().equals("000000")) {
                         if (!parentResult.getResponseBody().getCode().equals("000000")) {
-                            return CommonResult.fail(parentResult.getResponseBody().getMessage());
+                            return CommonResult.fail("希沃平台:" + parentResult.getResponseBody().getMessage());
                         }
                         }
                     }
                     }
 
 
@@ -908,7 +908,7 @@ public class SmartUserController implements SmartUserControllerAPI {
 
 
                     CommonResult<List<TeacherServiceBatchSaveOrUpdateTeacherResult.TeacherBaseInfoDto>> insertTeacher = SeewoInsertBatchTeacher(seewoClient, teachers);
                     CommonResult<List<TeacherServiceBatchSaveOrUpdateTeacherResult.TeacherBaseInfoDto>> insertTeacher = SeewoInsertBatchTeacher(seewoClient, teachers);
                     if (!insertTeacher.isSuccess()) {
                     if (!insertTeacher.isSuccess()) {
-                        return CommonResult.fail(insertTeacher.getMessage());
+                        return CommonResult.fail("希沃平台:" + insertTeacher.getMessage());
                     }
                     }
 
 
                     CommonResult insertPhotoResult = SeewoInsertBatchPhoto(seewoClient, photoList, eSeewoUserType.Teacher.getValue());
                     CommonResult insertPhotoResult = SeewoInsertBatchPhoto(seewoClient, photoList, eSeewoUserType.Teacher.getValue());
@@ -926,7 +926,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                                 if (useXw == 1) {
                                 if (useXw == 1) {
                                     CommonResult pushMaster = SeewoPushMaster(seewoClient, teacher.getPhone(), oClass.get().getClassUid());
                                     CommonResult pushMaster = SeewoPushMaster(seewoClient, teacher.getPhone(), oClass.get().getClassUid());
                                     if (!pushMaster.isSuccess()) {
                                     if (!pushMaster.isSuccess()) {
-                                        return CommonResult.fail(pushMaster.getMessage());
+                                        return CommonResult.fail("希沃平台:" + pushMaster.getMessage());
                                     }
                                     }
                                 }
                                 }
                                 //endregion
                                 //endregion
@@ -955,13 +955,13 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (ObjectUtils.isEmpty(teacher.getBsStaffCode())) {
                     if (ObjectUtils.isEmpty(teacher.getBsStaffCode())) {
                         CommonResult<String> insertBsTeacher = bsInsertTeacher(teacher, oDepartment.get().getBsDepartmentNo(), startTime, endTime);
                         CommonResult<String> insertBsTeacher = bsInsertTeacher(teacher, oDepartment.get().getBsDepartmentNo(), startTime, endTime);
                         if (!insertBsTeacher.isSuccess()) {
                         if (!insertBsTeacher.isSuccess()) {
-                            return CommonResult.fail(insertBsTeacher.getMessage());
+                            return CommonResult.fail("百胜平台:" + insertBsTeacher.getMessage());
                         }
                         }
                         teacher.setBsStaffCode(insertBsTeacher.getData());
                         teacher.setBsStaffCode(insertBsTeacher.getData());
                     } else {
                     } else {
                         CommonResult<String> bsUpdateTeacher = updateBsTeacher(teacher, oDepartment.get().getBsDepartmentNo(), startTime, endTime);
                         CommonResult<String> bsUpdateTeacher = updateBsTeacher(teacher, oDepartment.get().getBsDepartmentNo(), startTime, endTime);
                         if (!bsUpdateTeacher.isSuccess()) {
                         if (!bsUpdateTeacher.isSuccess()) {
-                            return CommonResult.fail(bsUpdateTeacher.getMessage());
+                            return CommonResult.fail("百胜平台:" + bsUpdateTeacher.getMessage());
                         }
                         }
                         teacher.setBsStaffCode(bsUpdateTeacher.getData());
                         teacher.setBsStaffCode(bsUpdateTeacher.getData());
                     }
                     }
@@ -1960,7 +1960,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                             SeewoClient seewoClient = new DefaultSeewoClient(new Account(seewoConfig.getAppId(), seewoConfig.getAppSecret()));
                             SeewoClient seewoClient = new DefaultSeewoClient(new Account(seewoConfig.getAppId(), seewoConfig.getAppSecret()));
                             CommonResult updateSwStudent = SeewoUpdateStudent(seewoClient, oldStudent.get());
                             CommonResult updateSwStudent = SeewoUpdateStudent(seewoClient, oldStudent.get());
                             if (!updateSwStudent.isSuccess()) {
                             if (!updateSwStudent.isSuccess()) {
-                                return CommonResult.fail(updateSwStudent.getMessage());
+                                return CommonResult.fail("希沃平台:" + updateSwStudent.getMessage());
                             }
                             }
                         }
                         }
 
 
@@ -1972,7 +1972,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                             String endTime = queryGraduationYear(oGrade.get().getGradeNo());
                             String endTime = queryGraduationYear(oGrade.get().getGradeNo());
                             CommonResult<String> updateBsStudent = bsEUpdateStudent(oldStudent.get(), oClass.get().getBsClassNo(), startTime, endTime);
                             CommonResult<String> updateBsStudent = bsEUpdateStudent(oldStudent.get(), oClass.get().getBsClassNo(), startTime, endTime);
                             if (!updateBsStudent.isSuccess()) {
                             if (!updateBsStudent.isSuccess()) {
-                                return CommonResult.fail(updateBsStudent.getMessage());
+                                return CommonResult.fail("百胜平台:" + updateBsStudent.getMessage());
                             }
                             }
                         }
                         }
 
 
@@ -2419,7 +2419,7 @@ public class SmartUserController implements SmartUserControllerAPI {
             if (useXw == 1) {
             if (useXw == 1) {
                 CommonResult insertOrUpdateStudent = insertOrUpdateStudentParent(seewoClient, studentDatas, isur.getName(), isur.getPhone(), true);
                 CommonResult insertOrUpdateStudent = insertOrUpdateStudentParent(seewoClient, studentDatas, isur.getName(), isur.getPhone(), true);
                 if (!insertOrUpdateStudent.isSuccess()) {
                 if (!insertOrUpdateStudent.isSuccess()) {
-                    return CommonResult.fail(insertOrUpdateStudent.getMessage());
+                    return CommonResult.fail("希沃平台:" + insertOrUpdateStudent.getMessage());
                 }
                 }
             }
             }
             //endregion
             //endregion
@@ -2451,7 +2451,7 @@ public class SmartUserController implements SmartUserControllerAPI {
             if (useXw == 1) {
             if (useXw == 1) {
                 CommonResult<String> insertStudent = SeewoInsertStudent(seewoClient, isur.getName(), isur.getCardNo(), isur.getSexId(), isur.getPhone(), classData.getClassUid());
                 CommonResult<String> insertStudent = SeewoInsertStudent(seewoClient, isur.getName(), isur.getCardNo(), isur.getSexId(), isur.getPhone(), classData.getClassUid());
                 if (!insertStudent.isSuccess()) {
                 if (!insertStudent.isSuccess()) {
-                    return CommonResult.fail(insertStudent.getMessage());
+                    return CommonResult.fail("希沃平台:" + insertStudent.getMessage());
                 }
                 }
 
 
                 su.setXwStudentUid(insertStudent.getData());
                 su.setXwStudentUid(insertStudent.getData());
@@ -2478,7 +2478,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 String endTime = queryGraduationYear(gradeData.getGradeNo());
                 String endTime = queryGraduationYear(gradeData.getGradeNo());
                 CommonResult<String> insertBsStudent = bsInsertStudent(isur.getName(), isur.getCardNo(), isur.getSexId(), isur.getHeadImage(), isur.getTimeGroupId(), classData.getBsClassNo(), startTime, endTime, isur.getIdCard());
                 CommonResult<String> insertBsStudent = bsInsertStudent(isur.getName(), isur.getCardNo(), isur.getSexId(), isur.getHeadImage(), isur.getTimeGroupId(), classData.getBsClassNo(), startTime, endTime, isur.getIdCard());
                 if (!insertBsStudent.isSuccess()) {
                 if (!insertBsStudent.isSuccess()) {
-                    return CommonResult.fail(insertBsStudent.getMessage());
+                    return CommonResult.fail("百胜平台:" + insertBsStudent.getMessage());
                 }
                 }
                 su.setBsStudentNo(insertBsStudent.getData());
                 su.setBsStudentNo(insertBsStudent.getData());
             }
             }
@@ -2500,7 +2500,7 @@ public class SmartUserController implements SmartUserControllerAPI {
             if (useXw == 1) {
             if (useXw == 1) {
                 CommonResult<String> insertTeacher = SeewoInsertTeacher(seewoClient, isur.getPhone(), isur.getName(), isur.getHeadImage());
                 CommonResult<String> insertTeacher = SeewoInsertTeacher(seewoClient, isur.getPhone(), isur.getName(), isur.getHeadImage());
                 if (!insertTeacher.isSuccess()) {
                 if (!insertTeacher.isSuccess()) {
-                    return CommonResult.fail(insertTeacher.getMessage());
+                    return CommonResult.fail("希沃平台:" + insertTeacher.getMessage());
                 }
                 }
                 su.setXwTeacherCode(insertTeacher.getData());
                 su.setXwTeacherCode(insertTeacher.getData());
 
 
@@ -2528,7 +2528,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 if (useXw == 1) {
                 if (useXw == 1) {
                     CommonResult pushMaster = SeewoPushMaster(seewoClient, isur.getPhone(), classData.getClassUid());
                     CommonResult pushMaster = SeewoPushMaster(seewoClient, isur.getPhone(), classData.getClassUid());
                     if (!pushMaster.isSuccess()) {
                     if (!pushMaster.isSuccess()) {
-                        return CommonResult.fail(pushMaster.getMessage());
+                        return CommonResult.fail("希沃平台:" + pushMaster.getMessage());
                     }
                     }
                 }
                 }
                 //endregion
                 //endregion
@@ -2552,7 +2552,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 String endTime = TimeExchange.addYear(20);
                 String endTime = TimeExchange.addYear(20);
                 CommonResult<String> insertBsTeacher = bsInsertTeacher(su, departmentNo, startTime, endTime);
                 CommonResult<String> insertBsTeacher = bsInsertTeacher(su, departmentNo, startTime, endTime);
                 if (!insertBsTeacher.isSuccess()) {
                 if (!insertBsTeacher.isSuccess()) {
-                    return CommonResult.fail(insertBsTeacher.getMessage());
+                    return CommonResult.fail("百胜平台:" + insertBsTeacher.getMessage());
                 }
                 }
                 su.setBsStaffCode(insertBsTeacher.getData());
                 su.setBsStaffCode(insertBsTeacher.getData());
             }
             }
@@ -2699,7 +2699,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     //学生与家长列表,最大100条
                     //学生与家长列表,最大100条
                     CommonResult insertOrUpdateResult = insertOrUpdateStudentParent(seewoClient, studentDatas, usur.getName(), usur.getPhone(), false);
                     CommonResult insertOrUpdateResult = insertOrUpdateStudentParent(seewoClient, studentDatas, usur.getName(), usur.getPhone(), false);
                     if (!insertOrUpdateResult.isSuccess()) {
                     if (!insertOrUpdateResult.isSuccess()) {
-                        return CommonResult.fail(insertOrUpdateResult.getMessage());
+                        return CommonResult.fail("希沃平台:" + insertOrUpdateResult.getMessage());
                     }
                     }
                 }
                 }
                 //endregion
                 //endregion
@@ -2715,7 +2715,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (useXw == 1) {
                     if (useXw == 1) {
                         CommonResult deleteStudent = SeewoDeleteStudent(seewoClient, classData.getClassUid(), oldCardNo);
                         CommonResult deleteStudent = SeewoDeleteStudent(seewoClient, classData.getClassUid(), oldCardNo);
                         if (!deleteStudent.isSuccess()) {
                         if (!deleteStudent.isSuccess()) {
-                            return CommonResult.fail(deleteStudent.getMessage());
+                            return CommonResult.fail("希沃平台:" + deleteStudent.getMessage());
                         }
                         }
                     }
                     }
                     //endregion
                     //endregion
@@ -2724,7 +2724,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (useBs == 1) {
                     if (useBs == 1) {
                         CommonResult deleteBsStudent = bsDeleteStudent(su);
                         CommonResult deleteBsStudent = bsDeleteStudent(su);
                         if (!deleteBsStudent.isSuccess()) {
                         if (!deleteBsStudent.isSuccess()) {
-                            return CommonResult.fail(deleteBsStudent.getMessage());
+                            return CommonResult.fail("百胜平台:" + deleteBsStudent.getMessage());
                         }
                         }
                     }
                     }
                     //endregion
                     //endregion
@@ -2740,7 +2740,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (useXw == 1) {
                     if (useXw == 1) {
                         CommonResult deleteTeacher = SeewoDeleteTeacher(seewoClient, su.getPhone());
                         CommonResult deleteTeacher = SeewoDeleteTeacher(seewoClient, su.getPhone());
                         if (!deleteTeacher.isSuccess()) {
                         if (!deleteTeacher.isSuccess()) {
-                            return CommonResult.fail(deleteTeacher.getMessage());
+                            return CommonResult.fail("希沃平台:" + deleteTeacher.getMessage());
                         }
                         }
                     }
                     }
                     //endregion
                     //endregion
@@ -2749,7 +2749,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (useXw == 1) {
                     if (useXw == 1) {
                         CommonResult deleteTeacherMaster = SeewoDeleteTeacherMaster(seewoClient, classData.getClassUid(), su.getPhone());
                         CommonResult deleteTeacherMaster = SeewoDeleteTeacherMaster(seewoClient, classData.getClassUid(), su.getPhone());
                         if (deleteTeacherMaster.isSuccess()) {
                         if (deleteTeacherMaster.isSuccess()) {
-                            return CommonResult.fail(deleteTeacherMaster.getMessage());
+                            return CommonResult.fail("希沃平台:" + deleteTeacherMaster.getMessage());
                         }
                         }
                     }
                     }
                     //endregion
                     //endregion
@@ -2758,7 +2758,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (useBs == 1) {
                     if (useBs == 1) {
                         CommonResult bsDeleteTeacher = bsDeleteTeacher(oldStaffNo);
                         CommonResult bsDeleteTeacher = bsDeleteTeacher(oldStaffNo);
                         if (!bsDeleteTeacher.isSuccess()) {
                         if (!bsDeleteTeacher.isSuccess()) {
-                            return CommonResult.fail(bsDeleteTeacher.getMessage());
+                            return CommonResult.fail("百胜平台:" + bsDeleteTeacher.getMessage());
                         }
                         }
                     }
                     }
                     //endregion
                     //endregion
@@ -2773,7 +2773,7 @@ public class SmartUserController implements SmartUserControllerAPI {
 
 
                     CommonResult insertOrUpdate = insertOrUpdateStudentParent(seewoClient, studentDatas, su.getName(), su.getPhone(), true);
                     CommonResult insertOrUpdate = insertOrUpdateStudentParent(seewoClient, studentDatas, su.getName(), su.getPhone(), true);
                     if (!insertOrUpdate.isSuccess()) {
                     if (!insertOrUpdate.isSuccess()) {
-                        return CommonResult.fail(insertOrUpdate.getMessage());
+                        return CommonResult.fail("希沃平台:" + insertOrUpdate.getMessage());
                     }
                     }
                 }
                 }
                 //endregion
                 //endregion
@@ -2807,7 +2807,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         if (updateStudent.getMessage().equals("学生不存在")) {
                         if (updateStudent.getMessage().equals("学生不存在")) {
                             CommonResult<String> insertStudent = SeewoInsertStudent(seewoClient, su.getName(), su.getCardNo(), su.getSexId(), su.getPhone(), classData.getClassUid());
                             CommonResult<String> insertStudent = SeewoInsertStudent(seewoClient, su.getName(), su.getCardNo(), su.getSexId(), su.getPhone(), classData.getClassUid());
                             if (!insertStudent.isSuccess()) {
                             if (!insertStudent.isSuccess()) {
-                                return CommonResult.fail(insertStudent.getMessage());
+                                return CommonResult.fail("希沃平台:" + insertStudent.getMessage());
                             }
                             }
                         }
                         }
                     }
                     }
@@ -2838,12 +2838,12 @@ public class SmartUserController implements SmartUserControllerAPI {
                             //region 百胜新增学生信息
                             //region 百胜新增学生信息
                             CommonResult<String> insertBsStudent = bsInsertStudent(usur.getName(), usur.getCardNo(), usur.getSexId(), usur.getHeadImage(), usur.getTimeGroupId(), classData.getBsClassNo(), startTime, endTime, usur.getIdCard());
                             CommonResult<String> insertBsStudent = bsInsertStudent(usur.getName(), usur.getCardNo(), usur.getSexId(), usur.getHeadImage(), usur.getTimeGroupId(), classData.getBsClassNo(), startTime, endTime, usur.getIdCard());
                             if (!insertBsStudent.isSuccess()) {
                             if (!insertBsStudent.isSuccess()) {
-                                return CommonResult.fail(insertBsStudent.getMessage());
+                                return CommonResult.fail("百胜平台:" + insertBsStudent.getMessage());
                             }
                             }
                             su.setBsStudentNo(insertBsStudent.getData());
                             su.setBsStudentNo(insertBsStudent.getData());
                             //endregion
                             //endregion
                         } else {
                         } else {
-                            return CommonResult.fail(updateBsStudent.getMessage());
+                            return CommonResult.fail("百胜平台:" + updateBsStudent.getMessage());
                         }
                         }
                     }
                     }
                 }
                 }
@@ -2857,7 +2857,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (useXw == 1) {
                     if (useXw == 1) {
                         CommonResult deleteResult = deleteOldParentShip(seewoClient, studentDatas, su.getPhone());
                         CommonResult deleteResult = deleteOldParentShip(seewoClient, studentDatas, su.getPhone());
                         if (!deleteResult.isSuccess()) {
                         if (!deleteResult.isSuccess()) {
-                            return CommonResult.fail(deleteResult.getMessage());
+                            return CommonResult.fail("希沃平台:" + deleteResult.getMessage());
                         }
                         }
 
 
                         smartFamilyIndexService.deleteSmartFamilyByPhone(su.getPhone());
                         smartFamilyIndexService.deleteSmartFamilyByPhone(su.getPhone());
@@ -2874,7 +2874,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (useXw == 1) {
                     if (useXw == 1) {
                         CommonResult deleteTeacher = SeewoDeleteTeacher(seewoClient, su.getPhone());
                         CommonResult deleteTeacher = SeewoDeleteTeacher(seewoClient, su.getPhone());
                         if (!deleteTeacher.isSuccess()) {
                         if (!deleteTeacher.isSuccess()) {
-                            return CommonResult.fail(deleteTeacher.getMessage());
+                            return CommonResult.fail("希沃平台:" + deleteTeacher.getMessage());
                         }
                         }
                     }
                     }
                     //endregion
                     //endregion
@@ -2883,7 +2883,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (useXw == 1) {
                     if (useXw == 1) {
                         CommonResult deleteMaster = SeewoDeleteTeacherMaster(seewoClient, oldClassData.getClassUid(), su.getPhone());
                         CommonResult deleteMaster = SeewoDeleteTeacherMaster(seewoClient, oldClassData.getClassUid(), su.getPhone());
                         if (!deleteMaster.isSuccess()) {
                         if (!deleteMaster.isSuccess()) {
-                            return CommonResult.fail(deleteMaster.getMessage());
+                            return CommonResult.fail("希沃平台:" + deleteMaster.getMessage());
                         }
                         }
                     }
                     }
                     //endregion
                     //endregion
@@ -2892,7 +2892,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (useBs == 1) {
                     if (useBs == 1) {
                         CommonResult deleteBsTeacher = bsDeleteTeacher(oldStaffNo);
                         CommonResult deleteBsTeacher = bsDeleteTeacher(oldStaffNo);
                         if (!deleteBsTeacher.isSuccess()) {
                         if (!deleteBsTeacher.isSuccess()) {
-                            return CommonResult.fail(deleteBsTeacher.getMessage());
+                            return CommonResult.fail("百胜平台:" + deleteBsTeacher.getMessage());
                         }
                         }
                     }
                     }
                     //endregion
                     //endregion
@@ -2902,7 +2902,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 if (useXw == 1) {
                 if (useXw == 1) {
                     CommonResult<String> insertStudent = SeewoInsertStudent(seewoClient, su.getName(), su.getCardNo(), su.getSexId(), su.getPhone(), classData.getClassUid());
                     CommonResult<String> insertStudent = SeewoInsertStudent(seewoClient, su.getName(), su.getCardNo(), su.getSexId(), su.getPhone(), classData.getClassUid());
                     if (!insertStudent.isSuccess()) {
                     if (!insertStudent.isSuccess()) {
-                        return CommonResult.fail(insertStudent.getMessage());
+                        return CommonResult.fail("希沃平台:" + insertStudent.getMessage());
                     } else {
                     } else {
                         su.setXwStudentUid(insertStudent.getData());
                         su.setXwStudentUid(insertStudent.getData());
                     }
                     }
@@ -2936,7 +2936,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         //百胜数据插入失败后需要把已插入到希沃的数据删除
                         //百胜数据插入失败后需要把已插入到希沃的数据删除
                         CommonResult deleteStudent = SeewoDeleteStudent(seewoClient, classData.getClassUid(), oldCardNo);
                         CommonResult deleteStudent = SeewoDeleteStudent(seewoClient, classData.getClassUid(), oldCardNo);
                         if (!deleteStudent.isSuccess()) {
                         if (!deleteStudent.isSuccess()) {
-                            return CommonResult.fail(deleteStudent.getMessage());
+                            return CommonResult.fail("百胜平台:" + deleteStudent.getMessage());
                         }
                         }
                         //endregion
                         //endregion
 
 
@@ -2953,7 +2953,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 if (useXw == 1) {
                 if (useXw == 1) {
                     CommonResult<String> updateTeacher = SeewoUpdateTeacher(seewoClient, su.getPhone(), su.getName(), su.getHeadImage());
                     CommonResult<String> updateTeacher = SeewoUpdateTeacher(seewoClient, su.getPhone(), su.getName(), su.getHeadImage());
                     if (!updateTeacher.isSuccess()) {
                     if (!updateTeacher.isSuccess()) {
-                        return CommonResult.fail(updateTeacher.getMessage());
+                        return CommonResult.fail("希沃平台:" + updateTeacher.getMessage());
                     }
                     }
                     su.setXwTeacherCode(updateTeacher.getData());
                     su.setXwTeacherCode(updateTeacher.getData());
 
 
@@ -2979,7 +2979,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (useXw == 1) {
                     if (useXw == 1) {
                         CommonResult pushMaster = SeewoPushMaster(seewoClient, su.getPhone(), classData.getClassUid());
                         CommonResult pushMaster = SeewoPushMaster(seewoClient, su.getPhone(), classData.getClassUid());
                         if (!pushMaster.isSuccess()) {
                         if (!pushMaster.isSuccess()) {
-                            return CommonResult.fail(pushMaster.getMessage());
+                            return CommonResult.fail("希沃平台:" + pushMaster.getMessage());
                         }
                         }
                     }
                     }
                     //endregion
                     //endregion
@@ -3005,7 +3005,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     String endTime = TimeExchange.addYear(20);
                     String endTime = TimeExchange.addYear(20);
                     CommonResult<String> bsUpdateTeacher = updateBsTeacher(su, departmentNo, startTime, endTime);
                     CommonResult<String> bsUpdateTeacher = updateBsTeacher(su, departmentNo, startTime, endTime);
                     if (!bsUpdateTeacher.isSuccess()) {
                     if (!bsUpdateTeacher.isSuccess()) {
-                        return CommonResult.fail(bsUpdateTeacher.getMessage());
+                        return CommonResult.fail("百胜平台:" + bsUpdateTeacher.getMessage());
                     }
                     }
 
 
                     su.setBsStaffCode(bsUpdateTeacher.getData());
                     su.setBsStaffCode(bsUpdateTeacher.getData());
@@ -3021,7 +3021,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (useXw == 1) {
                     if (useXw == 1) {
                         CommonResult deleteOldShip = deleteOldParentShip(seewoClient, studentDatas, su.getPhone());
                         CommonResult deleteOldShip = deleteOldParentShip(seewoClient, studentDatas, su.getPhone());
                         if (!deleteOldShip.isSuccess()) {
                         if (!deleteOldShip.isSuccess()) {
-                            return CommonResult.fail(deleteOldShip.getMessage());
+                            return CommonResult.fail("希沃平台:" + deleteOldShip.getMessage());
                         }
                         }
 
 
                         smartFamilyIndexService.deleteSmartFamilyByPhone(su.getPhone());
                         smartFamilyIndexService.deleteSmartFamilyByPhone(su.getPhone());
@@ -3038,7 +3038,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (useXw == 1) {
                     if (useXw == 1) {
                         CommonResult deleteStudent = SeewoDeleteStudent(seewoClient, classData.getClassUid(), oldCardNo);
                         CommonResult deleteStudent = SeewoDeleteStudent(seewoClient, classData.getClassUid(), oldCardNo);
                         if (!deleteStudent.isSuccess()) {
                         if (!deleteStudent.isSuccess()) {
-                            return CommonResult.fail(deleteStudent.getMessage());
+                            return CommonResult.fail("希沃平台:" + deleteStudent.getMessage());
                         }
                         }
                     }
                     }
                     //endregion
                     //endregion
@@ -3047,7 +3047,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (useBs == 1) {
                     if (useBs == 1) {
                         CommonResult deleteBsStudent = bsDeleteStudent(su);
                         CommonResult deleteBsStudent = bsDeleteStudent(su);
                         if (!deleteBsStudent.isSuccess()) {
                         if (!deleteBsStudent.isSuccess()) {
-                            return CommonResult.fail(deleteBsStudent.getMessage());
+                            return CommonResult.fail("百胜平台:" + deleteBsStudent.getMessage());
                         }
                         }
                     }
                     }
                     //endregion
                     //endregion
@@ -3057,7 +3057,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 if (useXw == 1) {
                 if (useXw == 1) {
                     CommonResult<String> insertTeacher = SeewoInsertTeacher(seewoClient, su.getPhone(), su.getName(), su.getHeadImage());
                     CommonResult<String> insertTeacher = SeewoInsertTeacher(seewoClient, su.getPhone(), su.getName(), su.getHeadImage());
                     if (!insertTeacher.isSuccess()) {
                     if (!insertTeacher.isSuccess()) {
-                        return CommonResult.fail(insertTeacher.getMessage());
+                        return CommonResult.fail("希沃平台:" + insertTeacher.getMessage());
                     }
                     }
                     su.setXwTeacherCode(insertTeacher.getData());
                     su.setXwTeacherCode(insertTeacher.getData());
                     //上传图片
                     //上传图片
@@ -3084,7 +3084,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     if (useXw == 1) {
                     if (useXw == 1) {
                         CommonResult pushMaster = SeewoPushMaster(seewoClient, su.getPhone(), classData.getClassUid());
                         CommonResult pushMaster = SeewoPushMaster(seewoClient, su.getPhone(), classData.getClassUid());
                         if (!pushMaster.isSuccess()) {
                         if (!pushMaster.isSuccess()) {
-                            return CommonResult.fail(pushMaster.getMessage());
+                            return CommonResult.fail("希沃平台:" + pushMaster.getMessage());
                         }
                         }
                     }
                     }
                     //endregion
                     //endregion
@@ -3108,7 +3108,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     String endTime = TimeExchange.addYear(20);
                     String endTime = TimeExchange.addYear(20);
                     CommonResult<String> insertBsTeacher = bsInsertTeacher(su, departmentNo, startTime, endTime);
                     CommonResult<String> insertBsTeacher = bsInsertTeacher(su, departmentNo, startTime, endTime);
                     if (!insertBsTeacher.isSuccess()) {
                     if (!insertBsTeacher.isSuccess()) {
-                        return CommonResult.fail(insertBsTeacher.getMessage());
+                        return CommonResult.fail("百胜平台:" + insertBsTeacher.getMessage());
                     }
                     }
                     su.setBsStaffCode(insertBsTeacher.getData());
                     su.setBsStaffCode(insertBsTeacher.getData());
                 }
                 }
@@ -3192,7 +3192,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         ObjectMapper objectMapper = new ObjectMapper();
         ObjectMapper objectMapper = new ObjectMapper();
         XwBodyVo xwResult = objectMapper.readValue(result.getBody(), XwBodyVo.class);
         XwBodyVo xwResult = objectMapper.readValue(result.getBody(), XwBodyVo.class);
         if (!xwResult.getCode().equals("000000")) {
         if (!xwResult.getCode().equals("000000")) {
-            return CommonResult.fail(result.getMessage());
+            return CommonResult.fail("希沃平台:" + result.getMessage());
         }
         }
 
 
         //endregion
         //endregion
@@ -3236,7 +3236,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         }
         }
 
 
         if (!result.getResponseBody().getCode().equals("000000")) {
         if (!result.getResponseBody().getCode().equals("000000")) {
-            return CommonResult.fail(result.getResponseBody().getMessage());
+            return CommonResult.fail("希沃平台:" + result.getResponseBody().getMessage());
         }
         }
 
 
         return CommonResult.ok("200", "添加成功", result.getResponseBody().getData());
         return CommonResult.ok("200", "添加成功", result.getResponseBody().getData());
@@ -3285,7 +3285,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         }
         }
 
 
         if (!result.getResponseBody().getCode().equals("000000")) {
         if (!result.getResponseBody().getCode().equals("000000")) {
-            return CommonResult.fail(result.getResponseBody().getMessage());
+            return CommonResult.fail("希沃平台:" + result.getResponseBody().getMessage());
         }
         }
 
 
         return CommonResult.ok("200", "添加成功", result.getResponseBody().getData().get(0).getUserUid());
         return CommonResult.ok("200", "添加成功", result.getResponseBody().getData().get(0).getUserUid());
@@ -3326,7 +3326,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         }
         }
 
 
         if (!result.getResponseBody().getCode().equals("000000")) {
         if (!result.getResponseBody().getCode().equals("000000")) {
-            return CommonResult.fail(result.getResponseBody().getMessage());
+            return CommonResult.fail("希沃平台:" + result.getResponseBody().getMessage());
         }
         }
 
 
         return CommonResult.ok("更新成功");
         return CommonResult.ok("更新成功");
@@ -3365,7 +3365,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         }
         }
 
 
         if (!deleteResult.getResponseBody().getCode().equals("000000")) {
         if (!deleteResult.getResponseBody().getCode().equals("000000")) {
-            return CommonResult.fail(deleteResult.getResponseBody().getMessage());
+            return CommonResult.fail("希沃平台:" + deleteResult.getResponseBody().getMessage());
         }
         }
 
 
         return CommonResult.ok("删除成功");
         return CommonResult.ok("删除成功");
@@ -3414,7 +3414,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         }
         }
 
 
         if (!result.getResponseBody().getCode().equals("000000")) {
         if (!result.getResponseBody().getCode().equals("000000")) {
-            return CommonResult.fail(result.getResponseBody().getMessage());
+            return CommonResult.fail("希沃平台:" + result.getResponseBody().getMessage());
         }
         }
 
 
         String teacherCode = phone;
         String teacherCode = phone;
@@ -3462,7 +3462,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         }
         }
 
 
         if (!result.getResponseBody().getCode().equals("000000")) {
         if (!result.getResponseBody().getCode().equals("000000")) {
-            return CommonResult.fail(result.getResponseBody().getMessage());
+            return CommonResult.fail("希沃平台:" + result.getResponseBody().getMessage());
         }
         }
 
 
         if (result.getResponseBody().getData() != null && result.getResponseBody().getData().size() > 0) {
         if (result.getResponseBody().getData() != null && result.getResponseBody().getData().size() > 0) {
@@ -3514,7 +3514,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         }
         }
 
 
         if (!result.getResponseBody().getCode().equals("000000")) {
         if (!result.getResponseBody().getCode().equals("000000")) {
-            return CommonResult.fail(result.getResponseBody().getMessage());
+            return CommonResult.fail("希沃平台:" + result.getResponseBody().getMessage());
         }
         }
 
 
         String teacherCode = phone;
         String teacherCode = phone;
@@ -3559,7 +3559,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         }
         }
 
 
         if (!result.getResponseBody().getCode().equals("000000")) {
         if (!result.getResponseBody().getCode().equals("000000")) {
-            return CommonResult.fail(result.getResponseBody().getMessage());
+            return CommonResult.fail("希沃平台:" + result.getResponseBody().getMessage());
         }
         }
 
 
         return CommonResult.ok("删除成功");
         return CommonResult.ok("删除成功");
@@ -3599,7 +3599,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         }
         }
 
 
         if (!masterResult.getResponseBody().getCode().equals("000000")) {
         if (!masterResult.getResponseBody().getCode().equals("000000")) {
-            return CommonResult.fail(masterResult.getResponseBody().getMessage());
+            return CommonResult.fail("希沃平台:" + masterResult.getResponseBody().getMessage());
         }
         }
 
 
         return CommonResult.ok("删除成功");
         return CommonResult.ok("删除成功");
@@ -3641,7 +3641,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         }
         }
 
 
         if (!teacherClassResult.getResponseBody().getCode().equals("000000")) {
         if (!teacherClassResult.getResponseBody().getCode().equals("000000")) {
-            return CommonResult.fail(teacherClassResult.getResponseBody().getMessage());
+            return CommonResult.fail("希沃平台:" + teacherClassResult.getResponseBody().getMessage());
         }
         }
 
 
         return CommonResult.ok("添加成功");
         return CommonResult.ok("添加成功");
@@ -3768,7 +3768,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         }
         }
 
 
         if (!result.getResponseBody().getCode().equals("000000")) {
         if (!result.getResponseBody().getCode().equals("000000")) {
-            return CommonResult.fail(result.getResponseBody().getMessage());
+            return CommonResult.fail("希沃平台:" + result.getResponseBody().getMessage());
         }
         }
 
 
         return CommonResult.ok("新增成功");
         return CommonResult.ok("新增成功");
@@ -3812,12 +3812,12 @@ public class SmartUserController implements SmartUserControllerAPI {
             ObjectMapper objectMapper = new ObjectMapper();
             ObjectMapper objectMapper = new ObjectMapper();
             XwBodyVo result = objectMapper.readValue(deleteOldFamilyResult.getBody(), XwBodyVo.class);
             XwBodyVo result = objectMapper.readValue(deleteOldFamilyResult.getBody(), XwBodyVo.class);
             if (!result.getCode().equals("000000")) {
             if (!result.getCode().equals("000000")) {
-                return CommonResult.fail(result.getMessage());
+                return CommonResult.fail("希沃平台:" + result.getMessage());
             }
             }
 
 
         } else {
         } else {
             if (!deleteOldFamilyResult.getResponseBody().getResult().getCode().equals("000000")) {
             if (!deleteOldFamilyResult.getResponseBody().getResult().getCode().equals("000000")) {
-                return CommonResult.fail(deleteOldFamilyResult.getResponseBody().getResult().getMessage());
+                return CommonResult.fail("希沃平台:" + deleteOldFamilyResult.getResponseBody().getResult().getMessage());
             }
             }
         }
         }
 
 
@@ -3863,12 +3863,12 @@ public class SmartUserController implements SmartUserControllerAPI {
             ObjectMapper objectMapper = new ObjectMapper();
             ObjectMapper objectMapper = new ObjectMapper();
             XwBodyVo result = objectMapper.readValue(deleteOldFamilyResult.getBody(), XwBodyVo.class);
             XwBodyVo result = objectMapper.readValue(deleteOldFamilyResult.getBody(), XwBodyVo.class);
             if (!result.getCode().equals("000000")) {
             if (!result.getCode().equals("000000")) {
-                return CommonResult.fail(result.getMessage());
+                return CommonResult.fail("希沃平台:" + result.getMessage());
             }
             }
 
 
         } else {
         } else {
             if (!deleteOldFamilyResult.getResponseBody().getResult().getCode().equals("000000")) {
             if (!deleteOldFamilyResult.getResponseBody().getResult().getCode().equals("000000")) {
-                return CommonResult.fail(deleteOldFamilyResult.getResponseBody().getResult().getMessage());
+                return CommonResult.fail("希沃平台:" + deleteOldFamilyResult.getResponseBody().getResult().getMessage());
             }
             }
         }
         }
 
 
@@ -3914,7 +3914,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         BsClassVo result = objectMapper.readValue(bsResult, BsClassVo.class);
         BsClassVo result = objectMapper.readValue(bsResult, BsClassVo.class);
 
 
         if (!bsResult.contains("更新成功")) {
         if (!bsResult.contains("更新成功")) {
-            return CommonResult.fail(result.getMsg());
+            return CommonResult.fail("百胜平台:" + result.getMsg());
         }
         }
 
 
         return CommonResult.ok("更新成功");
         return CommonResult.ok("更新成功");
@@ -3955,7 +3955,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         BsClassVo result = objectMapper.readValue(bsResult, BsClassVo.class);
         BsClassVo result = objectMapper.readValue(bsResult, BsClassVo.class);
 
 
         if (!bsResult.contains("更新成功")) {
         if (!bsResult.contains("更新成功")) {
-            return CommonResult.fail(result.getMsg());
+            return CommonResult.fail("百胜平台:" + result.getMsg());
         }
         }
 
 
         return CommonResult.ok("更新成功");
         return CommonResult.ok("更新成功");
@@ -3995,7 +3995,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         BsClassVo result = objectMapper.readValue(bsResult, BsClassVo.class);
         BsClassVo result = objectMapper.readValue(bsResult, BsClassVo.class);
 
 
         if (!bsResult.contains("更新成功")) {
         if (!bsResult.contains("更新成功")) {
-            return CommonResult.fail(result.getMsg());
+            return CommonResult.fail("百胜平台:" + result.getMsg());
         }
         }
 
 
         return CommonResult.ok("更新成功");
         return CommonResult.ok("更新成功");
@@ -4037,7 +4037,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         BsStudentVo grade = objectMapper.readValue(bsResult, BsStudentVo.class);
         BsStudentVo grade = objectMapper.readValue(bsResult, BsStudentVo.class);
 
 
         if (!bsResult.contains("添加成功")) {
         if (!bsResult.contains("添加成功")) {
-            return CommonResult.fail(grade.getMsg());
+            return CommonResult.fail("百胜平台:" + grade.getMsg());
         }
         }
 
 
         // URL解码
         // URL解码
@@ -4079,7 +4079,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         BsDeleteStudentVo result = objectMapper.readValue(bsResult, BsDeleteStudentVo.class);
         BsDeleteStudentVo result = objectMapper.readValue(bsResult, BsDeleteStudentVo.class);
 
 
         if (!bsResult.contains("删除学生成功")) {
         if (!bsResult.contains("删除学生成功")) {
-            return CommonResult.fail(result.getMsg());
+            return CommonResult.fail("百胜平台:" + result.getMsg());
         }
         }
 
 
         return CommonResult.ok("操作成功");
         return CommonResult.ok("操作成功");
@@ -4120,7 +4120,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         BsStaffVo staff = objectMapper.readValue(bsResult, BsStaffVo.class);
         BsStaffVo staff = objectMapper.readValue(bsResult, BsStaffVo.class);
 
 
         if (!bsResult.contains("添加成功")) {
         if (!bsResult.contains("添加成功")) {
-            return CommonResult.fail(staff.getMsg());
+            return CommonResult.fail("百胜平台:" + staff.getMsg());
         }
         }
 
 
         // URL解码
         // URL解码
@@ -4167,7 +4167,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         BsStaffVo staff = objectMapper.readValue(bsResult, BsStaffVo.class);
         BsStaffVo staff = objectMapper.readValue(bsResult, BsStaffVo.class);
 
 
         if (!bsResult.contains("更新成功")) {
         if (!bsResult.contains("更新成功")) {
-            return CommonResult.fail(staff.getMsg());
+            return CommonResult.fail("百胜平台:" + staff.getMsg());
         }
         }
 
 
         // URL解码
         // URL解码
@@ -4209,7 +4209,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         BsDeleteStudentVo result = objectMapper.readValue(bsResult, BsDeleteStudentVo.class);
         BsDeleteStudentVo result = objectMapper.readValue(bsResult, BsDeleteStudentVo.class);
 
 
         if (!bsResult.contains("删除员工成功")) {
         if (!bsResult.contains("删除员工成功")) {
-            return CommonResult.fail(result.getMsg());
+            return CommonResult.fail("百胜平台:" + result.getMsg());
         }
         }
 
 
         return CommonResult.ok("删除成功");
         return CommonResult.ok("删除成功");
@@ -4658,7 +4658,7 @@ public class SmartUserController implements SmartUserControllerAPI {
             return CommonResult.fail();
             return CommonResult.fail();
         }
         }
 
 
-        List<StudentSelectVo> list=smartUserService.studentSelect(keyWord);
+        List<StudentSelectVo> list = smartUserService.studentSelect(keyWord);
 
 
         return CommonResult.ok(list);
         return CommonResult.ok(list);
     }
     }
@@ -5309,27 +5309,27 @@ public class SmartUserController implements SmartUserControllerAPI {
                     for (SmartAuthorGroup authGroup : authGroups) {
                     for (SmartAuthorGroup authGroup : authGroups) {
                         List<String> newUserId = new ArrayList<>();
                         List<String> newUserId = new ArrayList<>();
                         List<String> userIds = Arrays.asList(authGroup.getUserId().split(","));
                         List<String> userIds = Arrays.asList(authGroup.getUserId().split(","));
-                        for (String userId:userIds) {
-                            if(!userId.equals(String.valueOf(dUser.getId()))){
+                        for (String userId : userIds) {
+                            if (!userId.equals(String.valueOf(dUser.getId()))) {
                                 newUserId.add(userId);
                                 newUserId.add(userId);
                             }
                             }
                         }
                         }
-                        if(newUserId != null && newUserId.size() > 0){
-                            authGroup.setUserId(StringUtils.join(newUserId,","));
+                        if (newUserId != null && newUserId.size() > 0) {
+                            authGroup.setUserId(StringUtils.join(newUserId, ","));
                             allDatas.add(authGroup);
                             allDatas.add(authGroup);
-                        }else{
+                        } else {
                             deleteGroupId.add(authGroup.getId());
                             deleteGroupId.add(authGroup.getId());
                         }
                         }
                     }
                     }
                 }
                 }
 
 
-                if(allDatas != null && allDatas.size() > 0){//更新权限组
+                if (allDatas != null && allDatas.size() > 0) {//更新权限组
                     smartAuthorGroupService.saveBatch(allDatas);
                     smartAuthorGroupService.saveBatch(allDatas);
                 }
                 }
-                if(deleteGroupId != null && deleteGroupId.size() > 0){//删除权限组
+                if (deleteGroupId != null && deleteGroupId.size() > 0) {//删除权限组
                     smartAuthorGroupService.deleteSmartAuthorGroupByIds(deleteGroupId);
                     smartAuthorGroupService.deleteSmartAuthorGroupByIds(deleteGroupId);
                 }
                 }
-                if(deleteUserId != null && deleteUserId.size() > 0){//删除管理组权限
+                if (deleteUserId != null && deleteUserId.size() > 0) {//删除管理组权限
                     smartAuthorityService.deleteAuthorityByUserIds(deleteUserId);
                     smartAuthorityService.deleteAuthorityByUserIds(deleteUserId);
                 }
                 }
             } else {
             } else {