update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupDao.java

@@ -28,10 +28,9 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
     /**
      * 获取个人中心乐团数据
      * @param userId
-     * @param musicGroupId
      * @return
      */
-    MusicCardDto queryPersonalMusicGroups(@Param("userId") Integer userId,@Param("musicGroupId") String musicGroupId);
+    MusicCardDto queryPersonalMusicGroups(@Param("userId") Integer userId);
 
     /**
      * 获取用户有效的乐团数

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -40,7 +40,7 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @param id
 	 * @return
 	 */
-	MusicCardDto queryPersonalMusicGroups(Integer id,String musicGroupId);
+	MusicCardDto queryPersonalMusicGroups(Integer id);
 
 	/**
 	 * 根据学员编号获取相关老师列表

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

@@ -196,12 +196,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
-    public MusicCardDto queryPersonalMusicGroups(Integer id,String musicGroupId) {
-        MusicCardDto musicCardDto = musicGroupDao.queryPersonalMusicGroups(id,musicGroupId);
+    public MusicCardDto queryPersonalMusicGroups(Integer userId) {
+        MusicCardDto musicCardDto = musicGroupDao.queryPersonalMusicGroups(userId);
         if(musicCardDto != null){
-            musicCardDto.setMusicGroupNum(musicGroupDao.countUserMusicGroups(id));
-            musicCardDto.setVipClassNum(musicGroupDao.countCourseByType(id, ClassGroupTypeEnum.VIP));
-            return musicGroupDao.queryPersonalMusicGroups(id,musicGroupId);
+            musicCardDto.setMusicGroupNum(musicGroupDao.countUserMusicGroups(userId));
+            musicCardDto.setVipClassNum(musicGroupDao.countCourseByType(userId, ClassGroupTypeEnum.VIP));
+            return musicGroupDao.queryPersonalMusicGroups(userId);
         }
         return new MusicCardDto();
     }

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

@@ -190,7 +190,8 @@
 		FROM student_registration sr
 		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
 		LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
-		WHERE sr.user_id_ = #{userId} AND sr.music_group_id_ = #{musicGroupId}
+		WHERE sr.user_id_ = #{userId}
+		ORDER BY mg.update_time_ DESC LIMIT 1
 	</select>
 
 	<select id="countUserMusicGroups" resultType="int">

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

@@ -163,7 +163,6 @@
 	</select>
 
 	<select id="queryCountOfUnread" resultType="int">
-		select count(*) from sys_message
-		where user_id_ = #{userId} and read_status_ = 0
+		SELECT COUNT(*) FROM sys_message WHERE user_id_ = #{userId} AND read_status_ = 0 AND type_ = 3
 	</select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -66,15 +66,12 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation("获取学生个人中心乐团信息")
     @GetMapping(value = "/queryPersonalMusicGroups")
-    public Object queryPersonalMusicGroups(String musicGroupId) {
+    public Object queryPersonalMusicGroups() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("获取用户信息失败");
         }
-        if(StringUtils.isEmpty(musicGroupId)){
-            return failed("参数校验错误");
-        }
-        return succeed(musicGroupService.queryPersonalMusicGroups(sysUser.getId(),musicGroupId));
+        return succeed(musicGroupService.queryPersonalMusicGroups(sysUser.getId()));
     }
 
     @ApiOperation(value = "根据学员编号，获取有关联的老师列表")

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMessageController.java

@@ -3,7 +3,6 @@ package com.ym.mec.teacher.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.SysMessage;
-import com.ym.mec.biz.dal.entity.SysMessageConfig.MessageType;
 import com.ym.mec.biz.dal.enums.MessageSendMode;
 import com.ym.mec.biz.dal.page.SysMessageQueryInfo;
 import com.ym.mec.biz.service.SysMessageService;
@@ -79,7 +78,7 @@ public class SysMessageController extends BaseController {
 		}
 		return succeed(sysMessageService.queryCountOfUnread(sysUser.getId()));
 	}
-
+/*
 	@ApiOperation(value = "发送短信验证码")
 	@PostMapping("/sendSmsCode")
 	public Object sendSmsCode(String sendCodeType, String mobileNo) {
@@ -121,7 +120,7 @@ public class SysMessageController extends BaseController {
 		}
 //		sysMessageService.sendSecurityCode(MessageSender.YIMEI, userId, MessageSendMode.SMS, messageType, mobileNo);
 		return succeed();
-	}
+	}*/
 
 	@ApiOperation(value = "发送消息")
 	@PostMapping("/sendMessage")