更新添加用户，修改用户，学校规模接口

src/main/java/com/template/controller/DriverStockController.java

@@ -58,7 +58,7 @@ public class DriverStockController implements DriverStockControllerAPI {
         List<Tj> list = driverStockService.getClassTj();
         BigDecimal num = new BigDecimal(0.0);
         for (Tj teacherData:list) {
-            if (teacherData.getName().contains("老师") || teacherData.getName().contains("班主任") || teacherData.getName().contains("年级主任") || teacherData.getName().contains("超级管理员")) {
+            if (teacherData.getName().contains("老师") || teacherData.getName().contains("班主任") || teacherData.getName().contains("年级主任") || teacherData.getName().contains("超级管理员") || teacherData.getName().contains("其他")) {
                 num = num.add(new BigDecimal(teacherData.getNum()));
             }
         }
@@ -70,7 +70,7 @@ public class DriverStockController implements DriverStockControllerAPI {
 //        去掉班主任
         ArrayList<Tj> vos = new ArrayList<>();
         for (Tj tj : list) {
-            if (!tj.getName().contains("班主任") && !tj.getName().contains("年级主任") && !tj.getName().contains("超级管理员")) {
+            if (!tj.getName().contains("班主任") && !tj.getName().contains("年级主任") && !tj.getName().contains("超级管理员") && !tj.getName().contains("其他")) {
                 vos.add(tj);
             }
         }

src/main/java/com/template/controller/SmartUserController.java

@@ -966,7 +966,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     }
 
                     for (SmartUser teacher : teacherDatas) {
-                        if (teacher.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
+                        if (ObjectUtils.isNotEmpty(teacher.getDuties()) &&  teacher.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
 
                             Optional<SmartClass> oClass = classDatas.stream().filter(e -> e.getId().equals(teacher.getSchoolClass())).findFirst();
                             if (oClass != null && oClass.isPresent()) {
@@ -1054,7 +1054,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                             set.setUserId(teacher.getId());
                             set.setTermId(semester.getId());
                             set.setTerm(semester.getName());
-                            if (teacher.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {//班主任才有年级和班级
+                            if (ObjectUtils.isNotEmpty(teacher.getDuties()) && teacher.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {//班主任才有年级和班级
                                 set.setGradeId(Integer.valueOf(teacher.getGrade()));
                                 Optional<SmartGrade> oGrade = grades.stream().filter(e -> e.getId().equals(set.getGradeId())).findFirst();
                                 if (oGrade != null && oGrade.isPresent()) {
@@ -3995,7 +3995,7 @@ public class SmartUserController implements SmartUserControllerAPI {
             }
             //endregion
 
-        } else if (isur.getIdentityId().intValue() == eIdentityStatu.Teacher.getValue()) {//老师
+        } else if (isur.getIdentityId().intValue() == eIdentityStatu.Teacher.getValue() || isur.getIdentityId().intValue() == 18 || isur.getIdentityId().intValue() == 19 || isur.getIdentityId().intValue() == 20 || isur.getIdentityId().intValue() == 14 ) {//老师
 
             //region 老师参数必填判断：职称、手机号
             if (isur.getTitle() == null) {
@@ -4134,7 +4134,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         set.setUserId(su.getId());
                         set.setTermId(semester.getId());
                         set.setTerm(semester.getName());
-                        if (su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {//班主任才有年级和班级
+                        if (ObjectUtils.isNotEmpty(su.getDuties()) &&  su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {//班主任才有年级和班级
                             set.setGradeId(su.getGrade() == null || su.getGrade() == "" ? null : Integer.valueOf(su.getGrade()));
                             if (gradeData != null) {
                                 set.setGradeName(gradeData.getName());
@@ -4731,7 +4731,7 @@ public class SmartUserController implements SmartUserControllerAPI {
 
             }
 
-        } else if (usur.getIdentityId().intValue() == eIdentityStatu.Teacher.getValue()) {//教师
+        } else if (usur.getIdentityId().intValue() == eIdentityStatu.Teacher.getValue() || usur.getIdentityId().intValue() == 18 || usur.getIdentityId().intValue() == 19 || usur.getIdentityId().intValue() == 20 || usur.getIdentityId().intValue() == 14 ) {//教师
             if (!changeIdentity) {
                 //region 希沃更新教师数据
                 if (useXw == 1) {
@@ -4752,7 +4752,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         return result;
                     }
                 }
-                if (su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
+                if (ObjectUtils.isNotEmpty(su.getDuties()) && su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
                     //获取班级Uid
                     SmartClass classData = smartClassService.getSmartClassById(su.getSchoolClass());
                     if (classData == null) {
@@ -4869,7 +4869,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 }
                 //endregion
 
-                if (su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
+                if (ObjectUtils.isNotEmpty(su.getDuties()) && su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
                     //获取班级Uid
                     SmartClass classData = smartClassService.getSmartClassById(su.getSchoolClass());
                     if (classData == null) {
@@ -4900,9 +4900,16 @@ public class SmartUserController implements SmartUserControllerAPI {
                     /**
                      * 教师数据的有效期是20年
                      */
+//                    到这
                     String startTime = TimeExchange.DateToString(new Date(), "yyyy-MM-dd HH:mm:ss");
                     String endTime = TimeExchange.addYear(20);
-                    CommonResult<String> insertBsTeacher = bsInsertTeacher(su, departmentNo, startTime, endTime);
+                    CommonResult<String> insertBsTeacher;
+                    if (ObjectUtils.isNotEmpty(su.getBsStaffCode())) {
+                        insertBsTeacher = updateBsTeacher(su, departmentNo, startTime, endTime);
+                    }else {
+                        insertBsTeacher = bsInsertTeacher(su, departmentNo, startTime, endTime);
+                    }
+
                     if (!insertBsTeacher.isSuccess()) {
                         return CommonResult.fail("百胜平台：" + insertBsTeacher.getMessage());
                     }
@@ -4955,7 +4962,7 @@ public class SmartUserController implements SmartUserControllerAPI {
             List<SmartEvaluateTeacher> updateTeachers = new ArrayList<>();
             SmartClass classData = null;
             SmartGrade gradeData = null;
-            if (su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
+            if (ObjectUtils.isNotEmpty(su.getDuties()) &&  su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
                 classData = smartClassService.getSmartClassById(su.getSchoolClass());
                 gradeData = smartGradeService.querySmartGradeById(Integer.valueOf(su.getGrade()));
             }
@@ -4963,7 +4970,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 for (SmartSemester semester : semesters) {
                     Optional<SmartEvaluateTeacher> oTeacher = eTeachers.stream().filter(e -> e.getTermId().equals(semester.getId())).findFirst();
                     if (oTeacher != null && oTeacher.isPresent()) {
-                        if (su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
+                        if (ObjectUtils.isNotEmpty(su.getDuties()) &&  su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
                             oTeacher.get().setGradeId(gradeData.getId());
                             oTeacher.get().setGradeName(gradeData.getName());
                             oTeacher.get().setClassId(classData.getId());
@@ -4977,7 +4984,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         set.setUserId(su.getId());
                         set.setTermId(semester.getId());
                         set.setTerm(semester.getName());
-                        if (su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {//班主任才有年级和班级
+                        if (ObjectUtils.isNotEmpty(su.getDuties()) && su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {//班主任才有年级和班级
                             set.setGradeId(gradeData.getId());
                             set.setGradeName(gradeData.getName());
                             set.setClassId(classData.getId());
@@ -4996,7 +5003,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     set.setUserId(su.getId());
                     set.setTermId(semester.getId());
                     set.setTerm(semester.getName());
-                    if (su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {//班主任才有年级和班级
+                    if (ObjectUtils.isNotEmpty(su.getDuties()) && su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {//班主任才有年级和班级
                         set.setGradeId(gradeData.getId());
                         set.setGradeName(gradeData.getName());
                         set.setClassId(classData.getId());
@@ -7952,7 +7959,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 }
                 //endregion
 
-                if (user.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
+                if (ObjectUtils.isNotEmpty(user.getDuties()) && user.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
                     if (user.getSchoolClass() == null) {
                         return CommonResult.fail("班级数据无效，删除失败");
                     }
@@ -7962,7 +7969,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         return CommonResult.fail("班级数据无效，删除失败");
                     }
                     //region 希沃删除班主任
-                    if (user.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
+                    if (ObjectUtils.isNotEmpty(user.getDuties()) && user.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
                         CommonResult deleteTeacherMaster = SeewoDeleteTeacherMaster(seewoClient, classData.getClassUid(), user.getPhone());
                         if (deleteTeacherMaster.isSuccess()) {
                             return CommonResult.fail(deleteTeacherMaster.getMessage());
@@ -8095,7 +8102,7 @@ public class SmartUserController implements SmartUserControllerAPI {
 
             } else if (user.getIdentityId().intValue() == eIdentityStatu.Teacher.getValue()) {
 
-                if (user.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
+                if (ObjectUtils.isNotEmpty(user.getDuties()) && user.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
                     if (user.getSchoolClass() == null) {
                         String reason = (deleteUser.getReason() == null ? "" : deleteUser.getReason()) + "班级数据无效，希沃删除班主任失败；";
                         deleteUser.setReason(reason);

src/main/resources/mapper/template/test.xml

@@ -1,35 +0,0 @@
-[
-    {
-        "auth": "redis.root",
-        "host": "127.0.0.1",
-        "keys_pattern": "*",
-        "name": "localhost",
-        "namespace_separator": ":",
-        "port": 6379,
-        "ssh_port": 22,
-        "timeout_connect": 60000,
-        "timeout_execute": 60000
-    },
-    {
-        "auth": "chuanghai.redis",
-        "host": "172.16.20.68",
-        "keys_pattern": "*",
-        "name": "智慧酒店",
-        "namespace_separator": ":",
-        "port": 6379,
-        "ssh_port": 22,
-        "timeout_connect": 60000,
-        "timeout_execute": 60000
-    },
-    {
-        "auth": "chuanghai_2023.",
-        "host": "172.16.20.65",
-        "keys_pattern": "*",
-        "name": "宿舍redis",
-        "namespace_separator": ":",
-        "port": 6379,
-        "ssh_port": 22,
-        "timeout_connect": 60000,
-        "timeout_execute": 60000
-    }
-]