bug修改

mec-application/src/main/java/com/ym/mec/web/controller/SysMessageController.java

@@ -107,7 +107,7 @@ public class SysMessageController extends BaseController {
 		// 数据类型转换
 		PageInfo<SysMessageVo.SysMessageList> records = sysMessageService.queryMessageCode(query);
 
-		Pattern pattern = Pattern.compile("验证码\\d+");
+		Pattern pattern = Pattern.compile("\\b验证码\\s*(\\d{6})\\b");
 		records.getRows().forEach(next -> {
 			String content = next.getContent();
 			if (StringUtils.isNotEmpty(content)) {

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SysMessageVo.java

@@ -16,19 +16,13 @@ public class SysMessageVo {
     @ApiModel(" SysMessageList-系统消息表")
     public static class SysMessageQuery implements QueryInfo {
 
-        @ApiModelProperty("当前页")
-        private Integer page;
-
-        @ApiModelProperty("分页行数")
-        private Integer rows;
-
         @ApiModelProperty(value = "接收人编号")
         private String receiver;
 
         @ApiModelProperty(value = "验证码类型，验证码登录：SMS_VERIFY_CODE_LOGIN，密码修改：SMS_VERIFY_CODE_UPDATE_PSW")
         private TitleEnum titleEnum = TitleEnum.SMS_VERIFY_CODE_LOGIN;
 
-        private String title;
+        private String title = "验证码登录";
 
         @ApiModelProperty(value = "发送时间-年月日")
         private String sendTime;

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -442,15 +443,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
 
         applyBaseInfo.setName(vipGroup.getLiveBroadcastRoom().getRoomTitle());
-        //课程信息调整
-        List<CourseSchedule> courseSchedules = courseScheduleDao.getClassGroupCourses(classGroup.getId().longValue());
-        Boolean upCourseFlag = true;
-        //兼容历史的直播课
-        if(CollectionUtils.isEmpty(courseSchedules)){
-            courseSchedules = vipGroup.getCourseSchedules();
-            upCourseFlag = false;
-        }
+
         if(vipGroup1.getStatus().equals(VipGroupStatusEnum.APPLYING) || vipGroup1.getStatus().equals(VipGroupStatusEnum.NOT_START)){
+            List<CourseSchedule> courseSchedules = JSONArray.parseArray(vipGroupApplyBaseInfoDto.getCourseSchedulesJson(), CourseSchedule.class);
+            courseScheduleService.checkNewCourseSchedules(courseSchedules, false, false);
             for (CourseSchedule courseSchedule : courseSchedules) {
                 courseSchedule.setGroupType(GroupType.valueOf(groupType));
                 courseSchedule.setMusicGroupId(vipGroupApplyBaseInfoDto.getId().toString());
@@ -466,15 +462,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 courseSchedule.setOrganId(vipGroupApplyBaseInfoDto.getOrganId());
             }
             vipGroupApplyBaseInfoDto.setCourseSchedulesJson(JSON.toJSONString(courseSchedules));
-            if (upCourseFlag) {
-                courseScheduleDao.deleteCourseSchedulesByMusicGroupID(vipGroup1.getId().toString(), vipGroup1.getGroupType());
-                courseScheduleTeacherSalaryDao.deleteByMusicGroupId(vipGroup1.getId().toString(), vipGroup1.getGroupType());
-                teacherAttendanceDao.deleteByMusicGroupId(vipGroup1.getId().toString(), vipGroup1.getGroupType());
-            }
+            courseScheduleDao.deleteCourseSchedulesByMusicGroupID(vipGroup1.getId().toString(), vipGroup1.getGroupType());
+            courseScheduleTeacherSalaryDao.deleteByMusicGroupId(vipGroup1.getId().toString(), vipGroup1.getGroupType());
+            teacherAttendanceDao.deleteByMusicGroupId(vipGroup1.getId().toString(), vipGroup1.getGroupType());
             this.liveProgress(vipGroupApplyBaseInfoDto,classGroup);
         }
         if (vipGroup1.getStatus().equals(VipGroupStatusEnum.PROGRESS)) {
             // 查询未开始课程信息
+            List<CourseSchedule> courseSchedules = courseScheduleDao.getClassGroupCourses(classGroup.getId().longValue());
             List<CourseSchedule> scheduleList = courseScheduleDao.findByClassGroupAndStatus(classGroup.getId(), CourseStatusEnum.NOT_START.getCode());
             Map<Long, CourseSchedule> scheduleMap = courseSchedules.stream().collect(Collectors.toMap(CourseSchedule::getId, Function.identity()));
             scheduleList.forEach(courseSchedule -> {
@@ -499,10 +494,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             imGroupMemberService.join(classGroup.getId().toString(), vipGroup.getLiveBroadcastRoom().getSpeakerId(),EFriendRoleType.ORCHESTRA_TEACHER.getMsg(),false);
             imGroupMemberService.join(classGroup.getId().toString(), applyBaseInfo.getEducationalTeacherId(),EFriendRoleType.ORCHESTRA_MANAGER.getMsg(),false);
         }
-
-        if (!vipGroup1.getStatus().equals(VipGroupStatusEnum.PROGRESS) && upCourseFlag) {
-            courseScheduleService.checkNewCourseSchedules(courseSchedules, false, false);
-        }
         vipGroupDao.update(vipGroupApplyBaseInfoDto);
         return BaseController.succeed(vipGroupApplyBaseInfoDto.getAuditStatus().getCode());
     }

mec-biz/src/main/resources/config/mybatis/SysMessageMapper.xml

@@ -229,6 +229,7 @@
 	<select id="queryMessageCode" resultType="com.ym.mec.biz.dal.dto.SysMessageVo$SysMessageList">
 		select receiver_,content_,send_time_,title_ from sys_message
 		<include refid="countMessageCodeSql"/>
+		order by id_ desc
 		<include refid="global.limit" />
 	</select>
 </mapper>