Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -261,16 +261,18 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         MusicGroup musicGroup = musicGroupDao.get(highClassGroupList.get(0).getMusicGroupId());
 
         List<ClassGroup> classGroups = classGroupDao.findClassGroupByMusicGroupIdAndType(musicGroup.getId(), ClassGroupTypeEnum.HIGH);
-        List<Integer> classGroupIds = classGroups.stream().map(classGroup -> classGroup.getId()).collect(Collectors.toList());
-        //删除基础提高班
-        classGroupDao.batchSoftDelete(classGroupIds);
-        //删除基础提高班课程
-        courseScheduleDao.deleteCourseSchedulesByClassGroupIds(classGroupIds);
-        //删除基础提高老师
-        classGroupTeacherMapperDao.delClassGroupTeacherMapper(classGroupIds);
-
-        for (ClassGroup classGroup : classGroups) {
-            imFeignService.groupDismiss(new ImGroupModel(classGroup.getId().toString(), null, classGroup.getName()));
+        if (classGroups.size() > 0) {
+            List<Integer> classGroupIds = classGroups.stream().map(classGroup -> classGroup.getId()).collect(Collectors.toList());
+            //删除基础提高班
+            classGroupDao.batchSoftDelete(classGroupIds);
+            //删除基础提高班课程
+            courseScheduleDao.deleteCourseSchedulesByClassGroupIds(classGroupIds);
+            //删除基础提高老师
+            classGroupTeacherMapperDao.delClassGroupTeacherMapper(classGroupIds);
+
+            for (ClassGroup classGroup : classGroups) {
+                imFeignService.groupDismiss(new ImGroupModel(classGroup.getId().toString(), null, classGroup.getName()));
+            }
         }
 
         Integer schoolId = musicGroup.getSchoolId();
@@ -665,6 +667,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroupRelationDao.deleteBySubClassId(classGroupId);
         //删除班级
         classGroupDao.delete(classGroupId);
+        //删除im群组
+        imFeignService.groupQuit(new ImGroupModel(classGroupId.toString(), null, null));
     }
 
     @Override
@@ -676,6 +680,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroupRelationDao.deleteByClassId(classGroupId);
         //删除合奏班
         classGroupDao.delete(classGroupId);
+        //删除im群组
+        imFeignService.groupQuit(new ImGroupModel(classGroupId.toString(), null, null));
     }
 
     @Override

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupStudentMapperServiceImpl.java

@@ -139,6 +139,8 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
         //1、班级关系添加
         List<ClassGroupStudentMapper> classGroupStudentMappers = new ArrayList<>();
+        List<ImGroupMember> imGroupMemberList = new ArrayList<>();
+
         for (String userIdStr : userIdStrSet) {
             ClassGroupStudentMapper classGroupStudentMapper = new ClassGroupStudentMapper();
             classGroupStudentMapper.setMusicGroupId(classGroup.getMusicGroupId());
@@ -152,9 +154,14 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 studentRegistration.setClassGroupId(classGroupId);
                 studentRegistrationService.update(studentRegistration);
             }
+            imGroupMemberList.add(new ImGroupMember(userIdStr));
         }
         classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentMappers);
 
+        //添加进IM群组
+        ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);
+        imFeignService.groupJoin(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+
         //2、班级人数调整
         classGroupService.updateClassStudentNum(classGroupId.longValue(), userIdStrSet.size());
 
@@ -168,6 +175,9 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
             classGroupService.updateClassStudentNum(classGroupRelation.getClassGroupId().longValue(), userIdStrSet.size());
             List<CourseSchedule> mixCourseScheduleList = courseScheduleService.findNoStartCoursesByClassGroupId(classGroupRelation.getClassGroupId());
             courseScheduleList.addAll(mixCourseScheduleList);
+
+            //添加进合奏班IM群组
+            imFeignService.groupJoin(new ImGroupModel(classGroupRelation.getClassGroupId().toString(), imGroupMembers, null));
         }
 
         BigDecimal coursePrice = new BigDecimal("0");

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -180,7 +180,7 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
 		SignType signType = SignType.Key;
 		// 设置接口调用方(平台方)签章位置信息
 		posBean.setPosPage("1");// 签署页码，若为多页签章，支持页码格式“1-3,5,8“，若为坐标定位时，不可空
-		posBean.setKey("甲方（签字）");
+		posBean.setKey("甲方签章");
 		// 签署位置X坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面左端的横向移动距离,单位为px
 		posBean.setPosX(100);
 		// 签署位置Y坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面底端的纵向移动距离,单位为px
@@ -217,7 +217,7 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
 		posBean.setPosPage("1");
 		posBean.setPosType(1);
 		posBean.setWidth(80);
-		posBean.setKey("乙方（签字）");
+		posBean.setKey("乙方签字");
 		posBean.setPosX(100);
 		posBean.setPosY(0);