update

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

@@ -261,4 +261,11 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
     CourseHomework getCourseScheduleHomework(Integer courseScheduleId);
 
     List<Integer> lockTeachers(@Param("userIds") List<Integer> userIds);
+
+    /**
+     * 获取user
+     * @param userId
+     * @return
+     */
+    SysUser getUser(int userId);
 }

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

@@ -677,4 +677,37 @@
         </foreach>
         FOR UPDATE
     </select>
+    <resultMap type="com.ym.mec.auth.api.entity.SysUser" id="SysUser">
+        <result column="id_" property="id"/>
+        <result column="username_" property="username"/>
+        <result column="real_name_" property="realName"/>
+        <result column="password_" property="password"/>
+        <result column="salt_" property="salt"/>
+        <result column="phone_" property="phone"/>
+        <result column="avatar_" property="avatar"/>
+        <result column="organ_id_" property="organId"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="lock_flag_" property="lockFlag"/>
+        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="wx_openid_" property="wxOpenid"/>
+        <result column="qq_openid_" property="qqOpenid"/>
+        <result column="user_type_" property="userType"/>
+        <result column="gender_" property="gender"/>
+        <result column="nation_" property="nation"/>
+        <result column="birthdate_" property="birthdate"/>
+        <result column="email_" property="email"/>
+        <result column="im_token_" property="imToken"/>
+        <result column="id_card_no_" property="idCardNo"/>
+        <result column="wechat_id_" property="wechatId"/>
+        <result column="is_super_admin_" property="isSuperAdmin"/>
+        <result column="current_grade_" property="currentGrade"/>
+        <result column="current_class_" property="currentClass"/>
+    </resultMap>
+
+    <select id="getUser" resultMap="SysUser">
+        SELECT su.*
+        FROM sys_user su
+        WHERE su.id_ = #{id} LIMIT 1
+    </select>
 </mapper>

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -255,14 +255,14 @@ public class RoomServiceImpl implements RoomService {
         List<Room> roomList = roomDao.findByRid(roomId);
         if (roomList.size() == 0) {
             log.error("room : {} not exist ", roomId);
-            return false;
-//            throw new ApiException(ErrorEnum.ERR_ROOM_NOT_EXIST);
+//            return false;
+            throw new ApiException(ErrorEnum.ERR_ROOM_NOT_EXIST);
         }
         List<RoomMember> roomMemberList = roomMemberDao.findByRidAndUid(roomId, userId);
         if (roomMemberList.size() == 0) {
             log.error("{} not exist in room: {}", userId, roomId);
-            return false;
-//            throw new ApiException(ErrorEnum.ERR_USER_NOT_EXIST_IN_ROOM);
+//            return false;
+            throw new ApiException(ErrorEnum.ERR_USER_NOT_EXIST_IN_ROOM);
         }
 
         int userRole = roomMemberList.get(0).getRole();
@@ -1135,10 +1135,12 @@ public class RoomServiceImpl implements RoomService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean statusSync(String roomId,String userId) throws Exception {
         List<RoomMember> byRidAndUid = roomMemberDao.findByRidAndUid(roomId, userId);
         if(byRidAndUid.size() > 0){
-            SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
+//            SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
+            SysUser sysUser = teacherDao.getUser(Integer.parseInt(userId));
             Teacher teacher = teacherDao.get(sysUser.getId());
             CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(4)));
             try {